Merge updates from master

31 files changed, 32 insertions, 2508 deletions

diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index 9de27a29ac13..8a48fdadff4c 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,2 +1 @@
-DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d
 DIST trang-20220510.tar.gz 14317698 BLAKE2B b7337e9555094989955e33f711db9981521c31a3708dd6a862f36cecae0496d8c86fdf09b2d60b8646d8e35e214f57ba7bcd49773fe002eef26ed6b81b4101c1 SHA512 51c44817b396ec45bb82987e0aee8e8d2e5f3f6a1e2f967bae717a31b1bd49c5fc7015466104b19ac62de6ee0270c018dcf19b467763ad1aaa92800bd4edd7a0
diff --git a/app-text/trang/files/trang-20181222-build-fixes.patch b/app-text/trang/files/trang-20181222-build-fixes.patch
deleted file mode 100644
index ef7118c650a1..000000000000
--- a/app-text/trang/files/trang-20181222-build-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/javacc.dir/
-
-Description: update local Java path
---- a/build.xml
-+++ b/build.xml
-@@ -1,6 +1,6 @@
- <project name="jing-trang" default="jar">
- 
--<property name="lib.dir" value="lib"/>
-+<property name="lib.dir" value="/usr/share/java"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="doc.dir" value="${basedir}/doc"/>
- 
---- a/build.xsl
-+++ b/build.xsl
-@@ -23,15 +23,6 @@
-     <target name="dummy"/>
-     <target name="init">
-       <mkdir dir="{$build}"/>
--      <exec executable="git">
--        <arg value="submodule"/>
--        <arg value="update"/>
--        <arg value="--init"/>
--        <arg value="--recursive"/>
--      </exec>
--      <copy todir="{$doc}">
--        <fileset dir="relaxng.org/jclark" includes="**"/>
--      </copy>
-     </target>
-     <xsl:for-each select="modules/module">
-       <xsl:apply-templates select="document(concat('mod/', .,'/mod.xml'), .)/module">
diff --git a/app-text/trang/files/trang-20181222-unicode-data-path.patch b/app-text/trang/files/trang-20181222-unicode-data-path.patch
deleted file mode 100644
index e1aaf5452f47..000000000000
--- a/app-text/trang/files/trang-20181222-unicode-data-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adapted from Debian.
-https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/unicode.patch/
-
-Description: update unicode path
---- a/mod/regex/mod.xml
-+++ b/mod/regex/mod.xml
-@@ -46,7 +46,7 @@
- 	    failonerror="yes">
- 	<arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/>
- 	<arg value="${build.dir}/mod/regex/gensrc/main"/>
--	<arg value="${lib.dir}/UnicodeData-3.1.0.txt"/>
-+	<arg value="@GENTOO_PORTAGE_EPREFIX@/usr/share/unicode-data/UnicodeData.txt"/>
- 	<classpath>
- 	  <pathelement location="${build.dir}/mod/regex-gen/classes/main"/>
- 	  <pathelement location="${build.dir}/mod/util/classes/main"/>
diff --git a/app-text/trang/trang-20181222.ebuild b/app-text/trang/trang-20181222.ebuild
deleted file mode 100644
index 1bd1c56592c4..000000000000
--- a/app-text/trang/trang-20181222.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2 prefix
-
-DESCRIPTION="Multi-format schema converter based on RELAX NG"
-HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
-SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/jing-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
-	dev-java/xerces:2
-	dev-java/xml-commons-resolver:0"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${COMMON_DEP}"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/javacc:0
-	dev-java/saxon:6.5
-	dev-java/testng:0
-	${COMMON_DEP}"
-BDEPEND="app-i18n/unicode-data"
-
-EANT_ANT_TASKS="testng"
-EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_PKG_BSFIX_NAME="build.xsl"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20181222-build-fixes.patch
-	"${FILESDIR}"/${PN}-20181222-unicode-data-path.patch
-)
-
-src_prepare() {
-	default
-
-	eprefixify mod/regex/mod.xml
-
-	java-pkg_clean
-	echo "<version>${PV}</version>" > version.xml || die
-}
-
-src_configure() {
-	java-ant-2_src_configure
-
-	# Because this crazy package uses XSLT, we need to escape this.
-	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
-
-	EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}/usr/share/javacc/lib"
-	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
-	EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
-}
-
-src_test() {
-	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd || die
-	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd || die
-	java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd || die
-
-	md5sum -c <<EOF || die "Failed to verify md5sum"
-4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
-d096c1fb462902e10a3440a604a21664  test/test.xsd
-3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
-fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
-EOF
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_dolauncher ${PN} \
-		--main com.thaiopensource.relaxng.translate.Driver
-
-	docinto html
-	dodoc build/*.html
-}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 9baffa3dacb6..710493a26075 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,4 +1 @@
-DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b SHA512 460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19
-DIST xapian-omega-1.4.23.tar.xz 571596 BLAKE2B fee64cf73a7bc8e6951c3555f1139bec8c94102b00ccf3a0a69c5037002f122f0d1688a798967f997f85d6c21bd69d72758168408d95159a7442bc46050fe915 SHA512 2137972cebb10315f35024c8a5e179ce082eab777e4fd795ba6700eeab0d77ec49b6e06d104222e77824898c25c1717d346564d59e5f349360fec89476e3ee4f
-DIST xapian-omega-1.4.24.tar.xz 580736 BLAKE2B bdefb4a28185e5966c8f7ec7056562bdca39d02b5fb92d57b3b4ab051107fb80d198c5f2d460d067fa085ebad99276476b6ec0cb53636ae4dd3fb62f6a546f0e SHA512 d3a5c5c4de9a13ed2e55ab46915aaea1ba51120b5716a4e7cab9fb628ef2c979c83e17a44d3354045459d08a6d7041322182d9c81bdbb54eb6bd53431d147a9c
 DIST xapian-omega-1.4.25.tar.xz 578904 BLAKE2B d0bb62741f7c58d1398a4dc8bca3de2b385094fb8126a4e36f424cb09964ac350709bf6dabc38d8d7ebf5f3fcd213d2a444d8e5e5cc52c6353f1c72fc7eebd72 SHA512 2b0d855baaaabbf6da1b86d61f0d3e85d5fb62d1b7d04738a7e15758d0042b9e22f80f0aa273b9a9a21b04dff579c561280e44f2a69a0c0d4f270cb0fbcef169
diff --git a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
deleted file mode 100644
index 3dbebdbb01ed..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.22.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
-
-HOMEPAGE="https://xapian.org/"
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.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/xapian-omega/xapian-omega-1.4.23.ebuild b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild
deleted file mode 100644
index a9a75d694991..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.23.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
-
-HOMEPAGE="https://xapian.org/"
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.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/xapian-omega/xapian-omega-1.4.24.ebuild b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild
deleted file mode 100644
index 1e0983f89c26..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.24.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
-
-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/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index c0b61d37790f..ca41b581cd27 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,9 +1,6 @@
 DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
 DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
-DIST protobuf-25.1.tar.gz 5878124 BLAKE2B a0b917e4518b07b221afd01e801e45b5b6fa35c7ccf8c21120d6a63f7174e53cc37d0516b1802d9243f8bb37b72b7f460a36dcbf0fffb09e011b05315c53efc3 SHA512 d2fad2188118ced2cd951bdb472d72cc9e9b2158c88eeca652c76332a884b5b5b4b58628f7777272fa693140753823584ea9c7924f1655b1d5a363f59bdf7a4c
-DIST protobuf-25.2.tar.gz 5878387 BLAKE2B 1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea SHA512 66f0b177eae0e2e40b8b17c8f411cd9dec5355dcfc145b8a79426e6367babcc28b9a8078bbe4ba2de47a82811a2e1a89d36955d6fa0c8d391cfeada4eb160fdb
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
-DIST protobuf-26.0.tar.gz 5957426 BLAKE2B 246b81a2c037047c10aeb004bbc4836d1d1cd73eadd0780060bf7fe60cee2cfa4e14afdb07c2a6fa2381e4656a47a148cf77315f1caa8c1bf6c137e06b0de168 SHA512 b350e0be51e4977865bfcc086506e1d85421da5d9386d2b10dada98a9a1a32a7b44e2ace866e605b42f1e2b6a702e6eca7fa9f5346819b55dd7d09f5ded3628c
 DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
deleted file mode 100644
index 2c2fc51fb3b6..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.1 from the 25.1 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-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() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v25.1/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/v25.1/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/v25.1/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v25.1/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.25.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
deleted file mode 100644
index 5276064d1543..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.2 from the 25.2 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-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() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v25.2/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/v25.2/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/v25.2/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v25.2/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.26.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild
deleted file mode 100644
index 5c59d510ec97..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.26.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.26.0 from the 26.0 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.26.0-unittest.protos.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() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v26.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/v26.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.java_source.dir}:java/core/src:' \
-		-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/v26.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
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v26.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/saxon/Manifest b/dev-java/saxon/Manifest
index 4f96b04522b3..38e8f07647f7 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,2 +1 @@
-DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
deleted file mode 100644
index 8dd6a5a954af..000000000000
--- a/dev-java/saxon/saxon-6.5.5-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
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Set of tools for processing XML documents"
-HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="6.5"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jdom:0"
-
-# Restricting to jdk:1.8 for following reason:
-# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml
-# package org.w3c.dom;
-DEPEND="${CP_DEPEND}
-	virtual/jdk:1.8"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	unpack ${A}
-	unzip -qq source.zip -d src || die "failed to unpack"
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r4.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
deleted file mode 100644
index 1513e7c8fedb..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r4.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
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A XSLT and XQuery Processor"
-HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
-S="${WORKDIR}"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/xom:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_prepare() {
-	default
-
-	# Fedora-inspired removal.
-
-	# deadNET.
-	rm -rv net/sf/saxon/dotnet || die
-
-	# Depends on XQJ (javax.xml.xquery).
-	rm -rv net/sf/saxon/xqj || die
-
-	# This requires a EE edition feature (com.saxonica.xsltextn).
-	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
-
-	# <major>.<minor> version
-	local version="$(ver_cut 1-2)"
-
-	# generate build.xml with external javadoc links
-	sed -e "s:@JDK@:1.6:" \
-		-e "s:@JDOM@:1:" \
-		< "${FILESDIR}/${version}-build.xml" \
-		> "${S}/build.xml" \
-		|| die "build.xml generation failed!"
-
-	# prepare creates the dir for properties
-	eant prepare
-
-	# properties
-	cp -v \
-		"${FILESDIR}/${version}-edition.properties" \
-		"${S}/build/classes/edition.properties" || die
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
-	gcp="${gcp}:$(java-pkg_getjar --build-only ant ant.jar)"
-	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
-	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/api
-
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index b281c4a54433..bbd937c2b8d7 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,4 +1 @@
-DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
-DIST xapian-bindings-1.4.23.tar.xz 1076480 BLAKE2B 521563f86d3be88458cee220065cbdbf27633f87535b1702c8c3484860533dc9395060c72582420e32b854601c1ee1eb424e03a9251965215de834f2b130b154 SHA512 25ac17baf1f288dedce70b983cba294d4ce100f6f5b607c76f5b697c04f6b08c276a55ccd5b9cc9c429664e1bb86f0fc31d88c72481a9cc951942efdfa9726a2
-DIST xapian-bindings-1.4.24.tar.xz 1112744 BLAKE2B 1910ad8b78c9ae011b51001e90d74eaa2ecc9ff0c44dae34e1a63a3de79e041dd25e6c0aff06e1cf954aecd0a2ab899f7474c25fddc55676dcad6bf8d12eae14 SHA512 e3d178679aaaf99efa1a19f764014f835783e72b057cb8c8a83eb4cb610e93bd4e6756410321770f6d7fa14986c71be19aaa140fb8267a848d4c8c96cc26d540
 DIST xapian-bindings-1.4.25.tar.xz 1076644 BLAKE2B 190c560d341039c68b35421c1a75e791537f9c2c353a5f0871d45055909e2863cd4ede3062a6b641e1572b74db8c049a0266a6c305e7d41bfb5d5c63057ef3e3 SHA512 119f62b53d487319e33aaf0c473e479a52b3831a46b23724188dada13f341e08facc7b79641c00ba7b0507c22b55c7b700182e65b5a195cd322be2098bcca183
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
deleted file mode 100644
index 5398a4350466..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="ruby30 ruby31 ruby32"
-RUBY_OPTIONAL="yes"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env 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 ~mips ppc ppc64 sparc x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )
-"
-
-COMMONDEPEND="
-	>=dev-libs/xapian-1.4.21
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono )
-	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="
-	${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMONDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-precompiled-python.patch
-	"${FILESDIR}"/${P}-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 mono || 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 mono && mono-env_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 mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--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-bindings/xapian-bindings-1.4.23.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
deleted file mode 100644
index afb64e3d13bd..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.23.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{9..11} )
-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="ruby30 ruby31 ruby32"
-RUBY_OPTIONAL="yes"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env 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 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )
-"
-
-COMMONDEPEND="
-	>=dev-libs/xapian-1.4.23
-	lua? ( ${LUA_DEPS} )
-	mono? ( dev-lang/mono )
-	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="
-	${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMONDEPEND}
-	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 mono || 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 mono && mono-env_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 mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--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-bindings/xapian-bindings-1.4.24.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild
deleted file mode 100644
index bc39434724f1..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.24.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{10..11} )
-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"
-
-# mono-env does not support EAPI 8
-inherit autotools java-pkg-opt-2 lua mono-env 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 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="
-	|| ( java lua mono 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} )
-	mono? ( dev-lang/mono )
-	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 mono || 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 mono && mono-env_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 mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--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 86628f3347ac..ba492762f95a 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,4 +1 @@
-DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B f4aec86cd5f63f6f1825a4f8f427ea23be2092ffb4ca11a2fdf20bdf652e7b9f768b1155bcf7ee5e5c5313206c92e1725d1b4d562e3074539a2e8f9901c44f8e SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29
-DIST xapian-core-1.4.23.tar.xz 3024644 BLAKE2B e26a9fd5e79daf553b474e3c794178df2cdcd83ce7d7a45ae112dde624d6e7add157c76fda3a333afce6103b2edaf7e3c928e78c47aa1fd19821c3c73926442f SHA512 52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380
-DIST xapian-core-1.4.24.tar.xz 3194164 BLAKE2B fc3484df448d2102d47005b2819eea8eee3fdb4337a42967e2b535187e4b7be9841a8e12b19291f29bdef52b3270529f94376fe91d5e4c70afebaf690a23b18f SHA512 2b156dd90784264d6bf64e66aca559578f946c013bb52e14e56fcd96e9c2fece71c236735b13d2baad0d7f2d410dea3ae54c94cd80f735baf1071bafe2e5c01c
 DIST xapian-core-1.4.25.tar.xz 3205904 BLAKE2B 7b03a8fabc3c688f58b3451541dedb664de0a02d7c46a4e8eac080c004232575c00428110eaab0ea463df5c3f43f2b4cebfbe6754f897e55f113683c1db43b2b SHA512 e8069f2cb75554978716a99580fb57fc73bbdd607c82394f53d07205d8c78fb59265004be0c676a6806bb2840a3933499dfc867e36a28855278569a0676d469d
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index 883360ac2aee..0f6e2a741a7e 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -11,8 +11,4 @@
 		to easily add advanced indexing and search facilities to their own
 		applications.
 	</longdescription>
-	<use>
-		<flag name="inmemory">Enabled inmemory backend db support</flag>
-		<flag name="remote">Enabled remote backend db support</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/xapian/xapian-1.4.22.ebuild b/dev-libs/xapian/xapian-1.4.22.ebuild
deleted file mode 100644
index bd255b5fb495..000000000000
--- a/dev-libs/xapian/xapian-1.4.22.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS HACKING PLATFORMS README NEWS"
-
-src_configure() {
-	local -a myconf
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=( --enable-sse=sse2 )
-	else
-		if use cpu_flags_x86_sse; then
-			myconf+=( --enable-sse=sse )
-		else
-			myconf+=( --disable-sse )
-		fi
-	fi
-
-	myconf+=( $(use_enable static-libs static) )
-
-	use inmemory || myconf+=( --disable-backend-inmemory )
-	use remote || myconf+=( --disable-backend-remote )
-
-	myconf+=(
-		--enable-backend-glass
-		--enable-backend-chert
-		--program-suffix=
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake check VALGRIND=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.23.ebuild b/dev-libs/xapian/xapian-1.4.23.ebuild
deleted file mode 100644
index 40a621af6000..000000000000
--- a/dev-libs/xapian/xapian-1.4.23.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS HACKING PLATFORMS README NEWS"
-
-src_configure() {
-	local -a myconf
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=( --enable-sse=sse2 )
-	else
-		if use cpu_flags_x86_sse; then
-			myconf+=( --enable-sse=sse )
-		else
-			myconf+=( --disable-sse )
-		fi
-	fi
-
-	myconf+=( $(use_enable static-libs static) )
-
-	use inmemory || myconf+=( --disable-backend-inmemory )
-	use remote || myconf+=( --disable-backend-remote )
-
-	myconf+=(
-		--enable-backend-glass
-		--enable-backend-chert
-		--program-suffix=
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake check VALGRIND=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.24.ebuild b/dev-libs/xapian/xapian-1.4.24.ebuild
deleted file mode 100644
index dc4d3f009870..000000000000
--- a/dev-libs/xapian/xapian-1.4.24.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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_install() {
-	default
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f420a0880b70..6b773b625307 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -220,7 +220,6 @@ net-misc/curl sslv3
 
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-05-04)
 # No suitable version of dev-libs/protobuf available.
->=dev-java/protobuf-java-3.24.2 system-protoc
 =dev-java/protobuf-java-3.23.0 system-protoc
 
 # Joonas Niilola <juippis@gentoo.org> (2023-06-06)
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 687b6214d0a6..bf2e52948e42 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,4 +1,2 @@
-DIST openmpi-4.1.4.tar.bz2 10042839 BLAKE2B b020e3530ae5dde7b144e7c33b1a3f26f622526a4b48a97a0956fc6f49bbf9dfd5be9ebeeaf3bdc5168a307507408ba5dd8e2a537148821e1d476678177dc5d6 SHA512 c70a92c9b16b8c76a871183f9b180d60861186e64140da897d206d53bc06213f31ea93b31734645f580f4bf28dda5605d85dbce2417e4596955384d961bed653
-DIST openmpi-4.1.5.tar.bz2 10045426 BLAKE2B 135a8373ed6173b7a94def18e3b964c6b6050c909382e0dbb1898a6d261ae428931358121ef6d325d303f4f510017a94970f7c66b280a5fc460365821f36dece SHA512 7a2188684ed7542fe42e1717ae72cb859b4f3d6f722c9d3ba04bfed6c2178b3e7da3a536629d312c23571fed4d9b2ca5e20e85898ae5144e9332bd898e6e1cc6
 DIST openmpi-4.1.6.tar.bz2 10017002 BLAKE2B 4f119e1ed9b8787f0f860295ab1721fe2fd5300b8e182230a9eba3a864680b02bbd30618cc6d798a693a121626fc0ad5f447144d9ba91becb734f1a530d7a23a SHA512 0ef3240f9c436fb19b67e836cac376eafeb7825d12de3387dad04329dee9f182799d17d785ea23eba763810f479015bb5230593c28950b616b2f0aa1c0a81e71
 DIST openmpi-5.0.3.tar.bz2 29761888 BLAKE2B a084813f3dada12bbe77dcc6ef0ec0454980779f97ccb46f37f3d7df3bf7299e6484ec3427c2ca784e70876f62dc061a13cb7f08348e3d649e27f2bece9a09ac SHA512 60e8f6dcd6b1531ce8164e02f40be9a364ab484166a2a7b13bdff115a508f0596e97ad0a4204a47799ae608ba484a7ba9503042bddffe675f09ce22071b0b4a9
diff --git a/sys-cluster/openmpi/openmpi-4.1.4-r1.ebuild b/sys-cluster/openmpi/openmpi-4.1.4-r1.ebuild
deleted file mode 100644
index 31ae4c8e66fa..000000000000
--- a/sys-cluster/openmpi/openmpi-4.1.4-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda fortran-2 java-pkg-opt-2 multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio valgrind
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads(+)]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	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 )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-	valgrind? ( dev-debug/valgrind )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-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
-
-	# 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
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	local myconf=(
-		# 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-orterun-prefix-by-default
-		--enable-pretty-print-stacktrace
-
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-
-		--with-hwloc="${EPREFIX}/usr"
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-libltdl="${EPREFIX}/usr"
-		--with-libevent="${EPREFIX}/usr"
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
-
-		# Re-enable for 5.0!
-		# See https://github.com/open-mpi/ompi/issues/9697#issuecomment-1003746357
-		# and https://bugs.gentoo.org/828123#c14
-		--disable-heterogeneous
-
-		$(use_enable cxx mpi-cxx)
-		$(use_enable ipv6)
-		$(use_enable libompitrace)
-		$(use_enable peruse)
-		$(use_enable romio io-romio)
-
-		$(use_with cma)
-
-		$(multilib_native_use_enable java mpi-java)
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
-
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
-		$(multilib_native_use_with valgrind)
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_rm_pbs tm)
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-	)
-
-	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-4.1.5.ebuild b/sys-cluster/openmpi/openmpi-4.1.5.ebuild
deleted file mode 100644
index ab2269364e29..000000000000
--- a/sys-cluster/openmpi/openmpi-4.1.5.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FORTRAN_NEEDED=fortran
-inherit cuda fortran-2 multilib-minimal
-
-MY_P=${P/-mpi}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran ipv6 libompitrace peruse romio valgrind
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="
-	openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads(+)]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	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 )
-	openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-debug/valgrind )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
-)
-
-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
-
-	# 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
-}
-
-multilib_src_configure() {
-	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-orterun-prefix-by-default
-		--enable-pretty-print-stacktrace
-
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-
-		--with-hwloc="${EPREFIX}/usr"
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-libltdl="${EPREFIX}/usr"
-		--with-libevent="${EPREFIX}/usr"
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
-
-		# Re-enable for 5.0!
-		# See https://github.com/open-mpi/ompi/issues/9697#issuecomment-1003746357
-		# and https://bugs.gentoo.org/828123#c14
-		--disable-heterogeneous
-
-		$(use_enable cxx mpi-cxx)
-		$(use_enable ipv6)
-		$(use_enable libompitrace)
-		$(use_enable peruse)
-		$(use_enable romio io-romio)
-
-		$(use_with cma)
-
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
-
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
-		$(multilib_native_use_with valgrind)
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
-		$(multilib_native_use_with openmpi_rm_pbs tm)
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-	)
-
-	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-4.1.6.ebuild b/sys-cluster/openmpi/openmpi-4.1.6.ebuild
index 524f03b078b6..6011e81b155b 100644
--- a/sys-cluster/openmpi/openmpi-4.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.1.6.ebuild
@@ -24,7 +24,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 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"
+SRC_URI="https://download.open-mpi.org/release/open-mpi/v$(ver_cut 1-2)/${P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b2942befb285..eb4b5c7c4500 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -33,6 +33,9 @@ DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B b6ad898a5a66a1a6ef293bc4a4a88
 DIST genpatches-6.1-99.base.tar.xz 5167668 BLAKE2B 0dfd80fa50e373b99b3ec8c2adcc80eabaa0df9606831465c2afbca34cc195f41902a5ad4472b822eb2e011356c51b257a39294ae1d123c7384f915bd0a6249a SHA512 39116b71b7da155596a158ebb1aeafb029bf5c0d1ec983efbbdb323af61fc505c3a67beac4e6f888b3b673cdc271ef1dbc3090580aa89f573a652ebe0d501ccf
 DIST genpatches-6.1-99.experimental.tar.xz 17444 BLAKE2B efc5c844d978f3478776e27faffc45a72745dcb14757963a57beacd3dec248f96600d3680592d7c1913cb7b6d05e5316490286d3a4467bf9f18260b69e2594b5 SHA512 b56195fc9a6b0ff5f20f46247ad7e61c45c278cbdc6c3cafb32984d6fb5eac5b35d21412ad2966c562e90b6f9a4057beb5cd19a47b05eb856f7c477dbcbbbf12
 DIST genpatches-6.1-99.extras.tar.xz 3848 BLAKE2B aaa18ac05550c0694e3a8051e41acbf7b135d593dbbe2ebf8f757996502d1721e96cf11edb5ae87337667f340640ee1ca55de0a8266b4a2fc929dc80065df746 SHA512 0528cbbeb530d0765af843db8479ab6ce011df60be5c3bdc913c81f1299868f772e9d751b973edd75d7020cef7ac0f5645528e50b87f4ae59fac2392cf86137d
+DIST genpatches-6.10-1.base.tar.xz 4220 BLAKE2B 88c5d8cd4e7c77bdec5cb241589a7df08e4a8048c3763ee0e06e48417b8cefbea4d68dfa4fd3810019363cc5909106ace52c76eae918d5f508c10050e0048625 SHA512 ccfe33ca2e440d13f5971439c2c199c1993bebb99fb41ade0187df11b351a5f4517583888e8932cc21d8d2238fd76fa92583c6aeeb4060374e69277ef57d7214
+DIST genpatches-6.10-1.experimental.tar.xz 5732 BLAKE2B e292686062e2785b31d16e9c36604821fb9b643e6fd52d52f4962eab246d1dcadedb48f7a8077bbf31a230abd528c3db875eefdf937b658a7e7932671d2685cb SHA512 c93f52af501302368d865bef004c799fd1c1e662e367cd840d8d57a23214a398c41d44f6709966c090a9d4da5dec6d7ca6fea8e0d551b033fcece7f532d75dea
+DIST genpatches-6.10-1.extras.tar.xz 4048 BLAKE2B 0d5a2d079771c422be590f5622896b96aa3f1f9c8b8d8cf13035abe773e3e8eeed4ddde8d701394cf0cc9cf927e81abf9de401bf742ae1511dfc57af5d686df6 SHA512 ea664afec2047b15ce10d44dcc7052af0ab894752e7608ad28f598ee22e06533a44d50b117e6b01ed9afe8eef05c568728ca10d40ca9d6edfc50829e223bccf1
 DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e SHA512 e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1
 DIST genpatches-6.6-37.experimental.tar.xz 5756 BLAKE2B d5e6fcbdc0330789018b8daf43d9c0bb797218b2fd3a1ed70b303f7214505dc95ea4666a6e473d470df65ae2bfb7d9e88486d85d160f8d27f87c858c6c0762ff SHA512 57e1045b53de80a8b237e6cfd67549b4c67ac396b3a654d4e740f4cfb00a654645b3015c9064cbf67048c70c59beb30ee552bd95cfd449c93ec2c2d1b8e1a855
 DIST genpatches-6.6-37.extras.tar.xz 3736 BLAKE2B e54e5dc4b2cc854dbac9fc0d03dad93cbe4aa639142090271abcc0e797ab28e3377986f46767df8d6802edaed058e1b3999067c96d05ec8bbb42f48e33f96cb6 SHA512 be6299eedccde2d9e4cd37d4df14ef6c6a404892f18c40c4acfac31dfd20f1f0c28be767fccd8a7ee0817b32490057c76fc01d895f979686ade5a0357a59515b
@@ -66,5 +69,6 @@ DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e36567
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84a20015239cf157e3f4f51c7ac5efedc8a51132b2d7482f9276ac418de6624831c8a3b806130d9c2d2124c539b SHA512 baa2487954044f991d2ae254d77d14a1f0185dd62c9f0fcaff69f586c9f906823017b8db1c4588f27b076dfa3ebb606929fec859f60ea419e7974330b9289cc2
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.10.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.10.0.ebuild
new file mode 100644
index 000000000000..885f89fbb177
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.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"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+
+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
+}