summaryrefslogtreecommitdiff
path: root/dev-java/antlr-tool
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/antlr-tool')
-rw-r--r--dev-java/antlr-tool/Manifest5
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild (renamed from dev-java/antlr-tool/antlr-tool-3.5.3.ebuild)4
-rw-r--r--dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild (renamed from dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild)2
-rw-r--r--dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch11
4 files changed, 18 insertions, 4 deletions
diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index a0c38271d1ab..b3f9b511240f 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -1,8 +1,9 @@
AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
+AUX antlr-tool-3.5.3-java21.patch 333 BLAKE2B fcce76be4def5c9c24d21f43659c476680da74154fdd2c315732de1e974069ef1ad678390eb379be10673220659cecdbefc91187ecb8d5a5b9d5ab9607b35a80 SHA512 d78f1bdb9d19523ecbe80a31c165219e2945e5983f4c02e6755eb768c73037dd5e792fba42ed18c6e0cbd6ce55de472a6f42afa91bca6645952dd7accb9f6312
DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
-EBUILD antlr-tool-3.5.3.ebuild 1885 BLAKE2B 2a6d03c164ef67b9863852140d0bd9a2006ed818adf6972eef74698bd6cfdce65aade0eeca494a093b1dfef71ce13c038cb13245779b538a5d4cccb37100faa9 SHA512 1be7541883342648bb9daef6f6f7a10892b0643563624125eb610b575e1e6b5228841c3a596ba2cf0381d4a407396f6f0fe9bdd75ae15b9becede94a081f5f67
-EBUILD antlr-tool-4.9.3-r1.ebuild 3702 BLAKE2B a301909307af6c915ae2b424af9b3ba03f8d81697bd34557ea18ed1d13f8aa1e52f501cbf8ec47172bd25d44f581cc37ec5d7e921000bc88451089b83c860e5d SHA512 57bc1debb62dbb12be391286f7e9f13ae52f8d68501e0d6e410e8caf4dafbe070eb1331ce23216339c7e1e3c47cf25396514ba67fef9cc1e8b0b6be1f5017e78
+EBUILD antlr-tool-3.5.3-r1.ebuild 1958 BLAKE2B 12fec5c5bced1ba7264ab11b938211898a8b32651d5d6ae38d0bc44bb60ac451f4e7b1bead70c523ef9e2a026c11bf2008b65508b0e02826c3c417f8d009fd9e SHA512 dd2278182ceae5f8d82976fbb42c79296ba30e4c3bc45ec6daf29895e80b18a1a9f5d85f57f9f23d4b395a2f85b7e9616d19d6ac2848e52885ec66c97f558fab
+EBUILD antlr-tool-4.9.3-r2.ebuild 3712 BLAKE2B 981bfaf34c02951be230d694b4d58a9aae8c833742e1fd2f95be860754ddddf4351709b8ef70ce0447aa0722227a9ad20bf9d21c063f61552e1ff23ba385f1df SHA512 cfb3eaa48052d148f8c8025e99b6f367738d76a6b4601500137fe13e4c22d98cfd248de5e800aa72dab3edce2f648584ae8168781263181f1c2a2bdc738a3141
MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 0d99b11e44be..1997ce8c081f 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.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
@@ -58,9 +58,11 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
+PATCHES=( "${FILESDIR}/antlr-tool-3.5.3-java21.patch" )
src_prepare() {
java-pkg_clean
+ default #780585
java-pkg-2_src_prepare
# Some tests fail under Java 8 in ways that probably aren't limited
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
index eaf876b5e1b3..2891b009c53f 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
@@ -32,7 +32,7 @@ CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
dev-java/antlr-runtime:3.5
dev-java/jakarta-json-api:1
- dev-java/icu4j:0
+ >=dev-java/icu4j-74.2-r1:0
dev-java/stringtemplate:4
dev-java/treelayout:0
"
diff --git a/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
new file mode 100644
index 000000000000..2e196df96ef9
--- /dev/null
+++ b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
@@ -0,0 +1,11 @@
+bug #919481
+--- a/org/antlr/codegen/templates/Java/ST.stg
++++ b/org/antlr/codegen/templates/Java/ST.stg
+@@ -32,6 +32,7 @@
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>