gentoo auto-resync : 29:09:2024 - 01:25:46

12 files changed, 4 insertions, 412 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6f3852ac9789..d8bbf6b99fdb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 0663f080b1be..c1031b6045a9 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,6 +1,3 @@
-AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
-DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
 DIST java-cup-src-11b-20160615.tar.gz 313847 BLAKE2B 0031cdb73471512162f69fff6ed47e91d78769c5162f37d4fdcef1c4b4be17ec9e950eda973a8842ae95423840be6c43a335180584b81c4618ea43cbfa926972 SHA512 532a8169f8e1ed2c637c66e7e21cc90eea363732870fbf4e3d66acbff03de3ba0583cefb7b4e7b8f8cb0c9bf1ca92dd5a59111860612bc7544e8beab87f5fbda
-EBUILD javacup-0.11b_p20151001-r1.ebuild 2741 BLAKE2B 5fe46493b06faa38180c636131d1a1180fdfb567f94377389c609870127285ac7d61b93f3c61c4708af3aa668aa14d541e0d17b9c08e3bd57d301c7bbfdcd202 SHA512 7d7f646c6b832a83225d940aa11068fe984b3879dd2ecbdc63d3e0c32e8eab2185c8a32442b7bb92ce5096dd0377884630eb44a268dc541bc1a7a278411b6163
 EBUILD javacup-11b_p20160615.ebuild 2587 BLAKE2B d2d869f17662522f0622ae6e35555e9b1cc3cf23805a05ef34de9a0e3846272c3fc25b3ec0a7082af449257c218019156343380b498c6896e1b4a7310b503c9d SHA512 d7fd669ed7956545cc53b0d96aeb452e949132dab2272f2a319585697c4e85006d5778ca26eea0e20612bbb78cf6c0dd991f59c97c458074ca0f2efad01dd82e
 MISC metadata.xml 399 BLAKE2B 735ada4795cee491980197e589097e933cd2f18ef453f1d793e10be22b44618b75f519e88f7b76f715a7d07ffb56ee7e9ac71951f1829c1b4eeff5430b06b8c6 SHA512 100cea816b78fbbad49ef4499cba083e3492d9928bd055dc5b289e80537e0bb50275115b3a9cedffce32a4e755f6552e12c84582be724437fb27b1f4cd7f5b50
