[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     a96ead8fecc919eba7a3576207c88acefdaecc53
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 17 06:30:59 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 08:56:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96ead8f

dev-java/antlr: Drop 3.5.2-r1, 4.5.1 and 4.5.3-r1

Closes: https://bugs.gentoo.org/707068
Closes: https://bugs.gentoo.org/796695
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/antlr/Manifest              |  5 --
 dev-java/antlr/antlr-3.5.2-r1.ebuild | 91 ----------------------------------
 dev-java/antlr/antlr-4.5.1.ebuild    | 91 ----------------------------------
 dev-java/antlr/antlr-4.5.3-r1.ebuild | 94 ------------------------------------
 4 files changed, 281 deletions(-)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index b1d446eb0c3b..1de9662c4657 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,10 +1,5 @@
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd2bdeac8426d65d0a16610a8da4dd3bda23db68b7feafc90449bda5032115ad0f0dbe7c376c4095cb4ccac3e7a70e84 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c
-DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
-DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
-DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127

diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
deleted file mode 100644
index 0c83334bc403..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/stringtemplate:4"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}3-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4"
-PATCHES=(
-	"${FILESDIR}/${PV}-test-fixes.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	# This requires StringTemplate v3 and is only needed for
-	# output=template. Nothing in the tree currently needs that and the
-	# dependency situation is already hairy enough as it is.
-	rm -v runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java || die
-
-	# Some tests have to be removed as a result.
-	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# to the tests. This is bad but upstream is never going to update
-	# 3.5. At the time of writing, we only use it to build 4 anyway.
-	if java-pkg_is-vm-version-ge 1.8; then
-		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-	fi
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src/main" || die
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src/main" || die
-	java -jar "${DISTDIR}/${P}-complete.jar" $(find antlr3 -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
-	cd tool/src/test/java || die
-	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-
-	# ejunit automatically adds all registered subdependencies to the
-	# classpath, which is annoying in this case because of the cyclic
-	# dependency on stringtemplate. It will blow up when trying to find
-	# antlr-3.5 on the system before it is installed. The easiest but
-	# somewhat ugly way to avoid this is to unset JAVA_PKG_DEPEND_FILE.
-	JAVA_PKG_DEPEND_FILE= ejunit4 -classpath "${CP}" ${TESTS}
-}

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
deleted file mode 100644
index 4c411e077bb3..000000000000
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}

diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
deleted file mode 100644
index 3c098f5c976f..000000000000
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.antlr:antlr4:4.5.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}