gentoo auto-resync : 26:05:2024 - 00:07:27

16 files changed, 271 insertions, 393 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 051e67b596aa..32ec6e71d7a0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index c99173fce3b4..1e2fc6f30d4f 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,7 +1,5 @@
-AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
 AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
 AUX commons-vfs-2.0-utf8.patch 728 BLAKE2B 67d754b298b7613c0107e8e6c597660c31019679f251b58f67df12f872a619c01afb958fec04d144b230e1151a4437f3c2d7b92db9d94fa2f7cb45b1babf404a SHA512 e269c4d30c51107ddd183c2955be6da537b5b6d8efac763c39b13a4b1cf7b3018a3e8409358b09e3de0117ad6c79d533054337b9b92971c4d9bcb451d8d005c0
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-2.0-r3.ebuild 1645 BLAKE2B 98a54b5e6859257fc5d1bf0535af224b593c6f0efb80b69eed54ccc38ae17c995e94841a8851547ec7e631750741c989091bf22393f97a7672f85aef96290c94 SHA512 24d0218f8548661663f96474a3a529d2c1978add24306ce3cd114900b769c815c8dc15226a7548ccbec2603a306036d82f22cef600a3114c66a54e6c8222f43f
-EBUILD commons-vfs-2.0-r4.ebuild 1477 BLAKE2B 237bfd2d874204acb357b0623defb408f170d28fe91e40b5a6382d05c5f56e2dc8985cae8daca18a30f23c7c6af140981858fb0381f831b76826c049bf0f4bce SHA512 ca2329227d2b7b353cf0faaf6ceb233517c0994f899514b8afd3639f0be3a3d27deec548c14e83445a2020dd6a4def602a7d2ea96c19c706550bd89b4d1183fb
+EBUILD commons-vfs-2.0-r4.ebuild 1473 BLAKE2B 4d68d1646041d37dc10daf1332a742d30b456c94ea02ce9c0a21a952029f60ee69585e2ce3d7390bf0ad712c2d76b805c473b2d72a7b641802ced0c94c50e047 SHA512 c4b9fc6f3ab4d25fa45a868d3beeb91757ba4fc882437ff207569d37353ce7184ab05405ec5481d7656898bb6fedae7d9a59bbf3597d0fa4a5b9d9f7110b80e1
 MISC metadata.xml 523 BLAKE2B c4cba3c890c33ac78a1266a0127d5ff394be884b99d243bcd2eff5516abdb2aefe861f244ffa741b30211c3527be774b3c15ae86c93aee6caf9bc60fe2e7b2de SHA512 c647d90719e4581dfefbf7dfb215136ab94e0b25a069e222dbfe50e90c5ad06ac7052a0ccfc41d82ad423c3d0fe2e410b1473ffd396e833d5581e44176e2b233
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild
deleted file mode 100644
index 418ad23cc41f..000000000000
--- a/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A single API for accessing various different file systems"
-HOMEPAGE="https://commons.apache.org/vfs/"
-SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz"
-S="${WORKDIR}/${P}/core"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND="
-	dev-java/ant:0
-	dev-java/commons-collections:0
-	dev-java/commons-logging:0
-	dev-java/commons-net:0
-	dev-java/commons-httpclient:3
-	dev-java/jackrabbit-webdav:0
-	dev-java/jsch:0"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-incompatibility.patch
-)
-
-EANT_GENTOO_CLASSPATH="
-	ant
-	commons-collections
-	commons-logging
-	commons-net
-	commons-httpclient-3
-	jackrabbit-webdav
-	jsch
-"
-EANT_EXTRA_ARGS="-Dlibdir=${T}"
-
-# The build.xml is generated from maven and can't run the tests properly
-# Use maven test to execute these manually but that means downloading deps from
-# the internet. Also the tests need to login to some ftp servers and samba
-# shares so I doubt they work for everyone.
-#src_test() {
-#	ANT_TASKS="ant-junit" eant test
-#}
-
-src_prepare() {
-	default
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	java-ant_rewrite-classpath
-	java-ant_ignore-system-classes
-}
-
-src_install() {
-	java-pkg_newjar target/*.jar
-
-	# [javadoc] No javadoc created, no need to post-process anything
-#	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index f2cbfd6d3ba5..00e0b245b14b 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/core"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
deleted file mode 100644
index 753e93d669f2..000000000000
--- a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/29/13 3:05 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="commons-vfs2-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="commons-vfs2-2.0"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.1" value=".."/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.build.testResourceDir.1" value=".."/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-    <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-    <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
-    <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
-    <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
-    <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           encoding="iso-8859-1" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-    <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
-    <copy todir="${maven.build.testOutputDir}/META-INF">
-      <fileset dir="${maven.build.testResourceDir.1}">
-        <include name="NOTICE.txt"/>
-        <include name="LICENSE.txt"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/RunTest.java"/>
-          <exclude name="**/*$*"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/RunTest.java"/>
-          <exclude name="**/*$*"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="iso-8859-1" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.5" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/6/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-  </target>
-
-</project>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 8273c42cd0c9..6ea968fede01 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
 AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed
 DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD gson-2.10.2_pre20231128.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce
+EBUILD gson-2.10.2_pre20231128-r1.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild
index 4247c08c2190..4247c08c2190 100644
--- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild
+++ b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index e84c7ad44802..f57b70b3e6ef 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,4 +1,6 @@
 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
-MISC metadata.xml 321 BLAKE2B d9a5fac031ad1be31fc5b1dfb3a3fb5521eaa1a9e9e51f287f2a2e60e325db14bee084dd4248b30f93e0bde6ac0bba523241f74876279dc0f51583edc7582933 SHA512 ea28765d57fac822ed3aeb649b16e685d95ae0ed500401702f37042f82ee111ca5d516b3f8e03f9c2fd2847c5df4928db53c2b1b53657067bda15ac78452ad0d
+EBUILD javacup-11b_p20160615.ebuild 2595 BLAKE2B 57e2c158a541f5b229b042f4c7537f5e547aba805434a6fe9f751be316e421c82e38a5fdc52fd0dc6a800cb1c27742c38c3b6f4a39cd5c38e054d36956b8f0c6 SHA512 ecc7007d84b896dfd8fc7b3d301918a0b8d1f7b23cd09299f933932d9335fb364aca2cd0bf3c99f793cddacacba4a2575113655877a0944cffe522fe54a4a0b1
+MISC metadata.xml 399 BLAKE2B 735ada4795cee491980197e589097e933cd2f18ef453f1d793e10be22b44618b75f519e88f7b76f715a7d07ffb56ee7e9ac71951f1829c1b4eeff5430b06b8c6 SHA512 100cea816b78fbbad49ef4499cba083e3492d9928bd055dc5b289e80537e0bb50275115b3a9cedffce32a4e755f6552e12c84582be724437fb27b1f4cd7f5b50
diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild
new file mode 100644
index 000000000000..a66896a46441
--- /dev/null
+++ b/dev-java/javacup/javacup-11b_p20160615.ebuild
@@ -0,0 +1,92 @@
+# 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="CUP Parser Generator for Java"
+HOMEPAGE="https://www2.cs.tum.edu/projects/cup/"
+SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ant-task"
+
+DEPEND="${CP_DEPEND}
+	>=dev-java/jflex-1.6.1-r3:0
+	>=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+DOCS=( changelog.txt )
+HTML_DOCS=( manual.html )
+
+JAVA_MAIN_CLASS="java_cup/Main"
+JAVA_SRC_DIR=( "src" "java" )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	if use ant-task; then
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm src/java_cup/anttask/CUPTask.java || die
+	fi
+}
+
+src_compile() {
+	if has_version \>=${CATEGORY}/${PN}-11b:${SLOT}; then
+		einfo "Get path of installed JAVACUP"
+		CP_CUP="$(java-pkg_getjar --build-only javacup javacup.jar)"
+	else
+		einfo "Get path of bundled JAVACUP"
+		CP_CUP="$(echo bin/java-cup-*.jar)"
+	fi
+	einfo "Path to JAVACUP is ${CP_CUP}"
+
+	einfo "Get path to jflex"
+	CP_FLEX="$(java-pkg_getjars --build-only jflex)"
+	einfo "Path to jflex is ${CP_FLEX}"
+
+	einfo "Generate parser with: ${CP_CUP}"
+	"$(java-config -J)" -jar "${CP_CUP}" \
+		-interface -destdir "java" -parser "parser" -symbols "sym" \
+		cup/parser.cup || die
+
+	einfo "Generate lexer"
+	# https://jflex.de/manual.html#running-jflex
+	$(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" jflex.Main \
+		flex/Lexer.jflex -d java/javacup || die
+
+	einfo "Build intermediate jar"
+	JAVA_JAR_FILENAME="seco.jar"
+	java-pkg-simple_src_compile
+
+	einfo "Remove classes and generated code"
+	rm -rv java/* target/classes/ || die
+
+	einfo "Regenerate parser with intermediate jar file"
+	"$(java-config -J)" -jar ./seco.jar \
+		-interface -destdir "java" -parser "parser" -symbols "sym" \
+		cup/parser.cup || die
+
+	einfo "Regenerate lexer with intermediate jar file"
+	$(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" jflex.Main \
+		flex/Lexer.jflex -d java/javacup || die
+
+	einfo "Build final jar with regenerated parser and lexer"
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile
+	"$(java-config --jar)" cvf "${PN}-runtime.jar" -C target/classes java_cup/runtime || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar "${PN}.jar" "${PN}-runtime.jar"
+	use ant-task && java-pkg_register-ant-task
+}
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
index afa5d3dcd5d1..565315fe27ec 100644
--- a/dev-java/javacup/metadata.xml
+++ b/dev-java/javacup/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">ultimate-pa/javacup</remote-id>
 	</upstream>
+	<use>
+		<flag name="ant-task">Build and register the ant-task</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 1b04d71e92b7..8a944e4e5a9e 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,5 @@
 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
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD jflex-1.6.1-r3.ebuild 3777 BLAKE2B 1eb75b30263d99cb166ad045b408fb0b551a0f5610aa4fbb680d6ba9425622e9a27f670a223e8017bc097cee4aa3f6eb0ef8e2d969cba7fae3ee484b9d383366 SHA512 870704d70459beb6e3d60090ef236e31199b08b69422ab9ffbe2514ecdc75097ae3908aaa5ede414cd7e9d696de6952660cbbe51600603bb6dcb99d86d57f898
+MISC metadata.xml 315 BLAKE2B 65fc9f2224c07e76fa9a4b49456ec62d7b38c5d50523ecfdfa5e77241c88e1c1da8ea6947cf3fe4b0819373a712b5dd4654ed713eb67ce3e102fc64e343ee17d SHA512 7c1ef38b4952ed807c1d98dbc05635010557a440ab98a58960f590abb2589e7632df16d0a551bfcf3efe32c57c0a498492ea877a52e43c3126c3290595b7f614
diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
new file mode 100644
index 000000000000..ae329e176675
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -0,0 +1,135 @@
+# 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="ant-task examples test vim-syntax"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( ant-task )"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+	test? ( dev-java/junit:4 )
+"
+
+PDEPEND=">=dev-java/javacup-11b_p20160615:0"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	eapply_user
+	java-pkg-2_src_prepare
+
+	# 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="${JAVACUP}"
+	if use ant-task; then
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)"
+	else
+		rm src/main/java/jflex/anttask/JFlexTask.java || die
+	fi
+}
+
+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
+	use ant-task && 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/metadata.xml b/dev-java/jflex/metadata.xml
index 6021501589e0..3c0e0377e098 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<use>
+		<flag name="ant-task">Build and register the ant-task</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 6e457da8d361..1c5f2c045e45 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-r4.ebuild 2170 BLAKE2B a7d0ec67a704a7ce4a9eabf1848e122424cda2c7b30af7c1aa0fe852e3832eada2b8f0aaeb84da25ccbcaa514c086496a54aa6b84b98a787978e030c0e9f3c8c SHA512 83d92d6ae65d76fc70311801932ee84de01c1f417bba52c3503e651c00ab1ab99b03f036930ec157e72923e59c9f7a17cb0f25d1cfc02eb411e4d5a9137b62db
+EBUILD qdox-1.12.1-r5.ebuild 2422 BLAKE2B 25c1c4fee466506df67515b7f8b8cc5b19c650ea33e17d71703fd84b91eb25a7a2893b6a7a80e74499208b4dd0442b51e22cab803875317542de51a0fd256fe2 SHA512 92407c44ae8e33935525262aacc2ca6f7a12b22638f26489112b902608a09401120e6732cc8d96f9e1c8eb3ab5d0a4b432cb40221ae67b75b62b3c7bcc10b5e2
 EBUILD qdox-2.0.1.ebuild 2820 BLAKE2B e22d6ed9daaaf8f32cdf25d2355676adcb780261d2ab65928e580e2b26c5557d3a8a111f876c444888735faa9accc95e6ab42eee5dce3964ba1e5913a8c02baf SHA512 894ff8420252af370ac335e85c80ad56daeff216286b9534a5664399e951af5f2713606ae1e2f8641a6cd72c7edb2b2bda705a2ae88e3ef21013ca6499adc892
-MISC metadata.xml 494 BLAKE2B 9d4eebdef42221ae522f9642dd022db253e2672a5f7d990bc1c1116c49ad5004dd5c9ffd2944927610bbd15652cca26899d89b3422e3876b9f7fedb98306d8bd SHA512 944cada2a9b4e35e48516eb9faf506a8045dd29d42dd3958df9cfe54c73d6e7b715c8074aa2707f6ca7a5e3efc7138650d56bd1f9629cb1843cdc2c78365a999
+MISC metadata.xml 559 BLAKE2B d6d6774a40f5ff9d1a1bec881cb25d168c97d26705dfa0379cb40dfdd628ebda573e004080252bdbb7e2826daace708ff291ff1726760bdbf29c24102db3debd SHA512 ed0d7a8d8f90b3890edd368715980141a54b02e84f49b34132c165985df822be898e3b564d56e30938a6812639309a1f2947f5346f10678957dd9bf3858dd3f5
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index f00a4317cac4..fe50d6ed9393 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">paul-hammant/qdox</remote-id>
 	</upstream>
+	<use>
+		<flag name="ant-task">Build the ant-task</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/qdox/qdox-1.12.1-r4.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild
index cf1dc1eeb7d5..a4419f6cf68e 100644
--- a/dev-java/qdox/qdox-1.12.1-r4.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r5.ebuild
@@ -11,31 +11,35 @@ 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 )"
 
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-CDEPEND=">=dev-java/ant-1.10.14-r3:0"
-
-DEPEND=">=virtual/jdk-1.8:*
+DEPEND="
+	>=virtual/jdk-1.8:*
 	dev-java/byaccj:0
-	>=dev-java/jflex-1.6.1: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 )
-	${CDEPEND}"
+"
 
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
+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
+	default #780585
+	java-pkg-2_src_prepare
 
 	if ! use test ; then
 		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
@@ -52,12 +56,18 @@ src_compile() {
 	# create jar
 	mkdir -p build/classes || die
 
-	local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)"
+	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"