gentoo auto-resync : 27:10:2022 - 21:58:13

3 files changed, 106 insertions, 2 deletions

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 7ae296145c3e..5035b146df20 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,4 +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
-MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
+EBUILD qdox-2.0.1.ebuild 2824 BLAKE2B 6e1d4e8534d5f0d119bceb52ef24095b27deb95b0bfb44823382408d0fd4f04edb6473adb3d673132e139c8d7d0337f9ed7a5ca5c85e3ff3d2fb1ba08d15e6bc SHA512 77f458221b12c5048299d1b7045d1f2001e37398784d97f3f5b1ae01505a3d39804b582ce12b12f0a4aeb99b92fca557608cac240d6aed922d4e73e3172c28a4
+MISC metadata.xml 494 BLAKE2B 9d4eebdef42221ae522f9642dd022db253e2672a5f7d990bc1c1116c49ad5004dd5c9ffd2944927610bbd15652cca26899d89b3422e3876b9f7fedb98306d8bd SHA512 944cada2a9b4e35e48516eb9faf506a8045dd29d42dd3958df9cfe54c73d6e7b715c8074aa2707f6ca7a5e3efc7138650d56bd1f9629cb1843cdc2c78365a999
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index 441b6da52a6e..f00a4317cac4 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -10,6 +10,6 @@
 		definitions from source files complete with JavaDoc @tags.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">codehaus/qdox</remote-id>
+		<remote-id type="github">paul-hammant/qdox</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
new file mode 100644
index 000000000000..c6f38ed82de0
--- /dev/null
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -0,0 +1,102 @@
+# 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:2.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+DEPEND="
+	dev-java/jflex:0
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/junit:4
+		dev-java/mockito:0
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="dev-java/byaccj:0"
+
+S="${WORKDIR}/qdox-${P}"
+
+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_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	mockito
+"
+
+src_compile() {
+	einfo "Running jflex"
+	jflex 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
+}
+
+src_test() {
+	# Too many tests fail with Java 17.
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17 ; then
+		einfo "Tests only for Java < 17"
+	else
+		einfo "Running tests"
+		pushd src/test/java || die
+			local JAVA_TEST_RUN_ONLY=$(find * \
+				\( -wholename "**/*Test.java" \
+				-o -name 'TestMultipleLevelGenericInheritance.java' \)\
+				! -name "ClassLibraryBuilderTest.java" \
+				! -name "JavaClassTest.java" \
+				! -name "JavaConstructorTest.java" \
+				! -name "JavaFieldTest.java" \
+				! -name "JavaMethodTest.java" \
+				! -name "JavaPackageTest.java" \
+				! -name "JavaParameterTest.java" \
+				! -name "JavaSourceTest.java" \
+				! -name "JavaTypeTest.java" \
+				! -name "AbstractDocletTagTest.java" \
+				)
+		popd
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+		java-pkg-simple_src_test
+	fi
+}