gentoo auto-resync : 29:09:2024 - 01:25:46

3 files changed, 2 insertions, 99 deletions

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index cc16271f6d0f..a550551bc483 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -2,7 +2,6 @@ AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb
 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
-EBUILD qdox-1.12.1-r5.ebuild 2422 BLAKE2B 25c1c4fee466506df67515b7f8b8cc5b19c650ea33e17d71703fd84b91eb25a7a2893b6a7a80e74499208b4dd0442b51e22cab803875317542de51a0fd256fe2 SHA512 92407c44ae8e33935525262aacc2ca6f7a12b22638f26489112b902608a09401120e6732cc8d96f9e1c8eb3ab5d0a4b432cb40221ae67b75b62b3c7bcc10b5e2
-EBUILD qdox-1.12.1-r6.ebuild 2924 BLAKE2B 9a866191f19dedac7cf50b5a94032765fe6a27986eb8088b115ab0e0099baf77af9d1bae061743f02bf2d4d6facdf853ef41aa5282b9a023d8602ba2a8fa3516 SHA512 167500b4ef23aba7f021992222f52f530573a86e4a335884ee00d944bea288c2fdebbc460c99970767e7e7478089ed8aeb2559d5abfb5361008cf3800bbbc3fc
+EBUILD qdox-1.12.1-r6.ebuild 2920 BLAKE2B e7c8120e1fb8bc03b5ad1afcfd632320fc367c594bbc2074d0bfdd303dc8eab9704f426f52760631a7d3a08d59a1e78bb924113e5ee7c77aa3653d2bd3bf5888 SHA512 0064c2b2588237b83df2b04b3c29c217a6f55174ef6e867718742998f12ec0e8f3f0fdb9bb8703bcea5bb2d670b7f50d3786690f70629e7068ece2370549c78a
 EBUILD qdox-2.0.1.ebuild 2815 BLAKE2B 9a245b766a3ea5484b6e84ec4edfa05f98c4b6e2ca76a380a4b6717ff1b8ff0c0183feb712d6740bda1db84861bf64d39d11f437c63ce1b116065d523a14a953 SHA512 96ae28a0fcd12b53ea914942930c8a0a2c55f4a608ae23c052d364b52cb66d57dc2ab1cbf8c9877c5edc3174357058895747882e723b15e6170320cb978e4403
 MISC metadata.xml 559 BLAKE2B d6d6774a40f5ff9d1a1bec881cb25d168c97d26705dfa0379cb40dfdd628ebda573e004080252bdbb7e2826daace708ff291ff1726760bdbf29c24102db3debd SHA512 ed0d7a8d8f90b3890edd368715980141a54b02e84f49b34132c165985df822be898e3b564d56e30938a6812639309a1f2947f5346f10678957dd9bf3858dd3f5
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
-}
diff --git a/dev-java/qdox/qdox-1.12.1-r6.ebuild b/dev-java/qdox/qdox-1.12.1-r6.ebuild
index a06037118b89..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 )"