[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/, dev-java/antlr/files/
commit: 005afcc264209c3a0f0bbfe8ad473986eabaced4
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Mar 29 08:21:05 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Apr 15 07:45:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005afcc2
dev-java/antlr: java21.patch
Closes: https://bugs.gentoo.org/919684
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
.../{antlr-3.2-r1.ebuild => antlr-3.2-r2.ebuild}| 3 ++-
dev-java/antlr/files/antlr-3.2-java21.patch | 21 +
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild
b/dev-java/antlr/antlr-3.2-r2.ebuild
similarity index 97%
rename from dev-java/antlr/antlr-3.2-r1.ebuild
rename to dev-java/antlr/antlr-3.2-r2.ebuild
index bf4946c25c62..b3ec93f8722e 100644
--- a/dev-java/antlr/antlr-3.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,6 +31,7 @@ PATCHES=(
# These fixes have been applied in 3.5.
"${FILESDIR}/${PV}-test-fixes.patch"
"${FILESDIR}/${PV}-java-8.patch"
+ "${FILESDIR}/antlr-3.2-java21.patch"
)
S="${WORKDIR}/${P}"
diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch
b/dev-java/antlr/files/antlr-3.2-java21.patch
new file mode 100644
index ..9df897ac22de
--- /dev/null
+++ b/dev-java/antlr/files/antlr-3.2-java21.patch
@@ -0,0 +1,21 @@
+bug #919684
+--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
+@@ -36,6 +36,7 @@ import org.antlr.Tool;
+ import org.antlr.analysis.*;
+ import org.antlr.misc.*;
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
+ import org.antlr.tool.*;
+
+--- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
+@@ -32,6 +32,7 @@ header {
+ import org.antlr.misc.*;
+ import java.util.*;
+ import org.antlr.stringtemplate.*;
++ import org.antlr.stringtemplate.StringTemplate;
+ import antlr.TokenWithIndex;
+ import antlr.CommonToken;
+ import org.antlr.codegen.*;
[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/, dev-java/antlr/files/
commit: 3394094d2c0d89ccc8d831bb299dddf7c94dd6ab
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun May 16 09:30:11 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 16 19:06:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3394094d
dev-java/antlr: EAPI 7, min java 1.8 (slot 3)
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20829
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/antlr/antlr-3.2-r1.ebuild| 101 ++
dev-java/antlr/files/3.2-test-fixes.patch | 16 ++---
2 files changed, 109 insertions(+), 8 deletions(-)
diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild
b/dev-java/antlr/antlr-3.2-r1.ebuild
new file mode 100644
index 000..fba666dc5ad
--- /dev/null
+++ b/dev-java/antlr/antlr-3.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr3.org/;
+SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
+ https://www.antlr3.org/download/${P}.jar; # Prebuilt version needed.
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0
+ dev-java/stringtemplate:0"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:4 )"
+
+PATCHES=(
+ # These fixes have been applied in 3.5.
+ "${FILESDIR}/${PV}-test-fixes.patch"
+ "${FILESDIR}/${PV}-java-8.patch"
+)
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
+JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+}
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ # 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.2 even though other projects still rely on it. If any issues
+ # arise, we can only put pressure on those projects to upgrade.
+ 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
+
+ # 3.2 has strange hidden files.
+ find -type f -name "._*.*" -delete || die
+}
+
+src_compile() {
+ cd "${S}/runtime/Java/src/main" || die
+ JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile
+
+ cd "${S}/tool/src/main" || die
+
+ local G; for G in antlr codegen antlr.print assign.types buildnfa
define; do # from pom.xml
+ antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die
+ done
+
+ # We have applied a patch to fix this version under Java 8. Trouble
+ # is that we need to run a prebuilt version before we can build our
+ # own and that version doesn't have the fix applied. We work around
+ # this by building just the offending class against the prebuilt
+ # version and then putting them together in the classpath. That
+ # isn't all. Due to a compiler limitation that Chewi doesn't fully
+ # understand, this class cannot be compiled by itself without a
+ # couple of tweaks that have been applied in the Java 8 patch.
+ ejavac -classpath "${DISTDIR}/${P}.jar"
java/org/antlr/tool/CompositeGrammar.java
+
+ java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(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")
+ ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch
b/dev-java/antlr/files/3.2-test-fixes.patch
index 0544b700617..28068edb76b 100644
--- a/dev-java/antlr/files/3.2-test-fixes.patch
+++ b/dev-java/antlr/files/3.2-test-fixes.patch
@@ -1,5 +1,5 @@
tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30
01:54:04.0 +
-+++
[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/, dev-java/antlr/files/
commit: 5c462fbe07a3a1d988c1b13b5b8362e2bf3c966e
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Dec 5 23:32:18 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Dec 5 23:41:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c462fbe
dev-java/antlr: Version bump into new SLOT 3.5
Primarily needed to unbundle ANTLR 4. This release seems to have more
in common with 4 than it does with 3.2, hence the new SLOT.
I have excluded the output=template feature to draw a firm dividing
line between 0/3 and 3.5/4 SLOTs, otherwise 4 would pull in 3 previous
versions!
Package-Manager: portage-2.2.26
dev-java/antlr/Manifest | 2 +
dev-java/antlr/antlr-3.5.2.ebuild | 87 +
dev-java/antlr/files/3.5.2-test-fixes.patch | 36
3 files changed, 125 insertions(+)
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 7c1dfc3..dd63ef1 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -5,4 +5,6 @@ DIST antlr-3.1.3.tar.gz 10743515 SHA256
1fca0fc7304140807e64ec263a58d93ef1b380cf
DIST antlr-3.2.jar 1928009 SHA256
4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512
25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
WHIRLPOOL
19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
DIST antlr-3.2.tar.gz 837320 SHA256
01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512
8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
WHIRLPOOL
40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256
46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512
227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9
WHIRLPOOL
5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
+DIST antlr-3.5.2-complete.jar 2456317 SHA256
26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
WHIRLPOOL
bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
+DIST antlr-3.5.2.tar.gz 6927126 SHA256
529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512
e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
WHIRLPOOL
a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
DIST antlr-4.3-complete.jar 1340431 SHA256
da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512
669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e
WHIRLPOOL
f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild
b/dev-java/antlr/antlr-3.5.2.ebuild
new file mode 100644
index 000..33d4d91
--- /dev/null
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr3.org/;
+SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
+ http://www.antlr3.org/download/${P}-complete.jar; # Prebuilt version
needed.
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND="dev-java/stringtemplate:4"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}3-${PV}"
+JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+}
+
+java_prepare() {
+ 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
