From 97bacba3ead078e5db8b87ab651a3ffa7d82f60f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 17 Apr 2024 12:04:28 +0100
Subject: gentoo auto-resync : 17:04:2024 - 12:04:27

---
 dev-java/Manifest.gz                   | Bin 55812 -> 55810 bytes
 dev-java/fop/Manifest                  |   2 +-
 dev-java/fop/fop-2.9-r1.ebuild         | 201 ++++++++++++++++++++++++++++++++
 dev-java/fop/fop-2.9.ebuild            | 204 ---------------------------------
 dev-java/jflex/Manifest                |   2 +-
 dev-java/jflex/jflex-1.6.1-r1.ebuild   | 124 --------------------
 dev-java/jflex/jflex-1.6.1-r2.ebuild   | 126 ++++++++++++++++++++
 dev-java/jtidy/Manifest                |   2 +-
 dev-java/jtidy/jtidy-1.0-r2.ebuild     |   2 +-
 dev-java/qdox/Manifest                 |   2 +-
 dev-java/qdox/qdox-1.12.1-r3.ebuild    |  86 --------------
 dev-java/qdox/qdox-1.12.1-r4.ebuild    |  86 ++++++++++++++
 dev-java/saxon/Manifest                |   2 +-
 dev-java/saxon/saxon-9.2.0.6-r3.ebuild |  91 ---------------
 dev-java/saxon/saxon-9.2.0.6-r4.ebuild |  90 +++++++++++++++
 15 files changed, 509 insertions(+), 511 deletions(-)
 create mode 100644 dev-java/fop/fop-2.9-r1.ebuild
 delete mode 100644 dev-java/fop/fop-2.9.ebuild
 delete mode 100644 dev-java/jflex/jflex-1.6.1-r1.ebuild
 create mode 100644 dev-java/jflex/jflex-1.6.1-r2.ebuild
 delete mode 100644 dev-java/qdox/qdox-1.12.1-r3.ebuild
 create mode 100644 dev-java/qdox/qdox-1.12.1-r4.ebuild
 delete mode 100644 dev-java/saxon/saxon-9.2.0.6-r3.ebuild
 create mode 100644 dev-java/saxon/saxon-9.2.0.6-r4.ebuild

(limited to 'dev-java')

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5a00e2d9f7de..e7caa67f7cfd 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 17ad1e4586d2..75b88426b373 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -6,5 +6,5 @@ DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90
 DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
 DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
 DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