diff --git a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
deleted file mode 100644
index d5a14af3587b..000000000000
--- a/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml-svn.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1a908a86fa6c253332b673ecc98e4ec8dffcdca2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 14:49:02 +0200
-Subject: [PATCH] No longer query subversion revision
-
-There is not .svn folder shipped anyway
----
- build.xml | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 33f0c60..860bbb5 100644
---- a/build.xml
-+++ b/build.xml
-@@ -18,17 +18,6 @@
-     <mkdir dir="${classes}" />
-     <mkdir dir="${dist}" />
-     <loadfile property="cupversion" srcFile="version.txt"/>
--    <exec executable="svn" outputproperty="svnversion">
--      <arg value="info"/>
--      <redirector>
--	<outputfilterchain>
--	  <linecontains>
--	    <contains value="Revision"/>
--	  </linecontains>
--	  <deletecharacters chars="Revision: "/>
--        </outputfilterchain>
--      </redirector>
--    </exec>
-   </target>
- 
-   <property environment="env" />
-@@ -67,7 +56,7 @@
-     <copy todir="${java}"><fileset dir="${src}"></fileset></copy>
-     <replace file="${java}/java_cup/version.java"
-        token="+ version_str"
--       value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
-+       value='+ "v0.11b ${cupversion}"'>
-     </replace>
-     <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
-       <classpath refid="libraries"/>
--- 
-2.5.0
-
diff --git a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
deleted file mode 100644
index 4fd75cc0bcbd..000000000000
--- a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild
+++ /dev/null
@@ -1,91 +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-ant-2
-
-MY_PV=${PV/_beta/-}
-MY_PV=${MY_PV/_p/-}
-MY_PV=${MY_PV#0.}
-MY_P=java-cup-${MY_PV%-*}
-
-DESCRIPTION="CUP Parser Generator for Java"
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="dev-java/ant-core:0
-	dev-java/jflex:0
-	>=virtual/jdk-1.8:*"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" taskdef"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	# Bizarrely, you can't build from the tarball without this patch.
-	eapply "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch
-
-	# The JFlex package name has changed to lower case.
-	sed -i "s/JFlex\./jflex./g" build.xml || die
-
-	# Remove the bundled JFlex.
-	rm -v bin/JFlex.jar || die
-}
-
-src_configure() {
-	EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex)
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	# Annoyingly javacup bundles an older version of itself that will
-	# break jflex if that has already been built against this newer
-	# version beforehand. Even more annoyingly, the binary download is
-	# built with Java 8, which isn't much use to us. We therefore use
-	# any installed javacup that is newer than the bundled version where
-	# possible. If this approach turns out to be unworkable then we may
-	# just have to use the bundled jflex for bootstrapping.
-	if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; 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.
-		einfo "Bootstrapping with installed javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant
-	else
-		einfo "Bootstrapping with bundled javacup ..."
-		EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant
-	fi
-
-	# Clean everything except the new jar.
-	rm -rv java/ classes/ || die
-
-	einfo "Recompiling with newly built javacup ..."
-	EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant
-
-	use doc && ejavadoc -sourcepath src/ -d javadoc java_cup
-}
-
-src_install() {
-	java-pkg_newjar dist/${MY_P}.jar
-	java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	java-pkg_register-ant-task
-
-	dodoc changelog.txt
-	docinto html
-	dodoc manual.html
-
-	use source && java-pkg_dosrc java/*
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index d6c341901ca6..59e006a2b413 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +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-r2.ebuild 3520 BLAKE2B c49021cefb11baa37387d5582b2bd54dfe26730990ea7bd6ef42c5bd2840fca430121e650648769241afb7b9796ec2c8a6b5ac12792cd3e00bdc08b7badfb17b SHA512 0f65b28f18e0d7c1985be060070754e78d3f7e7ba9972b3f43b41e035e9d1035a00dbd1cb9913f397fc360c57dd7ab910a50c179cf213d796d319c5623697063
 EBUILD jflex-1.6.1-r3.ebuild 3769 BLAKE2B 8181d591037ed42414f3c2f1e3951be08315c477f41cfb2587b0ff2daa4486965b5f57189831438686ff136b505fda68a22eea9250b0e54f5ef76e22d7736355 SHA512 813a50861746f81348494514daa8f0d0ea59c922a2dc4dbdc1361548aca59fdc517dd1e44f4b0d7de66092af5aa398317fa5408a819c0673d98bf982667b00c6
 MISC metadata.xml 315 BLAKE2B 65fc9f2224c07e76fa9a4b49456ec62d7b38c5d50523ecfdfa5e77241c88e1c1da8ea6947cf3fe4b0819373a712b5dd4654ed713eb67ce3e102fc64e343ee17d SHA512 7c1ef38b4952ed807c1d98dbc05635010557a440ab98a58960f590abb2589e7632df16d0a551bfcf3efe32c57c0a498492ea877a52e43c3126c3290595b7f614
diff --git a/dev-java/jflex/jflex-1.6.1-r2.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
deleted file mode 100644
index 17d1b99fd468..000000000000
--- a/dev-java/jflex/jflex-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/qdox/Manifest b/dev-java/qdox/Manifest
index cc16271f6d0f..a550551bc483 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -2,7 +2,6 @@ AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb
 DIST jflex-1.6.1.jar 1050749 BLAKE2B 71c68bf368a239217cbf928a7c6fbf7325cc069beddfaf92fbad3f0542bf83aa5606b2e15cfb4bdbd62a54c53d8439773ba3a7f60370ef5e2501ffe2561f9945 SHA512 882e73231b6e4f12e746282bac894e79dd3ee6fcfd0317a988709f3a3b472634415031209aa96c200c65ce382c90b5dff3f6d31d5e39c2feaff90dcf30a142f4
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa
-EBUILD qdox-1.12.1-r5.ebuild 2422 BLAKE2B 25c1c4fee466506df67515b7f8b8cc5b19c650ea33e17d71703fd84b91eb25a7a2893b6a7a80e74499208b4dd0442b51e22cab803875317542de51a0fd256fe2 SHA512 92407c44ae8e33935525262aacc2ca6f7a12b22638f26489112b902608a09401120e6732cc8d96f9e1c8eb3ab5d0a4b432cb40221ae67b75b62b3c7bcc10b5e2
-EBUILD qdox-1.12.1-r6.ebuild 2924 BLAKE2B 9a866191f19dedac7cf50b5a94032765fe6a27986eb8088b115ab0e0099baf77af9d1bae061743f02bf2d4d6facdf853ef41aa5282b9a023d8602ba2a8fa3516 SHA512 167500b4ef23aba7f021992222f52f530573a86e4a335884ee00d944bea288c2fdebbc460c99970767e7e7478089ed8aeb2559d5abfb5361008cf3800bbbc3fc
+EBUILD qdox-1.12.1-r6.ebuild 2920 BLAKE2B e7c8120e1fb8bc03b5ad1afcfd632320fc367c594bbc2074d0bfdd303dc8eab9704f426f52760631a7d3a08d59a1e78bb924113e5ee7c77aa3653d2bd3bf5888 SHA512 0064c2b2588237b83df2b04b3c29c217a6f55174ef6e867718742998f12ec0e8f3f0fdb9bb8703bcea5bb2d670b7f50d3786690f70629e7068ece2370549c78a
 EBUILD qdox-2.0.1.ebuild 2815 BLAKE2B 9a245b766a3ea5484b6e84ec4edfa05f98c4b6e2ca76a380a4b6717ff1b8ff0c0183feb712d6740bda1db84861bf64d39d11f437c63ce1b116065d523a14a953 SHA512 96ae28a0fcd12b53ea914942930c8a0a2c55f4a608ae23c052d364b52cb66d57dc2ab1cbf8c9877c5edc3174357058895747882e723b15e6170320cb978e4403
 MISC metadata.xml 559 BLAKE2B d6d6774a40f5ff9d1a1bec881cb25d168c97d26705dfa0379cb40dfdd628ebda573e004080252bdbb7e2826daace708ff291ff1726760bdbf29c24102db3debd SHA512 ed0d7a8d8f90b3890edd368715980141a54b02e84f49b34132c165985df822be898e3b564d56e30938a6812639309a1f2947f5346f10678957dd9bf3858dd3f5
diff --git a/dev-java/qdox/qdox-1.12.1-r5.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild
deleted file mode 100644
index a4419f6cf68e..000000000000
--- a/dev-java/qdox/qdox-1.12.1-r5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE="ant-task"
-REQUIRED_USE="test? ( ant-task )"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/byaccj:0
-	dev-java/jflex:0
-	dev-java/jmock:1.0
-	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
-	test? ( dev-java/junit:0 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}/jflex-1.6.1.patch"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-
-	if ! use test ; then
-		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
-		rm -rf src/java/com/thoughtworks/qdox/junit
-		rm -rf src/test
-	fi
-}
-
-src_compile() {
-	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 jmock-1.0)"
-
-	if use test ; then
-		cp="${cp}:$(java-pkg_getjars --build-only junit)"
-	fi
-
-	if use ant-task ; then
-		cp="${cp}:$(java-pkg_getjars --build-only ant)"
-	else
-		rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die
-	fi
-
-	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
-		$(find . -name "*.java") || die "Cannot compile sources"
-
-	mkdir dist || die
-	cd build/classes || die
-	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
-	fi
-}
-
-src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \
-		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index a06037118b89..14f927f0178a 100644
--- a/dev-java/qdox/qdox-1.12.1-r6.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="ant-task"
 REQUIRED_USE="test? ( ant-task )"
 
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index d3c853e8188e..6dbdc4371e85 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,6 +1,5 @@
 DIST java-cup-bin-11b-20160615.tar.gz 144985 BLAKE2B fba4109a4999d6f5a678265d2374bc305fc9fe8b724a0af5fb60402d612904447ebe9285e8672652c492cd2e630752eb9ffeb8017be1dea081ddcb30f815a687 SHA512 edba197bfe0638838ad2e9cb7342ffcbbec4f2a71436fc4bf82ff0e1987fe9f490849c644945cf7e7deade9f12f458e019410a2d9c1f22c0182137fe5ad2349f
 DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b
 DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2
-EBUILD xalan-2.7.3-r1.ebuild 1243 BLAKE2B 1fd140152841bf91522aca40f30f73ff24b1b7b63a8b939e0aedeac3f56a441932eefcac1ffd468a78f45fccc60dfaec4ae1997dc1cec2715db3458273422075 SHA512 b31b34b6875e10c7c051fd4307751e32b4f8874315878d65a234c7d7a31883d3f2fb657a2cf8c4407d38b357cbbd8b43d8e6ee9f8d2f3314955afd385c7a03e7
-EBUILD xalan-2.7.3-r2.ebuild 2239 BLAKE2B cd7eed7841bc7cff8d1cc8e1b831523e241c9cd4f795d14006f1d542d75f89b6a4e60db96913e2c326e378155963151d8830b8f29b0abb7138035cfbdadccb8c SHA512 10f320e3ba5d0713d77f4e060b4649879fb1fb472ea54bbc86441f3aafff75dd9a91566b3a61a3482211b56f951025f0479f34bfcb98e53b56852ba01758501f
+EBUILD xalan-2.7.3-r2.ebuild 2235 BLAKE2B 716480027890cc690906b203a8f7712942e7574ca33ad5fd4af34aa7f6eb5c99b96a8ad85d0e3c8ea41cffe264ab39dea1bd50e5781bab853136baa724047731 SHA512 0e46190c81eb046510a048c64a29e3291178e981d45b9b58131229cc758a758afec825fc89dc9f75f18f610daa01a372dd71636bdc574ac51f0ba6bc225867b7
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xalan/xalan-2.7.3-r1.ebuild b/dev-java/xalan/xalan-2.7.3-r1.ebuild
deleted file mode 100644
index c49a110bfdde..000000000000
--- a/dev-java/xalan/xalan-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="xalan:xalan:2.7.3"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
-HOMEPAGE="https://xalan.apache.org/"
-SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
-	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )"
-
-S="${WORKDIR}/xalan-j_${PV//./_}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CP_DEPEND="
-	dev-java/bcel:0
-	dev-java/javacup:0
-	~dev-java/xalan-serializer-${PV}:${SLOT}
-	dev-java/xerces:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
-
-JAVA_MAIN_CLASS="org.apache.xalan.xslt.Process"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# serializer is packaged separately
-	rm -r src/org/apache/xml/serializer || die "cannot remove serializer"
-}
diff --git a/dev-java/xalan/xalan-2.7.3-r2.ebuild b/dev-java/xalan/xalan-2.7.3-r2.ebuild
index a46680273ed9..bc1f44bd751e 100644
--- a/dev-java/xalan/xalan-2.7.3-r2.ebuild
+++ b/dev-java/xalan/xalan-2.7.3-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # https://bugs.gentoo.org/936274 - for x86 we provide the precompiled java-cup
 COMMON_DEPEND="