6 files changed, 120 insertions, 12 deletions
diff --git a/dev-java/jflex/jflex-1.9.1.ebuild b/dev-java/jflex/jflex-1.9.1-r1.ebuild
index 4824e42d5c81..b05e7bc9874d 100644
--- a/dev-java/jflex/jflex-1.9.1.ebuild
+++ b/dev-java/jflex/jflex-1.9.1-r1.ebuild
@@ -19,9 +19,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc-macos ~x64-macos"
 IUSE="ant-task examples test vim-syntax"
 REQUIRED_USE="test? ( ant-task )"
 
+# jdk-11:* for bug #963787
 # <dev-java/ognl-3.1.25:0 because of test failures with 3.1.25 or higher
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	dev-java/auto-value:0
 	dev-java/escapevelocity:0
 	dev-java/incap:0
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index b9d0d34f0f66..c2da717a9934 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,3 +1,4 @@
 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
+DIST qdox-2.2.0.tar.gz 579334 BLAKE2B 2c13b7b3a8d0280a74246568f6462d77249c9029f4855e98cbc76d1e39f11e8e50d3ad92d296f68b4e39e4793defd8d854adc07bdf5b1e9e7fe6eca85ca8eb90 SHA512 b3e07208764f79c4427fdb3a0f93ee6f7f47ae2e4e702cb7f88de4e996a8f9fc694093b4da52644336615c83ac14f5b0c7f3cb8c20d0fc51514914050dca06b1
diff --git a/dev-java/qdox/files/qdox-2.2.0-skip-testBinaryClassesAreFound.patch b/dev-java/qdox/files/qdox-2.2.0-skip-testBinaryClassesAreFound.patch
new file mode 100644
index 000000000000..6b1caa91f18d
--- /dev/null
+++ b/dev-java/qdox/files/qdox-2.2.0-skip-testBinaryClassesAreFound.patch
@@ -0,0 +1,26 @@
+--- a/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
++++ b/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
+@@ -11,6 +11,7 @@ import org.junit.jupiter.api.AfterEach;
+ import org.junit.jupiter.api.Assertions;
+ import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Test;
++import org.junit.jupiter.api.Disabled;
+ 
+ import java.io.*;
+ import java.net.URL;
+@@ -290,7 +291,7 @@ public class JavaProjectBuilderTest {
+         Assertions.assertNotNull(builder.getClassByName("oldfashioned.Bar"));
+     }
+ 
+-    @Test
++    @Test @Disabled
+     public void testBinaryClassesAreFound() {
+ 
+         String in = ""
+@@ -2055,4 +2056,4 @@ public class JavaProjectBuilderTest {
+         
+         verify( classLibraryBuilder ).addSourceFolder( same( file ) );
+     }
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/qdox/qdox-1.12.1-r8.ebuild b/dev-java/qdox/qdox-1.12.1-r8.ebuild
index bcdc288d2b7e..7210c3d9d8e9 100644
--- a/dev-java/qdox/qdox-1.12.1-r8.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r8.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc-macos ~x64-macos"
 IUSE="ant-task"
 REQUIRED_USE="test? ( ant-task )"
 
diff --git a/dev-java/qdox/qdox-2.0.1-r1.ebuild b/dev-java/qdox/qdox-2.0.1-r1.ebuild
index 9ea83d0c6388..7353fcdd5c33 100644
--- a/dev-java/qdox/qdox-2.0.1-r1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1-r1.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.thoughtworks.qdox:qdox:2.0.1"
 JAVA_TESTING_FRAMEWORKS="junit-4"
+MAVEN_ID="com.thoughtworks.qdox:qdox:2.0.1"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -16,10 +16,11 @@ S="${WORKDIR}/qdox-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0
+	>=dev-java/javacup-11b_p20160615-r2:0
 	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/junit:4
@@ -30,19 +31,18 @@ RDEPEND=">=virtual/jre-1.8:*"
 BDEPEND="dev-java/byaccj:0"
 
 JAVA_AUTOMATIC_MODULE_NAME="com.thoughtworks.qdox"
-JAVA_SRC_DIR="src/main/java"
 JAVA_CLASSPATH_EXTRA="jflex"
-
-JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4 mockito-1"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_GENTOO_CLASSPATH="
-	junit-4
-	mockito-1
-"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 src_compile() {
 	einfo "Running jflex"
-	jflex src/grammar/lexer.flex src/grammar/commentlexer.flex \
+	"$(java-config -J)" -cp "$(java-pkg_getjars --build-only jflex):$(java-pkg_getjars --build-only javacup)" \
+		jflex.Main \
+		src/grammar/lexer.flex \
+		src/grammar/commentlexer.flex \
 		-d src/main/java/com/thoughtworks/qdox/parser/impl || die
 
 	einfo "Running byaccj for DefaultJavaCommentParser"
diff --git a/dev-java/qdox/qdox-2.2.0.ebuild b/dev-java/qdox/qdox-2.2.0.ebuild
new file mode 100644
index 000000000000..89217b353de3
--- /dev/null
+++ b/dev-java/qdox/qdox-2.2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+MAVEN_ID="com.thoughtworks.qdox:qdox:${PV}"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/paul-hammant/qdox"
+SRC_URI="https://github.com/paul-hammant/qdox/archive/qdox-${PV}.tar.gz"
+S="${WORKDIR}/qdox-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc-macos ~x64-macos"
+
+BDEPEND="dev-java/byaccj:0"
+DEPEND="
+	dev-java/jflex:0
+	>=dev-java/javacup-11b_p20160615-r2:0
+	<virtual/jdk-26:*
+	test? (
+		>=dev-java/asm-9.8-r1:=
+		>=dev-java/assertj-core-3.27.6:0
+		>=dev-java/mockito-5.20.0:0
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/qdox-2.2.0-skip-testBinaryClassesAreFound.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="com.thoughtworks.qdox"
+JAVA_CLASSPATH_EXTRA="jflex"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="asm assertj-core junit-5 mockito"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default # bug #780585
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	einfo "Running jflex"
+	"$(java-config -J)" -cp "$(java-pkg_getjars --build-only jflex):$(java-pkg_getjars --build-only javacup)" \
+		jflex.Main \
+		src/grammar/lexer.flex \
+		src/grammar/commentlexer.flex \
+		-d src/main/java/com/thoughtworks/qdox/parser/impl || die
+
+	einfo "Running byaccj for DefaultJavaCommentParser"
+	byaccj -v \
+		-Jnorun \
+		-Jnoconstruct \
+		-Jclass=DefaultJavaCommentParser \
+		-Jpackage=com.thoughtworks.qdox.parser.impl \
+		src/grammar/commentparser.y || die
+
+	einfo "Running byaccj for Parser"
+	byaccj -v \
+		-Jnorun \
+		-Jnoconstruct \
+		-Jclass=Parser \
+		-Jimplements=CommentHandler \
+		-Jsemantic=Value \
+		-Jpackage=com.thoughtworks.qdox.parser.impl \
+		src/grammar/parser.y || die
+
+	mv Parser.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+	mv DefaultJavaCommentParser.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+	mv DefaultJavaCommentParserVal.java src/main/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	einfo "Running java-pkg-simple_src_compile"
+	java-pkg-simple_src_compile
+}