-EBUILD fop-2.9.ebuild 6080 BLAKE2B 46023c767789f0d701e7f143407356d1da4e32704270336e8844118089ed10dc76445bcb30f7448db3c852f2e17eef4a05aa1584cf08143a4b1bea8deaa18528 SHA512 5ca781265e070bc9c8d4693338d17483906edaa1018943f6afa16e63689a5c8714a13e4de56084c0ac4e53906998820e59982ff549a3a810eef3b4e78414299c
+EBUILD fop-2.9-r1.ebuild 6147 BLAKE2B db0bbefcde63a6036dcf08b6ee91024deeb152870a2b38604b13cec8a9ce65fda7f1dde94294b13a2a7872857db3b93b424fdda1e4469f302c67aa0b7c57af1b SHA512 d5555e2186fa5f3c2e48d2d8d810e7cc389ad7f049a62ec19a41166ea3c188af8cddecb701e55e7480bbffc0bdd538b62110c324a5051e0f3895e842090e1d41
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/fop-2.9-r1.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
new file mode 100644
index 000000000000..c9268c877d7d
--- /dev/null
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -0,0 +1,201 @@
+# 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.apache.xmlgraphics:fop:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="
+	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+	https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
+"
+S="${WORKDIR}/fop-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2.8"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+
+BDEPEND="
+	dev-java/xalan:0
+	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
+"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/batik:1.16
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	dev-java/fontbox:0
+	dev-java/javax-servlet-api:2.2
+	dev-java/qdox:1.12
+	dev-java/sun-jai-bin:0
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:2
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch"
+	"${FILESDIR}/fop-2.9-PDFToUnicodeCMapTestCase.patch"
+	"${FILESDIR}/fop-2.9-MissingLanguageWarningTestCase.patch"
+	"${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch"
+)
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	# while ant could install multiple jar files we only need ant.jar
+	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)"
+
+	JAVA_JAR_FILENAME="fop-util.jar"
+	JAVA_SRC_DIR="fop-util/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-events.jar"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-core.jar"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
+	pushd fop-core/src/main/codegen/fonts > /dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd > /dev/null || die
+	java-pkg-simple_src_compile
+
+	# Update "fop-core.jar" with "event-mode.xml" files produced manually
+	# by running "mvn package".
+	# Upstream does this with maven-antrun-plugin:
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
+	mkdir event-model && pushd $_ > /dev/null || die
+		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
+	popd > /dev/null || die
+
+	jar -uf "fop-core.jar" -C event-model . || die
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
+	rm -r target || die
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
+
+	einfo "Testing fop-events"
+	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+	mkdir generated-test || die
+	mv {target/test-classes,generated-test}/org || die
+	java-pkg-simple_src_test
+
+	einfo "Testing fop-core"
+	pushd fop-core/src/test/java > /dev/null || die
+		# Excluding one test, see https://bugs.gentoo.org/903880
+		local JAVA_TEST_RUN_ONLY=$(find * -type f \
+			-name "*TestCase.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+		local vm_version="$(java-config -g PROVIDES_VERSION)"
+		# these tests would fail with java.lang.NoSuchMethodError if compiled with jdk-1.8
+		if ver_test "${vm_version}" -eq "1.8"; then
+			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.render.pdf.PDFEncodingTestCase}
+			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.fonts.truetype.OTFToType1TestCase}
+#			org.apache.fop.render.pdf.PDFEncodingTestCase
+#			org.apache.fop.fonts.truetype.OTFToType1TestCase
+		fi
+	popd > /dev/null || die
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
+	# <workingDirectory>../fop</workingDirectory>
+	pushd fop > /dev/null || die
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
+		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
+		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
+		java-pkg-simple_src_test
+	popd > /dev/null || die
+}
+
+src_install() {
+	local module
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar "${module}.jar"
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
deleted file mode 100644
index e691baf0a9e9..000000000000
--- a/dev-java/fop/fop-2.9.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="
-	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
-	https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-	verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
-	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
-"
-S="${WORKDIR}/fop-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
-
-BDEPEND="
-	dev-java/xalan:0
-	verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
-"
-
-CP_DEPEND="
-	dev-java/batik:1.16
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	dev-java/fontbox:0
-	dev-java/qdox:1.12
-	dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/ant-core:0
-	dev-java/javax-servlet-api:2.2
-	dev-java/sun-jai-bin:0
-	test? (
-		dev-java/mockito:2
-		dev-java/pdfbox:0
-		dev-java/xmlunit:1
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}/fop-2.9-PDFEncodingTestCase.patch"
-	"${FILESDIR}/fop-2.9-PDFToUnicodeCMapTestCase.patch"
-	"${FILESDIR}/fop-2.9-MissingLanguageWarningTestCase.patch"
-	"${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="
-	ant-core
-	javax-servlet-api-2.2
-	sun-jai-bin
-"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	java-pkg_clean
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	JAVA_JAR_FILENAME="fop-util.jar"
-	JAVA_SRC_DIR="fop-util/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
-	rm -r target || die
-
-	JAVA_JAR_FILENAME="fop-events.jar"
-	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
-	JAVA_SRC_DIR="fop-events/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
-	rm -r target || die
-
-	JAVA_JAR_FILENAME="fop-core.jar"
-	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
-	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
-	JAVA_SRC_DIR="fop-core/src/main/java"
-	# Code generation according to
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
-	pushd fop-core/src/main/codegen/fonts > /dev/null || die
-		local fonts=$(find . -name "Courier*.xml" \
-			-o -name "Helvetica*.xml" \
-			-o -name "Times*.xml" \
-			-o -name "Symbol.xml" \
-			-o -name "ZapfDingbats.xml"
-			)
-		for font in ${fonts}; do \
-			xalan -XSLTC \
-				-IN $font \
-				-XSL font-file.xsl \
-				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
-		done
-		xalan -XSLTC \
-			-IN encodings.xml \
-			-XSL code-point-mapping.xsl \
-			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
-	popd > /dev/null || die
-	java-pkg-simple_src_compile
-
-	# Update "fop-core.jar" with "event-mode.xml" files produced manually
-	# by running "mvn package".
-	# Upstream does this with maven-antrun-plugin:
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
-	mkdir event-model && pushd $_ > /dev/null || die
-		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
-	popd > /dev/null || die
-
-	jar -uf "fop-core.jar" -C event-model . || die
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
-	rm -r target || die
-
-	if use doc; then \
-		JAVA_SRC_DIR=(
-			"fop-util/src/main/java"
-			"fop-events/src/main/java"
-			"fop-core/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
-
-	einfo "Testing fop-events"
-	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
-	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
-	# This jar file was created manually from the output of "mvn test".
-	# Upstream does this with maven-antrun-plugin
-	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
-	mkdir generated-test || die
-	mv {target/test-classes,generated-test}/org || die
-	java-pkg-simple_src_test
-
-	einfo "Testing fop-core"
-	pushd fop-core/src/test/java > /dev/null || die
-		# Excluding one test, see https://bugs.gentoo.org/903880
-		local JAVA_TEST_RUN_ONLY=$(find * -type f \
-			-name "*TestCase.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-		local vm_version="$(java-config -g PROVIDES_VERSION)"
-		# these tests would fail with java.lang.NoSuchMethodError if compiled with jdk-1.8
-		if ver_test "${vm_version}" -eq "1.8"; then
-			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.render.pdf.PDFEncodingTestCase}
-			JAVA_TEST_RUN_ONLY=${JAVA_TEST_RUN_ONLY//org.apache.fop.fonts.truetype.OTFToType1TestCase}
-#			org.apache.fop.render.pdf.PDFEncodingTestCase
-#			org.apache.fop.fonts.truetype.OTFToType1TestCase
-		fi
-	popd > /dev/null || die
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
-	# <workingDirectory>../fop</workingDirectory>
-	pushd fop > /dev/null || die
-		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
-		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
-		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
-		java-pkg-simple_src_test
-	popd > /dev/null || die
-}
-
-src_install() {
-	local module
-	for module in fop-util fop-events fop-core ; do
-		java-pkg_dojar "${module}.jar"
-		if use source; then
-			java-pkg_dosrc "${module}/src/main/java/*"
-		fi
-	done
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
-	einstalldocs
-}
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 8a58f0d25f95..1b04d71e92b7 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1-r1.ebuild 3543 BLAKE2B 9dabbd888b52ff63732c80da18559576dd871a34269dd2fd7a6f1817d3d24f464467e149f1e04c3fa6476225bdf6efd6894ab31a797466bb11ce0a1365835df3 SHA512 b1511c58686dbe4d6f4ae5d2e6e730532070508be2b25569ba927c09e6dafdec2614c3cbbfa74725f7fe16ba5de1c76269f1807df3c9624cbc8920361bac9f8a
+EBUILD jflex-1.6.1-r2.ebuild 3520 BLAKE2B c49021cefb11baa37387d5582b2bd54dfe26730990ea7bd6ef42c5bd2840fca430121e650648769241afb7b9796ec2c8a6b5ac12792cd3e00bdc08b7badfb17b SHA512 0f65b28f18e0d7c1985be060070754e78d3f7e7ba9972b3f43b41e035e9d1035a00dbd1cb9913f397fc360c57dd7ab910a50c179cf213d796d319c5623697063
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
deleted file mode 100644
index 58580490d2fc..000000000000
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,124 +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 java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="https://www.jflex.de/"
-SRC_URI="https://${PN}.de/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE="examples test vim-syntax"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/ant-core:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-
-PDEPEND="dev-java/javacup:0"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	eapply_user
-
-	# See below for details.
-	eapply "${FILESDIR}/icedtea-arm.patch"
-
-	# We need the bundled jflex.jar.
-	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
-
-	# Remove the bundled java-cup.jar if unneeded.
-	if has_version ${PDEPEND}; then
-		rm -v lib/java-cup-*.jar || die
-	fi
-}
-
-src_configure() {
-	# javacup is a cyclic dependency. Use the package if we have it,
-	# otherwise use the bundled version and install the package later.
-	if has_version ${PDEPEND}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
-	else
-		JAVACUP=$(echo lib/java-cup-*.jar)
-	fi
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
-}
-
-jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
-
-	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
-	# jflex. We have patched jflex to fix it but we have to run the
-	# bundled version first. -Xint works around the problem. See
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
-	use arm && local JFLEX_ARGS="-Xint"
-
-	# First compile (without doc/source) using the bundled jflex.
-	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
-
-	# Then recompile using the fresh jflex.
-	jflex_compile -cp "${PN}.jar:${JAVACUP}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${PN}.Main
-
-	java-pkg_register-dependency javacup javacup-runtime.jar
-	java-pkg_register-ant-task
-
-	use examples && java-pkg_doexamples examples
-	dodoc {changelog,README}.md
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/*.{css,html,png} doc/COPYRIGHT
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins lib/${PN}.vim
-	fi
-}
-
-src_test() {
-	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
-		# This results in a StackOverflowError as of 1.8.0.65 but works
-		# fine on icedtea:7. Don't know about icedtea:8 yet.
-		rm -v src/test/java/jflex/EmitterTest.java || die
-	fi
-
-	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
-
-	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jflex/jflex-1.6.1-r2.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..17d1b99fd468
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r2.ebuild
@@ -0,0 +1,126 @@
+# 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
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-java/ant-1.10.14:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+
+PDEPEND="dev-java/javacup:0"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	eapply_user
+
+	# See below for details.
+	eapply "${FILESDIR}/icedtea-arm.patch"
+
+	# We need the bundled jflex.jar.
+	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+	# Remove the bundled java-cup.jar if unneeded.
+	if has_version ${PDEPEND}; then
+		rm -v lib/java-cup-*.jar || die
+	fi
+}
+
+src_configure() {
+	# javacup is a cyclic dependency. Use the package if we have it,
+	# otherwise use the bundled version and install the package later.
+	if has_version ${PDEPEND}; then
+		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
+		# thanks to has_version above. This is Portage-specific but
+		# showing the warning elsewhere isn't the end of the world.
+		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+	else
+		JAVACUP=$(echo lib/java-cup-*.jar)
+	fi
+
+	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
+}
+
+jflex_compile() {
+	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+		--skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+		-parser LexParse -interface src/main/cup/LexParse.cup || die
+
+	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+	# jflex. We have patched jflex to fix it but we have to run the
+	# bundled version first. -Xint works around the problem. See
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+	use arm && local JFLEX_ARGS="-Xint"
+
+	# First compile using the bundled jflex.
+	jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+	# Then recompile using the fresh jflex.
+	jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	java-pkg_register-dependency javacup javacup-runtime.jar
+	java-pkg_register-ant-task
+
+	use examples && java-pkg_doexamples examples
+	dodoc {changelog,README}.md
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto html
+		dodoc doc/*.{css,html,png} doc/COPYRIGHT
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins lib/${PN}.vim
+	fi
+}
+
+src_test() {
+	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+		# This results in a StackOverflowError as of 1.8.0.65 but works
+		# fine on icedtea:7. Don't know about icedtea:8 yet.
+		rm -v src/test/java/jflex/EmitterTest.java || die
+	fi
+
+	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 99160addc0ad..152a934ffa7b 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,5 +1,5 @@
 AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
 EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B d78ac8d23e34f8e0b3398d18517ad8cca15fb7a503f4ff3ba729d2f376356da9ba1404899d18b5149c4cf66d1c5500f73b8d91984f0b1586c6951f67804e6a5e SHA512 fbf988d06410e3215bede2e621c701170ab0566eefcda2071da8c913c962a22c7479e718e2f297380c108cff1bf486f5f1ef94aa01b13c5214858e8009ce9e4b
-EBUILD jtidy-1.0-r2.ebuild 803 BLAKE2B 31075a5aeab41700b4c26f2dd471189aa1c44b999bde9e67bb4dcc42282fb0618d75cd4ebd77fde537d123bc4a64a7e560d2d2dcc8027db1e570dd5f8bb88995 SHA512 89eaaed6ea1f95c60fdc3b121b0a44ad0df13fee8705b94ab13f2f07eafe19cf3c25f345c5347523f5936604d1aeab84f55bc84610baf509aace4ff096ceb14a
+EBUILD jtidy-1.0-r2.ebuild 802 BLAKE2B b68ff5a1b23e1e982a390f4845e879f0e176eaa061d3db1e4766900758be4b32185b9432a57dbc5c0ad68eca8bc6ae07cd21cdf5d356edecfb9609c950c73c92 SHA512 432fdeb4ad79684c1763e83be1360067a1ac0b87dedfc568bf3962b0ef70f75105b036032d946a15ca1780c10f13d38ee2043eab151ac85c27ffdc0fa13bc0be
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index b4097a06d2f1..4323e2296f88 100644
--- a/dev-java/jtidy/jtidy-1.0-r2.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-source
 
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 1fe31923394c..6e457da8d361 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa
-EBUILD qdox-1.12.1-r3.ebuild 2172 BLAKE2B e7394846ea89da75fab13d32256319a3ef57638002e82caf3ff2c79043f3a02df8534f126b36ab077d883aa216364285e1346baa54a4c4ba60e064d40cac9095 SHA512 03c0d7f9e4571ac4cca4d6b69b12666f73144a42605e98d497ca3545b4d1012233df2979bd8662049b1be49e49dc93a5d84b7b383901ee49a52830d2c88674e0
+EBUILD qdox-1.12.1-r4.ebuild 2170 BLAKE2B a7d0ec67a704a7ce4a9eabf1848e122424cda2c7b30af7c1aa0fe852e3832eada2b8f0aaeb84da25ccbcaa514c086496a54aa6b84b98a787978e030c0e9f3c8c SHA512 83d92d6ae65d76fc70311801932ee84de01c1f417bba52c3503e651c00ab1ab99b03f036930ec157e72923e59c9f7a17cb0f25d1cfc02eb411e4d5a9137b62db
 EBUILD qdox-2.0.1.ebuild 2820 BLAKE2B e22d6ed9daaaf8f32cdf25d2355676adcb780261d2ab65928e580e2b26c5557d3a8a111f876c444888735faa9accc95e6ab42eee5dce3964ba1e5913a8c02baf SHA512 894ff8420252af370ac335e85c80ad56daeff216286b9534a5664399e951af5f2713606ae1e2f8641a6cd72c7edb2b2bda705a2ae88e3ef21013ca6499adc892
 MISC metadata.xml 494 BLAKE2B 9d4eebdef42221ae522f9642dd022db253e2672a5f7d990bc1c1116c49ad5004dd5c9ffd2944927610bbd15652cca26899d89b3422e3876b9f7fedb98306d8bd SHA512 944cada2a9b4e35e48516eb9faf506a8045dd29d42dd3958df9cfe54c73d6e7b715c8074aa2707f6ca7a5e3efc7138650d56bd1f9629cb1843cdc2c78365a999
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
deleted file mode 100644
index 9f0982c09a7e..000000000000
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ /dev/null
@@ -1,86 +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 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"
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.8:*
-	dev-java/byaccj:0
-	>=dev-java/jflex-1.6.1:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/jflex-1.6.1.patch"
-)
-
-src_prepare() {
-	default
-
-	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() {
-	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
-	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 ant-core,jmock-1.0)"
-
-	if use test ; then
-		cp="${cp}:$(java-pkg_getjars --build-only junit)"
-	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-core,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-1.12.1-r4.ebuild b/dev-java/qdox/qdox-1.12.1-r4.ebuild
new file mode 100644
index 000000000000..cf1dc1eeb7d5
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r4.ebuild
@@ -0,0 +1,86 @@
+# 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"
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+CDEPEND=">=dev-java/ant-1.10.14-r3:0"
+
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.6.1:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+	default
+
+	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() {
+	jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	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 ant,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	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/saxon/Manifest b/dev-java/saxon/Manifest
index 2349920f8ebc..3686b2e047f0 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,5 +3,5 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r3.ebuild 1030 BLAKE2B 2fa0fdbb23f091f40d4dc01839fd23f7c142cf707568115b8467da01b1055141bff5af82c86956281c0af1b7402db354242ddf0d6cbb10c1f7d14cc7269cc8eb SHA512 2f49c548ab0b1f7fb9920aa49cd64404c0811baa3200f2ac095e388864d6d55c81fbe86f81c485961b82be519d7fa955875968e58f10e14059e43e0f876fe1f4
-EBUILD saxon-9.2.0.6-r3.ebuild 1988 BLAKE2B d32471894d4638a39aedba18413d672fc08391e8d063c03bdbd8728de7f7fc543e07a681d71e4b10db3efb114f014a7c89dc9adcd30274d32f56c86a741ecfc2 SHA512 af4161a5b18dc8d4d0d83b0f90fd38e01c76a0abbacb34fa06553ea99f190cfff92e00d03f8d3ca088680a7c84f77d9853ac90f285bcb41d9f47ae6d38d4a31d
+EBUILD saxon-9.2.0.6-r4.ebuild 1997 BLAKE2B 8e85493743581f7a128713a73e00ee8d01c6e6cb1c5b71a4a0cefe11cf8ffd7008b1fa077800b52973cc181ced83239ace2ec70673523b1504c804b8aac713b6 SHA512 2bb51d0d10230f3519f9bc2ed0b28dfa80f0fa5bce351b13716464f2cbe6d22be638335fbf6446b7346aeea6af897697915605248e4e90fa98ae3a3bf60281dd
 MISC metadata.xml 312 BLAKE2B 819738845b7b0a9a9fcc19e4997fdfdaf55b820253d58ea32b1fac35dab2b5760e4cdadd38607b54df2f3bc2b10eee0d747d59c6785ecb3f1b3ca3a68e428be7 SHA512 f798aabc41fc786a18b25c42ac3201b8f2d3e665397f53bc1988531f8ea75ce0d8517af43dadf6fac433d8f689f25dc7f6593c83d941feac5a2d14fe58c82fd1
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
deleted file mode 100644
index f1e4921e2821..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ /dev/null
@@ -1,91 +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 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="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/ant-core: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"
-
-S="${WORKDIR}"
-
-# 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_getjars --build-only ant-core)"
-	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-java/saxon/saxon-9.2.0.6-r4.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
new file mode 100644
index 000000000000..af456c471e68
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
@@ -0,0 +1,90 @@
+# 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="mirror://sourceforge/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
+}
-- 
cgit v1.2.3