From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 6 Apr 2022 22:33:41 +0100
Subject: gentoo resync : 06.04.2022

---
 dev-java/qdox/Manifest              |  3 +-
 dev-java/qdox/qdox-1.12.1-r3.ebuild | 86 +++++++++++++++++++++++++++++++++++++
 dev-java/qdox/qdox-1.6.3-r2.ebuild  | 32 --------------
 3 files changed, 87 insertions(+), 34 deletions(-)
 create mode 100644 dev-java/qdox/qdox-1.12.1-r3.ebuild
 delete mode 100644 dev-java/qdox/qdox-1.6.3-r2.ebuild

(limited to 'dev-java/qdox')

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 782df16172a7..b9a03482df56 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,5 @@
 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-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
 EBUILD qdox-1.12.1-r2.ebuild 2225 BLAKE2B caf3e51d9d81e1a597092a5c20c2468266dda3559de0b07f948cd6026b983718941060f066a004464c4b177ec6a859139fd0549ff48dc82aff6fba24e8a60f90 SHA512 51a8c940ba702933bad4367de1f6a2a54d4d66710d3631529f61137ce27be1aaa0ce9dadb83005aa22331c241947637fe9a17a802923eef1002c0dad37051582
-EBUILD qdox-1.6.3-r2.ebuild 687 BLAKE2B e4cb8a16f5f5c116b7d4a6247b5c9a8aae67ea29725a25c8d6a6ee5e3bbdd19140d1ed4b33c32d6c5c0c81deb4b7d391e04af784eb3f0ca26d6458b061a9a72c SHA512 e154d9ae1c0528d248e24ffb3063dee953be8f3b69e93ff1331f2d111f61c7337210a2421192027066307caa6341f307e50b0bee4f41d29047736ee6d05c2913
+EBUILD qdox-1.12.1-r3.ebuild 2176 BLAKE2B 768b1467779bb393d1db716aa3a1672507c8575d247bb1556d0569ce7063395422ced4eec92160fce27f6320cf87a7502909239362db4dc46b3b6b0f0ff541b5 SHA512 bc5017d33e50e5c04111f05862a2ed24c1d18f68f29f065c8f27a05c42943c118b2462e66be22f3294afa4043679afa54b8fb3f664e1affecd5b977492ec6cac
 MISC metadata.xml 490 BLAKE2B 0074cd0a7da6af8028ff8bc8eba4b26f86d4ae5ea55da7a6fe0bfbcc73e779a9a6deeed0e82f95abc28324dcd1a89634b504d02265dea16ac26e576b6f29ace8 SHA512 039a450284a930e163cd9cd4c39c5ee6dd0a2f5678b5f77db7f809bbe0a141a564fa7232cbe3a428b31170068b1377cb953a8ccda4ee3b14b5ddb4d313180496
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
new file mode 100644
index 000000000000..b4f4cd178563
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -0,0 +1,86 @@
+# 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.6.3-r2.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
deleted file mode 100644
index 824060300ab3..000000000000
--- a/dev-java/qdox/qdox-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,32 +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="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="mirror://gentoo/${P}.jar"
-
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="1.6"
-LICENSE="Apache-2.0"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="com"
-
-src_prepare() {
-	default
-	rm -v com/thoughtworks/qdox/ant/AbstractQdoxTask.java \
-		com/thoughtworks/qdox/junit/APITestCase.java || die
-}
-- 
cgit v1.2.3