public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-09-28  9:44 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-09-28  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     29eae91d7c9c4fce64ec3cf8b317be504acc42a1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 09:44:39 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 09:44:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29eae91d

dev-java/qdox: Stabilize 1.12.1-r6 arm64, #938739

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index 31fa28237d24..6517285bdde9 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 )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-09-28 14:03 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-09-28 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     56699217a9eb4b4b84d49b3216c137e9f156c0f5
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Sep 28 12:57:13 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 14:03:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56699217

dev-java/qdox: drop 1.12.1-r5

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r5.ebuild | 96 -------------------------------------
 1 file changed, 96 deletions(-)

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
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-09-28 10:09 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-09-28 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     26644dd66fc5f7a5f5f8e65822085b3a83630bd4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 10:09:34 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 10:09:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26644dd6

dev-java/qdox: Stabilize 1.12.1-r6 x86, #938739

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index f1f7dd1cb0fb..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 )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-09-28  9:44 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-09-28  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     48cb5991ce74f35a4e6c3b78e9e3744d50a0d887
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 09:44:40 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 09:44:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cb5991

dev-java/qdox: Stabilize 1.12.1-r6 amd64, #938739

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index 6517285bdde9..f1f7dd1cb0fb 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 )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-09-28  9:38 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2024-09-28  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     68ecd2d4cd1651bf372c91c10199542e73236c34
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 09:37:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 09:37:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ecd2d4

dev-java/qdox: Stabilize 1.12.1-r6 ppc64, #938739

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index a06037118b89..31fa28237d24 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 )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-08-30 11:06 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-08-30 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     298330291285a9c1a536ba983612883b62eb39ea
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Aug 22 14:12:49 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 11:05:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29833029

dev-java/qdox: for x86 use precompiled jflex

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/Manifest              |   1 +
 dev-java/qdox/qdox-1.12.1-r6.ebuild | 114 ++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 85413229dd93..b9d0d34f0f66 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,2 +1,3 @@
+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

diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
new file mode 100644
index 000000000000..a06037118b89
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1-r6.ebuild
@@ -0,0 +1,114 @@
+# 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
+	x86? ( https://repo1.maven.org/maven2/de/jflex/jflex/1.6.1/jflex-1.6.1.jar )"
+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/jmock:1.0
+	!x86? ( dev-java/jflex: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_unpack() {
+	unpack "${P}.tar.gz"
+	use x86 && cp "${DISTDIR}/jflex-1.6.1.jar" "${WORKDIR}"
+}
+
+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() {
+	# https://bugs.gentoo.org/778416 - for x86 we provide the precompiled jflex
+	if use x86; then
+		"$(java-config -J)" -cp "${WORKDIR}/jflex-1.6.1.jar" jflex.Main \
+			src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	else
+		jflex \
+			src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	fi
+	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
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-08-30 11:06 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2024-08-30 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fffaa179eb4fa046875adb34c3c34215f8d42c16
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Aug 22 11:37:36 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 11:05:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffaa179

dev-java/qdox: unkeyword 2.0.1 for x86

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-2.0.1.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index 0588a2ec7649..f046b3330bd9 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,11 @@ 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"
+S="${WORKDIR}/qdox-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0
@@ -28,8 +29,6 @@ DEPEND="
 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"


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-05-25  9:27 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2024-05-25  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b363b4a7dee982367b4826075468c497c0d562d7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 24 16:05:43 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 25 09:25:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b363b4a7

dev-java/qdox: ant-task optional for slot 1.12

Allows to emerge dev-java/ant[junit] without circular dependencies

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36809
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/metadata.xml                         |  3 ++
 ...qdox-1.12.1-r4.ebuild => qdox-1.12.1-r5.ebuild} | 32 ++++++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

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
similarity index 80%
rename from dev-java/qdox/qdox-1.12.1-r4.ebuild
rename to 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"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2024-04-17  9:08 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2024-04-17  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fee01cd78874a376224329a1c6b5aea75e835bcb
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Mar 13 18:11:55 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 09:07:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee01cd7

dev-java/qdox: switch to dev-java/ant

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/e79570aa304d93817bfaf9b160ca799c3aa4ba82
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/{qdox-1.12.1-r3.ebuild => qdox-1.12.1-r4.ebuild} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r4.ebuild
similarity index 92%
rename from dev-java/qdox/qdox-1.12.1-r3.ebuild
rename to dev-java/qdox/qdox-1.12.1-r4.ebuild
index 9f0982c09a7e..cf1dc1eeb7d5 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
-CDEPEND="dev-java/ant-core:0"
+CDEPEND=">=dev-java/ant-1.10.14-r3:0"
 
 DEPEND=">=virtual/jdk-1.8:*
 	dev-java/byaccj:0
@@ -52,7 +52,7 @@ src_compile() {
 	# create jar
 	mkdir -p build/classes || die
 
-	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+	local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)"
 
 	if use test ; then
 		cp="${cp}:$(java-pkg_getjars --build-only junit)"
@@ -74,7 +74,7 @@ src_compile() {
 }
 
 src_test() {
-	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+	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!"
 }
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-11-30  0:52 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-11-30  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7d34cbc4ac73511fef934a987e6bedb2598c8397
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 00:51:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 00:51:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d34cbc4

dev-java/qdox: Stabilize 2.0.1 x86, #883235

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/qdox/qdox-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index ce6c790e23d6..0588a2ec7649 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-11-29  6:58 Jakov Smolić
  0 siblings, 0 replies; 34+ messages in thread
From: Jakov Smolić @ 2022-11-29  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b757dc1fbb8cd893c28988f58a76db58f67faabe
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 06:57:57 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 06:57:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b757dc1f

dev-java/qdox: Stabilize 2.0.1 amd64, #883235

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/qdox/qdox-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index 0800daaa2ba0..ce6c790e23d6 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-11-27 16:43 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2022-11-27 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8f844a2a26c33de9574c3f78086e1836103552fe
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 16:42:58 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 16:42:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f844a2a

dev-java/qdox: Stabilize 2.0.1 arm64, #883235

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index c6f38ed82de0..ca9f2bc74b29 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-11-27 16:43 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2022-11-27 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     fbf4bfc17a76787639dd20279ddc5cb52384cfb4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 16:42:59 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 16:42:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf4bfc1

dev-java/qdox: Stabilize 2.0.1 ppc64, #883235

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-2.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-2.0.1.ebuild b/dev-java/qdox/qdox-2.0.1.ebuild
index ca9f2bc74b29..0800daaa2ba0 100644
--- a/dev-java/qdox/qdox-2.0.1.ebuild
+++ b/dev-java/qdox/qdox-2.0.1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	dev-java/jflex:0


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-10-27 20:05 Florian Schmaus
  0 siblings, 0 replies; 34+ messages in thread
From: Florian Schmaus @ 2022-10-27 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1a996e19634a4f04cf05555a88f22af019975044
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Aug  8 13:22:51 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 20:02:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a996e19

dev-java/qdox: add 2.0.1

* Switch to java-pkg-simple.eclass
* New slot since dev-java/hamcrest-generator does not compile with 2.0.1
* Disable tests for Java 17
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26792
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/qdox/Manifest          |   1 +
 dev-java/qdox/metadata.xml      |   2 +-
 dev-java/qdox/qdox-2.0.1.ebuild | 102 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index d6e59b90dcf8..85413229dd93 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1 +1,2 @@
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
+DIST qdox-2.0.1.tar.gz 528305 BLAKE2B ff2f4b59d650b93a466eae6cc69239b059f7786ea609c18c56414e7e849d711d5316664a376b2c2c6e0021a21e7577cc21c9f5cfd215c4af612100a4c81da758 SHA512 db9d9ed8e8cf38c74e35be493aebcca54ba9d2c43a92c066d1964777293ad3af8e3212fcb8c20e9453b93e9bbe868c988dab69f936e7df41450183ce385137fa

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
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-05-05  7:27 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2022-05-05  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     79b786bfbf9692368f9b00812e8f7b6b6dfba844
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 07:27:29 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May  5 07:27:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b786bf

dev-java/qdox: dropped obsolete 1.12.1-r2

Bug: https://bugs.gentoo.org/842276
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r2.ebuild | 88 -------------------------------------
 1 file changed, 88 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
deleted file mode 100644
index 2c9a64624663..000000000000
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1"
-
-inherit java-pkg-2 java-ant-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
-	app-arch/unzip:0
-	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
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-05-05  5:29 Arthur Zamarin
  0 siblings, 0 replies; 34+ messages in thread
From: Arthur Zamarin @ 2022-05-05  5:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4675d074541d0ac9135ccd76accfa469bf8eff36
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 05:28:54 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 05:28:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4675d074

dev-java/qdox: Stabilize 1.12.1-r3 arm64, #842276

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index a56891b058f0..9f0982c09a7e 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-05-04 14:40 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-05-04 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4fd6566080fa7aff1ab1bd57e71f8da0b0efd6b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 14:39:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  4 14:39:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd65660

dev-java/qdox: Stabilize 1.12.1-r3 ppc64, #842276

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index 672297e4ce95..a56891b058f0 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-05-04  0:16 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2022-05-04  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ed0d429fea29972e60b4caa85582f7ed42a7a9da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 00:16:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  4 00:16:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0d429f

dev-java/qdox: Stabilize 1.12.1-r3 x86, #842276

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index 5837d6881a8c..672297e4ce95 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-05-03  7:20 Jakov Smolić
  0 siblings, 0 replies; 34+ messages in thread
From: Jakov Smolić @ 2022-05-03  7:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ce40736b478066ed042fc84b842940a4979841e2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 07:20:01 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue May  3 07:20:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce40736b

dev-java/qdox: Stabilize 1.12.1-r3 amd64, #842276

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r3.ebuild
index b4f4cd178563..5837d6881a8c 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-04-03  6:56 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2022-04-03  6:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c5973007a6df6b1b0ffa21cf098e6ebc83b92596
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr  2 07:56:04 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 06:56:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5973007

dev-java/qdox: Unused slot, drop 1.6.3-r2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/Manifest             |  1 -
 dev-java/qdox/qdox-1.6.3-r2.ebuild | 32 --------------------------------
 2 files changed, 33 deletions(-)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 51e3d527bae0..d6e59b90dcf8 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,2 +1 @@
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
-DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965

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
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-04-03  6:56 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2022-04-03  6:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7c95644efcd9fcb727bdaf35808bd5085c4f9464
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr  2 08:21:14 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 06:56:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c95644e

dev-java/qdox: EAPI 8, drop unused java-ant-2 eclass

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24860
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r3.ebuild | 86 +++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

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
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2022-01-14  8:43 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2022-01-14  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3b47d1537ff2edb0c0db604724962e6aee3ccc1e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jan 13 18:20:32 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 08:43:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b47d153

dev-java/qdox: MAVEN_ID

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/qdox/qdox-1.12.1-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r2.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
index 39a712868027..2c9a64624663 100644
--- a/dev-java/qdox/qdox-1.12.1-r2.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.thoughtworks.qdox:qdox:1.12.1"
 
 inherit java-pkg-2 java-ant-2
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2020-10-02 17:56 Miroslav Šulc
  0 siblings, 0 replies; 34+ messages in thread
From: Miroslav Šulc @ 2020-10-02 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     459d6f59e5bb3705950aa680ae1b39a0c932a827
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 17:56:22 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 17:56:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459d6f59

dev-java/qdox: eapi7, min java to 1.8

Closes: https://bugs.gentoo.org/745804
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{qdox-1.12.1-r1.ebuild => qdox-1.12.1-r2.ebuild}     | 16 ++++++++++------
 .../qdox/{qdox-1.6.3-r1.ebuild => qdox-1.6.3-r2.ebuild}  |  8 ++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
similarity index 92%
rename from dev-java/qdox/qdox-1.12.1-r1.ebuild
rename to dev-java/qdox/qdox-1.12.1-r2.ebuild
index 7100ae1aba6..559d80d7961 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 CDEPEND="dev-java/ant-core:0"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip:0
 	dev-java/byaccj:0
 	>=dev-java/jflex-1.6.1:0
@@ -27,11 +27,15 @@ DEPEND=">=virtual/jdk-1.4
 	test? ( dev-java/junit:0 )
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
 
-java_prepare() {
-	epatch "${FILESDIR}"/jflex-1.6.1.patch
+PATCHES=(
+	"${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+	default
 
 	if ! use test ; then
 		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java

diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
similarity index 87%
rename from dev-java/qdox/qdox-1.6.3-r1.ebuild
rename to dev-java/qdox/qdox-1.6.3-r2.ebuild
index 214262e8879..8159998cc6c 100644
--- a/dev-java/qdox/qdox-1.6.3-r1.ebuild
+++ b/dev-java/qdox/qdox-1.6.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,10 +16,10 @@ SLOT="1.6"
 LICENSE="Apache-2.0"
 
 DEPEND="
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8"
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2019-05-18  1:14 Aaron Bauman
  0 siblings, 0 replies; 34+ messages in thread
From: Aaron Bauman @ 2019-05-18  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5f3918f2a12f67648c5c83b8771e53e8b9d00f17
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 01:08:35 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 18 01:08:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3918f2

dev-java/qdox: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 dev-java/qdox/qdox-1.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index f471a8ddecd..7100ae1aba6 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ 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 ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2019-04-01  8:53 Patrice Clement
  0 siblings, 0 replies; 34+ messages in thread
From: Patrice Clement @ 2019-04-01  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     53021b52c6d7dd44005cf077ff0a73da006f23ba
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 20:21:39 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 08:51:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53021b52

dev-java/qdox: clean up old.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-java/qdox/Manifest          |  1 -
 dev-java/qdox/qdox-1.6.3.ebuild | 49 -----------------------------------------
 2 files changed, 50 deletions(-)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 7591b4cf315..51e3d527bae 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,3 +1,2 @@
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
-DIST qdox-1.6.3-sources.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965

diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
deleted file mode 100644
index 8673fd2b4a1..00000000000
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-CDEPEND="dev-java/ant-core
-	=dev-java/junit-3.8*"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-S=${WORKDIR}
-
-src_compile() {
-	# create jar
-	mkdir -p build/classes
-	ejavac -sourcepath . -d build/classes -classpath $(java-pkg_getjars ant-core,junit) \
-		$(find . -name "*.java") || die "Cannot compile sources"
-	mkdir dist
-	cd build/classes
-	jar -cvf "${S}/dist/${PN}.jar" com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc
-		javadoc -d javadoc -sourcepath . -subpackages com \
-			-classpath $(java-pkg_getjars ant-core,junit)
-	fi
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc com
-	use doc && java-pkg_dojavadoc javadoc
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2019-04-01  8:53 Patrice Clement
  0 siblings, 0 replies; 34+ messages in thread
From: Patrice Clement @ 2019-04-01  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3abf6828fef8db7b0f02527a9a4af36aaa36548c
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 20:21:05 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 08:51:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3abf6828

dev-java/qdox: EAPI 6 bump.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --force

 dev-java/qdox/Manifest             |  1 +
 dev-java/qdox/qdox-1.6.3-r1.ebuild | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 43cfa3361fc..7591b4cf315 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,2 +1,3 @@
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3-sources.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
+DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965

diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild b/dev-java/qdox/qdox-1.6.3-r1.ebuild
new file mode 100644
index 00000000000..1bed92f903f
--- /dev/null
+++ b/dev-java/qdox/qdox-1.6.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}-sources.jar -> ${P}.jar"
+
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+SLOT="1.6"
+LICENSE="Apache-2.0"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="com"
+
+src_prepare() {
+	default
+	rm -v com/thoughtworks/qdox/ant/AbstractQdoxTask.java \
+		com/thoughtworks/qdox/junit/APITestCase.java || die
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2017-10-19 21:28 Jonas Stein
  0 siblings, 0 replies; 34+ messages in thread
From: Jonas Stein @ 2017-10-19 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     732171403f02a1cef51e14d8e4d0e63688036b8a
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 21:28:42 2017 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 21:28:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73217140

dev-java/qdox: Remove proxy-maint

Remove proxy maintainer project from metadata, because there was no
proxied maintainer left.
Reported-By: Michael Mair-Keimberger
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-java/qdox/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index 60d5c915d49..5b3cc7523d7 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -5,10 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		High speed, small footprint parser for extracting class/interface/method
 		definitions from source files complete with JavaDoc @tags.


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2017-07-13  7:48 Alexis Ballier
  0 siblings, 0 replies; 34+ messages in thread
From: Alexis Ballier @ 2017-07-13  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ed7de602bc3c65d2cf95bd67b6c7b045e0be220e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 06:58:08 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 07:47:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7de602

dev-java/qdox: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/qdox/qdox-1.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index a5a5f29f262..55d7edd511d 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2016-04-24 20:17 James Le Cuirot
  0 siblings, 0 replies; 34+ messages in thread
From: James Le Cuirot @ 2016-04-24 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     08e561398f7a6758f2696047c2cb4c7f623127f9
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:15:34 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:17:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e56139

dev-java/qdox: Remove old

Package-Manager: portage-2.2.28

 dev-java/qdox/Manifest            |  1 -
 dev-java/qdox/qdox-1.12-r1.ebuild | 82 ---------------------------------------
 2 files changed, 83 deletions(-)

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 763c940..eaaa679 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,3 +1,2 @@
-DIST qdox-1.12-20100531.205010-5-project.tar.gz 519732 SHA256 7ec2a48498f996e35c6bfdbff1dbbb061e51ff16862c4f3c3f12235d30857cca SHA512 b549704c941ac6333f4d96a880c4c05af6793043ad5f3d8adf6352c285507f7748905c57c91261c4171b1e6c3b11bb8e2ecad68a413a5297eebd92ac2d671809 WHIRLPOOL bd560572d5d41f39918237519e7d201bfde30e27e6d4d5d55f543681d833380553df8b062ca3392f9b9b3d185e48ac689dd7492796e9211ef9b21797129d3017
 DIST qdox-1.12.1.tar.gz 519833 SHA256 6c716c013b27d79eff31de59ab69b734d6744c32548549aaf3e6875915172565 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5 WHIRLPOOL 3e828d430637b18a8c91d273bb26b5ccf26f0f2556639b0af9ed3527eb28bb29de4d2dc8caaf07a0bbadef4001564db67eba63f0440d30e3b83da8f5e209bb41
 DIST qdox-1.6.3-sources.jar 63731 SHA256 7ddb3a75c1ab415c631ae39660679630653bbbed84895e5ed4b4775ce5327846 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965 WHIRLPOOL a57aecd3ccf7537af450dc54da65eb9b49b87b461b5929e36c49f5f40a5344fd84625afda47f6ea2860d65a200b34b7abc751ba377ad4404de4f9ca8a55bc36d

diff --git a/dev-java/qdox/qdox-1.12-r1.ebuild b/dev-java/qdox/qdox-1.12-r1.ebuild
deleted file mode 100644
index aa685c7..0000000
--- a/dev-java/qdox/qdox-1.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${PV}-SNAPSHOT"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	>=dev-java/jflex-1.4.3:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-java_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 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
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2016-04-24 20:17 James Le Cuirot
  0 siblings, 0 replies; 34+ messages in thread
From: James Le Cuirot @ 2016-04-24 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9fd6e0346199f9f1108000b453d93b8243abc4b2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 20:14:44 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:17:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd6e034

dev-java/qdox: 1.12.1-r1 stable on amd64, ppc64, x86 using ALLARCHES

Package-Manager: portage-2.2.28

 dev-java/qdox/qdox-1.12.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index 542db4d..6ffaf3f 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2015-11-22 21:37 James Le Cuirot
  0 siblings, 0 replies; 34+ messages in thread
From: James Le Cuirot @ 2015-11-22 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b985cf5cc091635eda05320064fd602cd73fe903
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 21:34:01 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 21:36:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b985cf5c

dev-java/qdox: Add ~ppc64 keyword

Package-Manager: portage-2.2.25

 dev-java/qdox/qdox-1.12.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index 9082187..d0b13a1 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2015-11-02 23:56 James Le Cuirot
  0 siblings, 0 replies; 34+ messages in thread
From: James Le Cuirot @ 2015-11-02 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c37141f5d3e1cef5d58855b8c30a1bfaa62e774c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 23:48:45 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 23:56:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37141f5

dev-java/qdox: Remove old

This drops ~ppc64 back to 1.12-r1. Sorry about that but the versions
inbetween won't work against jflex 1.6.1. This situation will be
remedied shortly. It is only a build time issue so should not affect
existing installations.

Package-Manager: portage-2.2.20.1

 dev-java/qdox/qdox-1.12-r2.ebuild | 85 ---------------------------------------
 dev-java/qdox/qdox-1.12.1.ebuild  | 82 -------------------------------------
 2 files changed, 167 deletions(-)

diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild
deleted file mode 100644
index 140ace0..0000000
--- a/dev-java/qdox/qdox-1.12-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
-
-LICENSE="Apache-2.0"
-SLOT="1.12"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${P}-SNAPSHOT"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	dev-java/jflex:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-java_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 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
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}

diff --git a/dev-java/qdox/qdox-1.12.1.ebuild b/dev-java/qdox/qdox-1.12.1.ebuild
deleted file mode 100644
index 7f99e23..0000000
--- a/dev-java/qdox/qdox-1.12.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	dev-java/byaccj:0
-	>=dev-java/jflex-1.4.3:0
-	dev-java/jmock:1.0
-	test? ( dev-java/junit:0 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-java_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 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
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc src/java/com
-	use doc && java-pkg_dojavadoc javadoc
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2015-08-13 14:46 Patrice Clement
  0 siblings, 0 replies; 34+ messages in thread
From: Patrice Clement @ 2015-08-13 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0773913add1b226e723a2bb1c9adb00ebb0dcc
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 15:40:58 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 15:47:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd077391

dev-java/qdox: Update jflex dependency. Fixes bug 557292.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/qdox/qdox-1.12-r2.ebuild | 85 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild
new file mode 100644
index 0000000..140ace0
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${P}-SNAPSHOT"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	dev-java/jflex:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+java_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 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
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/
@ 2015-08-09 12:30 Justin Lecher
  0 siblings, 0 replies; 34+ messages in thread
From: Justin Lecher @ 2015-08-09 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a7c43576128db541355e74f3cdc7796133ab3588
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 11:59:51 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 12:29:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c43576

dev-java/qdox: Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-java/qdox/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index 24b0b90..ec07d71 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -7,4 +7,7 @@
 		High speed, small footprint parser for extracting class/interface/method
 		definitions from source files complete with JavaDoc @tags.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">codehaus/qdox</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2024-09-28 14:03 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-28  9:44 [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2024-09-28 14:03 Arthur Zamarin
2024-09-28 10:09 Arthur Zamarin
2024-09-28  9:44 Arthur Zamarin
2024-09-28  9:38 Sam James
2024-08-30 11:06 Arthur Zamarin
2024-08-30 11:06 Arthur Zamarin
2024-05-25  9:27 Miroslav Šulc
2024-04-17  9:08 Miroslav Šulc
2022-11-30  0:52 Sam James
2022-11-29  6:58 Jakov Smolić
2022-11-27 16:43 Arthur Zamarin
2022-11-27 16:43 Arthur Zamarin
2022-10-27 20:05 Florian Schmaus
2022-05-05  7:27 Miroslav Šulc
2022-05-05  5:29 Arthur Zamarin
2022-05-04 14:40 Sam James
2022-05-04  0:16 Sam James
2022-05-03  7:20 Jakov Smolić
2022-04-03  6:56 Miroslav Šulc
2022-04-03  6:56 Miroslav Šulc
2022-01-14  8:43 Miroslav Šulc
2020-10-02 17:56 Miroslav Šulc
2019-05-18  1:14 Aaron Bauman
2019-04-01  8:53 Patrice Clement
2019-04-01  8:53 Patrice Clement
2017-10-19 21:28 Jonas Stein
2017-07-13  7:48 Alexis Ballier
2016-04-24 20:17 James Le Cuirot
2016-04-24 20:17 James Le Cuirot
2015-11-22 21:37 James Le Cuirot
2015-11-02 23:56 James Le Cuirot
2015-08-13 14:46 Patrice Clement
2015-08-09 12:30 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox