[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[Miroslav Šulc]

commit: 8fc319802f811bfc774024d7cf46d3a6815aabde
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul 26 09:33:47 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul 26 09:33:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc31980

dev-java/stringtemplate: fixed tests in java 21+ for 4.3.4 + simplified 
applying the patch

Closes: https://bugs.gentoo.org/936535
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...rs.patch => stringtemplate-4.3.4-Java21+-TestRenderers.patch} | 8 
 dev-java/stringtemplate/stringtemplate-4.3.4.ebuild  | 9 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
similarity index 85%
rename from 
dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
rename to 
dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
index 127f5e0a4b61..22b271671b8d 100644
--- 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
@@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow 
space)
  String expecting = "datetime: 7/5/05, 12:00 AM";
  if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") 
|| javaVersion.startsWith("1.8") ) {
  expecting = "datetime: 7/5/05 12:00 AM";
-+} else if ( javaVersion.startsWith("21") ) {
++} else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", 
"$1")) >= 21 ) {
 +expecting = "datetime: 7/5/05, 12:00 AM";
  }
  String result = st.render();
@@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow 
space)
  String expecting = " datetime: 7/5/05, 12:00 AM ";
  if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") 
|| javaVersion.startsWith("1.8") ) {
  expecting = " datetime: 7/5/05 12:00 AM ";
-+} else if ( javaVersion.startsWith("21") ) {
++} else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", 
"$1")) >= 21 ) {
 +expecting = " datetime: 7/5/05, 12:00 AM ";
  }
  String result = st.render();
@@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow 
space)
  String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 
AM Pacific Daylight Time ";
  if ( javaVersion.startsWith("1.6") || 
javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
  expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT 
";
-+} else if ( javaVersion.startsWith("21") ) {
++} else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", 
"$1")) >= 21 ) {
 +expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM 
Pacific Daylight Time ";
  }
  String result = st.render();
@@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow 
space)
  ST st = group.getInstanceOf("dateThing");
  st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
  String expecting = " time: 12:00:00 AM ";
-+if ( javaVersion.startsWith("21") ) {
++if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 
) {
 +expecting = " time: 12:00:00 AM ";
 +}
  String result = st.render();

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index dd01fef37fd3..0ed931834169 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
 JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
 
 DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
-PATCHES=( 
"${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
+PATCHES=(
+   "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch"
+   "${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch"
+)
 
 src_prepare() {
default #780585
@@ -65,10 +68,6 @@ src_prepare() {
 }
 
 src_test() {
-   local vm_version="$(java-config -g PROVIDES_VERSION)"
-   if ver_test "${vm_version}" -ge 21; then
-   eapply 
"${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
-   fi
# Make sure no older versions of this slot are present in the classpath
# https://bugs.gentoo.org/834138#c4
local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[Florian Schmaus]

commit: 6c4c88ebf564f6cb8b09e4679027364ec4a4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan  7 16:01:39 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Jan 10 08:28:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4c88eb

dev-java/stringtemplate: drop 4.3.2

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34696
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/stringtemplate/Manifest   |   2 -
 ...mplate-4.3.1-BaseTest-javac-source-target.patch |  28 --
 .../stringtemplate/stringtemplate-4.3.2.ebuild | 103 -
 3 files changed, 133 deletions(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index a3cd15fbf1b0..99391fd2990b 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,6 +1,4 @@
-DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 
667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc
 SHA512 
7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 
25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d
 SHA512 
83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
 DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 
40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517
 SHA512 
5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
 DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B 
b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba9bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57
 SHA512 
8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 
0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679
 SHA512 
d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
 
b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
deleted file mode 100644
index 5824425ce35b..
--- 
a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
-From: Yuan Liao 
-Date: Mon, 24 Jan 2022 06:17:03 -0800
-Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
-
-JDK 17 no longer supports 1.6 as the source or target version.
-
-Signed-off-by: Yuan Liao 

- test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/org/stringtemplate/v4/test/BaseTest.java 
b/test/org/stringtemplate/v4/test/BaseTest.java
-index 536d686..74a3949 100644
 a/test/org/stringtemplate/v4/test/BaseTest.java
-+++ b/test/org/stringtemplate/v4/test/BaseTest.java
-@@ -258,7 +258,7 @@ public abstract class BaseTest {
- fileManager.getJavaFileObjectsFromFiles(files);
- 
- Iterable compileOptions =
--Arrays.asList("-g", "-source", "1.6", "-target", "1.6", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
-+Arrays.asList("-g", "-source", "1.8", "-target", "1.8", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
- 
- JavaCompiler.CompilationTask task =
- compiler.getTask(null, fileManager, null, compileOptions, null,
--- 
-2.34.1
-

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
deleted file mode 100644
index 86fa55098e53..
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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="org.antlr:ST4:4.3.2"
-JAVA_TESTING_FRAMEWORKS="ju

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

[Arthur Zamarin]

commit: 79c4bb39eaf5363e1775cf24eed87f681735c9c8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jan  7 12:41:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jan  7 12:41:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c4bb39

dev-java/stringtemplate: Stabilize 4.3.4 amd64, #919457

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index 91ef1a6eb1a4..4dfc22ecc26f 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -23,7 +23,7 @@ TARBALL_S="${S}/${PN}4-ST4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Arthur Zamarin]

commit: 424f162462be445bc1e79a75c442ed7cd0816886
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jan  7 12:41:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jan  7 12:41:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424f1624

dev-java/stringtemplate: Stabilize 4.3.4 x86, #919457

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index 4dfc22ecc26f..dd01fef37fd3 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -23,7 +23,7 @@ TARBALL_S="${S}/${PN}4-ST4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[Miroslav Šulc]

commit: 1210dc8f95787cdbd313ee1edcb700fafc1c23f9
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Nov 21 07:41:23 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  8 10:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1210dc8f

dev-java/stringtemplate: add 4.3.4

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |   2 +
 ...stringtemplate-4.3.4-Java21-TestRenderers.patch |  91 ++
 .../stringtemplate/stringtemplate-4.3.4.ebuild | 107 +
 3 files changed, 200 insertions(+)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index a3e375a5b4f2..a3cd15fbf1b0 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,4 +1,6 @@
 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 
667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc
 SHA512 
7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
+DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 
25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d
 SHA512 
83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
+DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 
40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517
 SHA512 
5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
 DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B 
b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba9bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57
 SHA512 
8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 
0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679
 SHA512 
d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
new file mode 100644
index ..e166440edeeb
--- /dev/null
+++ 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
@@ -0,0 +1,91 @@
+There were 4 failures:
+1) testRendererForGroup(org.stringtemplate.v4.test.TestRenderers)
+org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM> but 
was:<...etime: 7/5/05, 12:00[ ]AM>
+at org.junit.Assert.assertEquals(Assert.java:117)
+at org.junit.Assert.assertEquals(Assert.java:146)
+at 
org.stringtemplate.v4.test.TestRenderers.testRendererForGroup(TestRenderers.java:82)
+2) testRendererWithPredefinedFormat2(org.stringtemplate.v4.test.TestRenderers)
+org.junit.ComparisonFailure: expected:<...uesday, July 5, 2005[ at 12:00:00 
]AM Pacific Daylight ...> but was:<...uesday, July 5, 2005[, 12:00:00 ]AM 
Pacific Daylight ...>
+at org.junit.Assert.assertEquals(Assert.java:117)
+at org.junit.Assert.assertEquals(Assert.java:146)
+at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat2(TestRenderers.java:131)
+3) testRendererWithPredefinedFormat4(org.stringtemplate.v4.test.TestRenderers)
+org.junit.ComparisonFailure: expected:< time: 12:00:00[ ]AM > but was:< time: 
12:00:00[ ]AM >
+at org.junit.Assert.assertEquals(Assert.java:117)
+at org.junit.Assert.assertEquals(Assert.java:146)
+at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat4(TestRenderers.java:164)
+4) testRendererWithPredefinedFormat(org.stringtemplate.v4.test.TestRenderers)
+org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM > but 
was:<...etime: 7/5/05, 12:00[ ]AM >
+at org.junit.Assert.assertEquals(Assert.java:117)
+at org.junit.Assert.assertEquals(Assert.java:146)
+at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat(TestRenderers.java:111)
+
+FAILURES!!!
+Tests run: 636,  Failures: 4
+
+https://github.com/antlr/stringtemplate4/issues/315
+--- 
a/stringtemplate4-ST4-

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

[Miroslav Šulc]

commit: 1cbc29142009f8e00e138ef164116fe494a03ae1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Oct 31 14:10:41 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  8 10:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbc2914

dev-java/stringtemplate: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/stringtemplate/metadata.xml 
b/dev-java/stringtemplate/metadata.xml
index fb8783e44aee..b4aba6185def 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -6,6 +6,7 @@
Java


+   antlr/stringtemplate3
antlr/stringtemplate4

 

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[Miroslav Šulc]

commit: e8b8f7b9856b2b3899c723ef020d6ff9c0c566f4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Oct 31 13:58:06 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  8 10:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b8f7b9

dev-java/stringtemplate: add java21-compatibility.patch, EAPI 7 -> 8 (slot 0)

moves dev-java/antlr:0 to CP_DEPEND

Closes: https://bugs.gentoo.org/916571
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |  1 +
 .../stringtemplate-3.2.1-TestStringTemplate.patch  | 11 +
 1-r2.ebuild => stringtemplate-3.2.1-r3.ebuild} | 53 ++
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 3e6c9904de13..a3e375a5b4f2 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,4 @@
 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 
667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc
 SHA512 
7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
+DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B 
b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba9bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57
 SHA512 
8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 
0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679
 SHA512 
d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch 
b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
new file mode 100644
index ..e12b3c63b26a
--- /dev/null
+++ 
b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/916571
+--- a/test/org/antlr/stringtemplate/test/TestStringTemplate.java
 b/test/org/antlr/stringtemplate/test/TestStringTemplate.java
+@@ -28,6 +28,7 @@
+ package org.antlr.stringtemplate.test;
+ 
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
+ import org.antlr.stringtemplate.language.DefaultTemplateLexer;
+ import org.junit.Test;

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
similarity index 57%
rename from dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
rename to dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
index 12ea0035a6ed..544099d09244 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
@@ -1,59 +1,52 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz
 --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild 
stringtemplate-3.2.1-r2.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:stringtemplate:3.2.2"
+MAVEN_ID="org.antlr:stringtemplate:${PV}"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
 DESCRIPTION="A Java template engine"
 HOMEPAGE="https://www.stringtemplate.org/";
-SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
+DEB="3.2.1-4"
+SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz
+   
https://sources.debian.org/data/main/s/${PN}/${DEB}/debian/patches/java21-compatibility.patch
 \
+   -> ${PN}-${DEB}-java21-compatibility.patch"
+S="${WORKDIR}/${PN}3-${MY_COMMIT}"
 
 LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
-# Common dependencies
-# POM: pom.xml
-# antlr:antlr:2.7.7 -> >=dev-java/ant

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

[Miroslav Šulc]

commit: 7accbac256b52711f5f70597ffcb0777b848ad57
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec  8 10:38:42 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  8 10:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7accbac2

dev-java/stringtemplate: fixed tests for java 21 in 4.3.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 ...stringtemplate-4.3.4-Java21-TestRenderers.patch | 118 ++---
 1 file changed, 34 insertions(+), 84 deletions(-)

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
index e166440edeeb..127f5e0a4b61 100644
--- 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
@@ -1,91 +1,41 @@
-There were 4 failures:
-1) testRendererForGroup(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM> but 
was:<...etime: 7/5/05, 12:00[ ]AM>
-at org.junit.Assert.assertEquals(Assert.java:117)
-at org.junit.Assert.assertEquals(Assert.java:146)
-at 
org.stringtemplate.v4.test.TestRenderers.testRendererForGroup(TestRenderers.java:82)
-2) testRendererWithPredefinedFormat2(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...uesday, July 5, 2005[ at 12:00:00 
]AM Pacific Daylight ...> but was:<...uesday, July 5, 2005[, 12:00:00 ]AM 
Pacific Daylight ...>
-at org.junit.Assert.assertEquals(Assert.java:117)
-at org.junit.Assert.assertEquals(Assert.java:146)
-at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat2(TestRenderers.java:131)
-3) testRendererWithPredefinedFormat4(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:< time: 12:00:00[ ]AM > but was:< time: 
12:00:00[ ]AM >
-at org.junit.Assert.assertEquals(Assert.java:117)
-at org.junit.Assert.assertEquals(Assert.java:146)
-at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat4(TestRenderers.java:164)
-4) testRendererWithPredefinedFormat(org.stringtemplate.v4.test.TestRenderers)
-org.junit.ComparisonFailure: expected:<...etime: 7/5/05, 12:00[ ]AM > but 
was:<...etime: 7/5/05, 12:00[ ]AM >
-at org.junit.Assert.assertEquals(Assert.java:117)
-at org.junit.Assert.assertEquals(Assert.java:146)
-at 
org.stringtemplate.v4.test.TestRenderers.testRendererWithPredefinedFormat(TestRenderers.java:111)
+there are different space characters used in java 21 (narrow space)
 
-FAILURES!!!
-Tests run: 636,  Failures: 4
-
-https://github.com/antlr/stringtemplate4/issues/315
 --- 
a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
 +++ 
b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -30,6 +30,7 @@ package org.stringtemplate.v4.test;
- import org.junit.After;
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.DateRenderer;
- import org.stringtemplate.v4.NumberRenderer;
- import org.stringtemplate.v4.ST;
-@@ -66,7 +67,7 @@ public class TestRenderers extends BaseTest {
- Locale.setDefault(origLocale);
- }
- 
--@Test public void testRendererForGroup() throws Exception {
-+@Test @Ignore public void testRendererForGroup() throws Exception {
- String templates =
- "dateThing(created) ::= \"datetime: \"\n";
- writeFile(tmpdir, "t.stg", templates);
-@@ -95,7 +96,7 @@ public class TestRenderers extends BaseTest {
+@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = "datetime: 7/5/05, 12:00 AM";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") 
|| javaVersion.startsWith("1.8") ) {
+ expecting = "datetime: 7/5/05 12:00 AM";
++} else if ( javaVersion.startsWith("21") ) {
++expecting = "datetime: 7/5/05, 12:00 AM";
+ }
+ String result = st.render();
  assertEquals(expecting, result);
- }
- 
--@Test public void testRendererWithPredefinedFormat() throws Exception {
-+@Test @Ignore public void testRendererWithPredefinedFormat() throws 
Exception {
- String templates =
- "dateThing(created) ::= << datetime:  >>\n";
- writeFile(tmpdir, "t.stg", templates);
-@@ -111,7 +112,7 @@ public class TestRenderers extends BaseTest {
+@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = " datetime: 7/5/05, 12:00 AM ";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") 
|| javaVersion.startsWith("1.8") ) {
+ expecting = " datetime: 7/5/05 12:00 AM ";
++} else if ( javaVersion.startsWith("21") ) {
++e

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[Miroslav Šulc]

commit: 8e2dfc4e18f9323d171a42526d508892596a2b5c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Nov 21 07:57:32 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec  8 10:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e2dfc4e

dev-java/stringtemplate: minor style update

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

 ...mplate-4.3.4-BaseTest-javac-source-target.patch | 26 ++
 .../stringtemplate/stringtemplate-4.3.4.ebuild | 23 +--
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
new file mode 100644
index ..7c31d6b5a893
--- /dev/null
+++ 
b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
@@ -0,0 +1,26 @@
+From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+Date: Mon, 24 Jan 2022 06:17:03 -0800
+Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
+
+JDK 17 no longer supports 1.6 as the source or target version.
+
+Signed-off-by: Yuan Liao 
+---
+ test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
 b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
+@@ -258,7 +258,7 @@ public abstract class BaseTest {
+ fileManager.getJavaFileObjectsFromFiles(files);
+ 
+ Iterable compileOptions =
+-Arrays.asList("-g", "-source", "1.6", "-target", "1.6", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
++Arrays.asList("-g", "-source", "1.8", "-target", "1.8", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
+ 
+ JavaCompiler.CompilationTask task =
+ compiler.getTask(null, fileManager, null, compileOptions, null,
+-- 
+2.34.1
+

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index 14530a5b8587..9fff5776a1d3 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -18,6 +18,8 @@ SRC_URI="
https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
https://github.com/antlr/stringtemplate4/archive/ST4-${PV}.tar.gz
 "
+S="${WORKDIR}"
+TARBALL_S="${S}/${PN}4-ST4-${PV}"
 
 LICENSE="BSD"
 SLOT="4"
@@ -44,9 +46,6 @@ RDEPEND="
${CP_DEPEND}
 "
 
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-ST4-${PV}"
-
 JAVA_SRC_DIR="org"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
@@ -54,18 +53,13 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
 JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
 
 DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
+PATCHES=( 
"${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
 
 src_prepare() {
-   # Do not call java-pkg_clean; otherwise, it would remove
-   # ${TARBALL_S}/test/test.jar, which is merely used as a
-   # test resource file, does not contain any *.class files,
-   # and is required to pass the tests as of version 4.3.2
-   pushd "${TARBALL_S}" > /dev/null ||
-   die "Failed to enter directory storing tarball contents"
-   eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch"
-   popd > /dev/null ||
-   die "Failed to leave directory storing tarball contents"
+   default #780585
java-pkg-2_src_prepare
+   # keep test.jar - it is required to pass the tests as of version 4.3.2
+   java-pkg_clean ! -path */test.jar
# Some of these tests requires a graphical display.
rm -v 
"${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || 
die
 }
@@ -100,8 +94,3 @@ src_test() {
JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
java-pkg-simple_src_test
 }
-
-src_install() {
-   java-pkg-simple_src_install
-   einstalldocs # https://bugs.gentoo.org/789582
-}

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

[Miroslav Šulc]

commit: 13b60ee19e790bdf09435714c124a385022d156a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri May  6 06:24:07 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri May  6 06:24:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b60ee1

dev-java/stringtemplate: dropped obsolete 4.3.1

Bug: https://bugs.gentoo.org/842729
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |  2 -
 .../stringtemplate/stringtemplate-4.3.1.ebuild | 97 --
 2 files changed, 99 deletions(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index b44912b51312..3e6c9904de13 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,5 +1,3 @@
-DIST ST4-4.3.1-sources.jar 198002 BLAKE2B 
d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d
 SHA512 
bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 
667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc
 SHA512 
7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B 
c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f
 SHA512 
afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 
0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679
 SHA512 
d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
deleted file mode 100644
index 96b458d2cc14..
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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="org.antlr:ST4:4.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/";
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
-   https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
-   https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-   dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
-   app-arch/unzip
-"
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CP_DEPEND}
-   test? (
-   dev-java/antlr-tool:3.5
-   )
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
-
-src_prepare() {
-   java-pkg_clean # Just in case Maven Central sources JAR contains binary
-   if use test; then
-   pushd "${TARBALL_S}" > /dev/null ||
-   die "Failed to enter directory storing tarball contents"
-   eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
-   popd > /dev/null ||
-   die "Failed to leave directory storing tarball contents"
-   fi
-   java-pkg-2_src_prepare
-   # Some of these tests requires a graphical display.
-   rm -v 
"${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || 
die
-}
-
-src_test() {
-   # Make sure no older versions of this slot are present in the classpath
-   # https://bugs.gentoo.org/834138#c4
-   local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
-   local new_test_cp="$(\
-   java-pkg_getjars --with-dependencies 
"${JAVA_TE

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

[Arthur Zamarin]

commit: 6e9114baf28d530ae41f1f500bcd614b6ae8d0f2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  5 17:59:47 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  5 17:59:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9114ba

dev-java/stringtemplate: Stabilize 4.3.2 ppc64, #842729

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index becc44397f65..760604d57456 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Jakov Smolić]

commit: b242edd4fd5282b36be708f5f71bc2b26db51b5f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  5 10:33:52 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  5 10:33:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b242edd4

dev-java/stringtemplate: Stabilize 4.3.2 arm64, #842729

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

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index 6d9fa6650950..becc44397f65 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Jakov Smolić]

commit: 6190175b94c46a88a7cb5ff2da4697698283ba17
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  5 09:53:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  5 09:53:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6190175b

dev-java/stringtemplate: Stabilize 4.3.2 x86, #842729

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

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index cccfac3f8429..6d9fa6650950 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Jakov Smolić]

commit: 458016061ef78b492a71353817e9c07f91b2f269
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  5 09:52:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  5 09:52:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45801606

dev-java/stringtemplate: Stabilize 4.3.2 amd64, #842729

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

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index 1d0130c2b54f..cccfac3f8429 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Miroslav Šulc]

commit: d381b561978c8acc70f947d76fbcfcc1dd263db0
Author: Yuan Liao  gmail  com>
AuthorDate: Tue Apr  5 04:45:43 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr  5 04:59:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d381b561

dev-java/stringtemplate: Add 4.3.2

Signed-off-by: Yuan Liao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24914
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |   2 +
 .../stringtemplate/stringtemplate-4.3.2.ebuild | 103 +
 2 files changed, 105 insertions(+)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index a8ee4deb0a40..b44912b51312 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,5 @@
 DIST ST4-4.3.1-sources.jar 198002 BLAKE2B 
d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d
 SHA512 
bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
+DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 
667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc
 SHA512 
7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B 
c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f
 SHA512 
afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
+DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 
0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679
 SHA512 
d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
new file mode 100644
index ..1d0130c2b54f
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -0,0 +1,103 @@
+# 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="org.antlr:ST4:4.3.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="https://www.stringtemplate.org/";
+# Maven Central sources JAR for *.java sources pre-generated from *.g files;
+# the source generation requires antlr-tool-3.5, which depends on this package.
+# Tarball for the test suite and DOCS files
+SRC_URI="
+   https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
+   https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+   dev-java/antlr-runtime:3.5
+"
+
+BDEPEND="
+   app-arch/unzip
+"
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CP_DEPEND}
+   test? (
+   dev-java/antlr-tool:3.5
+   )
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CP_DEPEND}
+"
+
+S="${WORKDIR}"
+TARBALL_S="${S}/${PN}4-${PV}"
+
+JAVA_SRC_DIR="org"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
+JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
+JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
+
+DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
+
+src_prepare() {
+   # Do not call java-pkg_clean; otherwise, it would remove
+   # ${TARBALL_S}/test/test.jar, which is merely used as a
+   # test resource file, does not contain any *.class files,
+   # and is required to pass the tests as of version 4.3.2
+   pushd "${TARBALL_S}" > /dev/null ||
+   die "Failed to enter directory storing tarball contents"
+   eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch"
+   popd > /dev/null ||
+   die "Failed to leave directory storing tarball contents"
+   java-pkg-2_src_prepare
+   # Some of these tests requires a graphical display.
+   rm -v 
"${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || 
die
+}
+
+src_test() {
+   # Make sure no older versions of this slot are present in the classpath
+   # https://bug

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[Miroslav Šulc]

commit: 3fc8eb9e269b59e7c26b76f14ca3236417bdae3c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Mar 17 06:35:50 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 17 08:56:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc8eb9e

dev-java/stringtemplate: Drop 4.0.8-r1

Closes: https://bugs.gentoo.org/742554
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |  2 -
 .../stringtemplate/files/4.0.8-r1-test-fixes.patch | 73 -
 .../files/stringtemplate-4.0.8-fix-tests.patch | 72 -
 .../stringtemplate/stringtemplate-4.0.8-r1.ebuild  | 75 --
 4 files changed, 222 deletions(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 1466c75ff71b..a8ee4deb0a40 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,5 +1,3 @@
 DIST ST4-4.3.1-sources.jar 198002 BLAKE2B 
d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d
 SHA512 
bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B 
d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0
 SHA512 
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 
0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3
 SHA512 
21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B 
c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f
 SHA512 
afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c

diff --git a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch 
b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
deleted file mode 100644
index 0834ccf9bcce..
--- a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
 a/test/org/stringtemplate/v4/test/TestGroups.java  2014-03-25 
11:55:55.0 +
-+++ b/test/org/stringtemplate/v4/test/TestGroups.java  2015-09-13 
11:01:07.999800299 +0100
-@@ -29,6 +29,7 @@
- 
- import org.junit.Assert;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.ST;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
-@@ -527,6 +528,7 @@
-   assertEquals(expected, result);
-   }
- 
-+  @Ignore
-   @Test public void testUnknownNamedArg() throws Exception {
-   String dir = getRandomDir();
-   String groupFile =
 a/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java   
2014-03-25 11:55:55.0 +
-+++ b/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java   
2015-09-13 11:01:05.011850826 +0100
-@@ -28,6 +28,7 @@
- package org.stringtemplate.v4.test;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
- import org.stringtemplate.v4.STGroupFile;
-@@ -36,6 +37,7 @@
- import static org.junit.Assert.assertEquals;
- 
- public class TestGroupSyntaxErrors extends BaseTest {
-+  @Ignore
-   @Test public void testMissingImportString() throws Exception {
-   String templates =
-   "import\n" +
 a/test/org/stringtemplate/v4/test/TestRenderers.java
-+++ b/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -59,7 +59,7 @@ public class TestRenderers extends BaseTest {
-   group.registerRenderer(GregorianCalendar.class, new 
DateRenderer());
-   ST st = group.getInstanceOf("dateThing");
-   st.add("created", new GregorianCalendar(2005, 07-1, 05));
--  String expecting = "datetime: 7/5/05 12:00 AM";
-+  String expecting = "datetime: 7/5/05, 12:00 AM";
-   String result = st.render();
-   assertEquals(expecting, result);
-   }
-@@ -85,7 +85,7 @@ public class TestRend

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

[Sam James]

commit: 56800e459472b4f4c0564357b92155519b0ac2a6
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 17 00:57:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 17 00:57:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56800e45

dev-java/stringtemplate: Stabilize 4.3.1 ppc64, #833953

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index ed368f6c2c6d..96b458d2cc14 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Miroslav Šulc]

commit: 74072f9f3ff905b4683cd482fdf756cb3ea807f8
Author: Yuan Liao  gmail  com>
AuthorDate: Sun Feb 27 05:52:13 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 27 08:11:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74072f9f

dev-java/stringtemplate: Fix 4.3.1 test failure when upgrading slot 4

A test failure (as reported in the linked bug) might occur when an older
version of ST 4 is already installed on the system.  The failure is
caused by multiple factors: the way java-pkg-simple.eclass generates the
test classpath, the fact that the tests launch new JVM instances under a
different working directory, and the behavior of the JVM upon an invalid
path in the classpath.

As of the time when this commit is created, the test classpath computed
by java-pkg-simple.eclass will contain the following elements, in order:
1. The directory containing the test classes compiled by the eclass
2. The path to the JAR built by the eclass **relative to ${S}**
3. Absolute paths to dependency JARs, for both compile and test
   dependencies

ST 4 has an implicit test dependency on itself via ANTLR 3.5 (which is
yet another issue pertaining to the troublesome, malformed ANTLR 3.5 and
ST 4 circular dependency).  This means a version of slot 4 that is
possibly older than 4.3.1 might be installed on the system and added to
the test classpath within element No. 3 when the tests are being run.

Some of the tests will call the 'java' command to execute ST 4 in a new
JVM instance; the test classpath generated by java-pkg-simple.eclass
will be reused in the classpath of the new JVM.  The unfortunate factor
that triggers the test failure is that the new JVM's working directory
can become different from the one of the original JVM running the JUnit
tests, which is ${S} when this package is being built by Portage.

Note that element No. 2 in the test classpath is a relative path: after
the working directory is changed, it will be invalid.  However, JVM is
lax in invalid path elements in the classpath: it will just ignore them
and emit a "class not found" error or alike only after it has tried all
other paths in the classpath to locate a class.

With this behavior, JVM will pick up the copy of ST 4 already installed
on the system from element No. 3 in the classpath after it detects that
element No. 2 is an invalid path.  Therefore, the tests will be run
against ST 4 that is *installed on the system* instead of the copy that
has just been built.

This explains why some tests would fail when an older version of ST 4 is
already installed; effectively, that old version was being tested by the
test suite for the new version, and there is no guarantee that all tests
would pass in this case.  A corollary conclusion is that if the same
version of ST 4 is being built and installed twice, and the second build
has tests enabled, then the tests would pass, although effectively it
would be the artifact produced by the first build being tested against.

Closes: https://bugs.gentoo.org/834138
Signed-off-by: Yuan Liao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24368
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/stringtemplate-4.3.1.ebuild | 23 ++
 1 file changed, 23 insertions(+)

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index 27b01afa316f..ed368f6c2c6d 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -68,6 +68,29 @@ src_prepare() {
rm -v 
"${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || 
die
 }
 
+src_test() {
+   # Make sure no older versions of this slot are present in the classpath
+   # https://bugs.gentoo.org/834138#c4
+   local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
+   local new_test_cp="$(\
+   java-pkg_getjars --with-dependencies 
"${JAVA_TEST_GENTOO_CLASSPATH}")"
+   new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
+
+   # Some of the test cases require an absolute path to the JAR being 
tested
+   # against to be in the classpath, due to the fact that they call the 
'java'
+   # command outside ${S} and reuse the classpath for the tests:
+   # 
https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
+   # 
https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
+   new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
+
+   # Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
+   local JAVA_TEST_GENTOO_CLASSPATH=""
+   [[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
+   JAVA_GENTOO_CLASSPATH_EXTRA+=":"
+   JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
+   java-pkg-simple_src_test
+}
+
 src_install() {
java-pkg-simple_src_install

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

[Sam James]

commit: 8750fdc31e82087a507c706b032eca5039e5
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 25 21:30:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 25 21:30:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8750fdc3

dev-java/stringtemplate: Stabilize 4.3.1 arm64, #833953

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index facb3c26b3c8..27b01afa316f 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Jakov Smolić]

commit: b61da4ec6da7e55019c4fcd05541c944a4535213
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 24 08:46:24 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 24 08:46:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61da4ec

dev-java/stringtemplate: Stabilize 4.3.1 x86, #833953

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

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index 7ac73953ba19..facb3c26b3c8 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

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

[Jakov Smolić]

commit: d94ce475ceadec3fc10594fff7ee65b4c6030bea
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 24 08:46:06 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 24 08:46:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94ce475

dev-java/stringtemplate: Stabilize 4.3.1 amd64, #833953

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

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index 3eb42e302549..7ac73953ba19 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
dev-java/antlr-runtime:3.5

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[Miroslav Šulc]

commit: ee4ae9f475412915941b4c4ed4a479bf528cc5b0
Author: Yuan Liao  gmail  com>
AuthorDate: Thu Jan 20 02:51:31 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jan 25 09:30:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4ae9f4

dev-java/stringtemplate: Add 4.3.1, resolve antlr-3.5 circular dep

stringtemplate-4 requires antlr-3.5 only during the build time to
generate *.java files from src/org/stringtemplate/v4/compiler/*.g files.
This causes the circular dependency issue described by the linked bug
since antlr-3.5 depends on stringtemplate-4.  Fortunately, the sources
JAR for stringtemplate 4.3.1 from Maven Central contains those generated
*.java files (presumably pre-generated by the upstream), so if the Java
sources from that JAR are used, the build-time dependency on antlr-3.5
can be eliminated, finally resolving this chicken-or-egg problem.

Bug: https://bugs.gentoo.org/742554
Signed-off-by: Yuan Liao  gmail.com>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |  2 +
 ...mplate-4.3.1-BaseTest-javac-source-target.patch | 28 
 .../stringtemplate/stringtemplate-4.3.1.ebuild | 74 ++
 3 files changed, 104 insertions(+)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 7b192ce400f9..1466c75ff71b 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,5 @@
+DIST ST4-4.3.1-sources.jar 198002 BLAKE2B 
d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d
 SHA512 
bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B 
d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0
 SHA512 
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 
0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3
 SHA512 
21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
+DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B 
c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f
 SHA512 
afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
 
b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
new file mode 100644
index ..5824425ce35b
--- /dev/null
+++ 
b/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
@@ -0,0 +1,28 @@
+From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+Date: Mon, 24 Jan 2022 06:17:03 -0800
+Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
+
+JDK 17 no longer supports 1.6 as the source or target version.
+
+Signed-off-by: Yuan Liao 
+---
+ test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/org/stringtemplate/v4/test/BaseTest.java 
b/test/org/stringtemplate/v4/test/BaseTest.java
+index 536d686..74a3949 100644
+--- a/test/org/stringtemplate/v4/test/BaseTest.java
 b/test/org/stringtemplate/v4/test/BaseTest.java
+@@ -258,7 +258,7 @@ public abstract class BaseTest {
+ fileManager.getJavaFileObjectsFromFiles(files);
+ 
+ Iterable compileOptions =
+-Arrays.asList("-g", "-source", "1.6", "-target", "1.6", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
++Arrays.asList("-g", "-source", "1.8", "-target", "1.8", 
"-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", 
workingDirName+pathSep+CLASSPATH);
+ 
+ JavaCompiler.CompilationTask task =
+ compiler.getTask(null, fileManager, null, compileOptions, null,
+-- 
+2.34.1
+

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
new file mode 100644
index ..3eb42e302549
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -0,0 +1

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

[Sam James]

commit: ad9135707796e3f69884ed857c7bed6c1fa61dc7
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 23 21:36:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 23 21:36:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad913570

dev-java/stringtemplate: Stabilize 3.2.1-r2 arm64, #826766

Signed-off-by: Sam James  gentoo.org>

 dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index e3e792562312..98af25ad8df1 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml

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

[Miroslav Šulc]

commit: c0fa7cf02179c972ea0ae279cc1670f2a4427c1f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Aug 25 14:35:20 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug 26 06:17:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa7cf0

dev-java/stringtemplate: remove unused patch

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22098
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/files/3.2.1-test-fixes.patch| 53 --
 1 file changed, 53 deletions(-)

diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch 
b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
deleted file mode 100644
index fd625abd066..000
--- a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/antlr/stringtemplate3/pull/3
-
 test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig
2015-09-18 22:04:18.131902875 +0100
-+++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 
22:04:21.651848456 +0100
-@@ -36,6 +36,10 @@
- import java.text.SimpleDateFormat;
- import java.util.*;
- 
-+import org.junit.FixMethodOrder;
-+import org.junit.runners.MethodSorters;
-+
-+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
- public class TestStringTemplate extends TestCase {
- static final String newline = System.getProperty("line.separator");
- 
-@@ -87,7 +91,7 @@
-   assertEquals(expecting,I.toString());
-   }
- 
--  public void testNoGroupLoader() throws Exception {
-+  public void testAaaNoGroupLoader() throws Exception {
-   // this also tests the group loader
-   StringTemplateErrorListener errors = new ErrorBuffer();
-   String tmpdir = System.getProperty("java.io.tmpdir");
-@@ -2214,8 +2218,12 @@
-   s.add("2");
-   s.add("3");
-   st.setAttribute("items", s);
--  expecting = "321";
--  assertEquals(expecting, st.toString());
-+  String[] split = st.toString().split("(){1,2}");
-+  Arrays.sort(split);
-+  assertEquals("",  split[0]);
-+  assertEquals("1", split[1]);
-+  assertEquals("2", split[2]);
-+  assertEquals("3", split[3]);
-   }
- 
-   public void testDumpMapAndSet() throws Exception {
-@@ -2235,8 +2243,11 @@
-   s.add("2");
-   s.add("3");
-   st.setAttribute("items", s);
--  expecting = "3,2,1";
--  assertEquals(expecting, st.toString());
-+  String[] split = st.toString().split(",");
-+  Arrays.sort(split);
-+  assertEquals("1", split[0]);
-+  assertEquals("2", split[1]);
-+  assertEquals("3", split[2]);
-   }
- 
-   public class Connector3 {

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

[Miroslav Šulc]

commit: 3645e67f7f859bcae2489da898bd758bbadf4cca
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jun 11 12:17:25 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Aug  6 05:49:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3645e67f

dev-java/stringtemplate: remove obsolete 3.2.1-r1

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/21018/commits/d84c8819d8e6a3635543a361d4254578c570d45e
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/stringtemplate-3.2.1-r1.ebuild  | 62 --
 1 file changed, 62 deletions(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
deleted file mode 100644
index 9b357c47389..000
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/";
-SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-RDEPEND="${CDEPEND}
-   >=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-   >=virtual/jdk-1.6
-   test? ( >=dev-java/junit-4.11:4 )"
-
-S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="antlr"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-   # https://github.com/antlr/stringtemplate3/pull/3
-   epatch "${FILESDIR}/${PV}-test-fixes.patch"
-
-   java-pkg_clean
-}
-
-src_compile() {
-   local G; for G in action template angle.bracket.template eval group 
interface; do # from build.xml
-   antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
-   done
-
-   java-pkg-simple_src_compile
-}
-
-src_install() {
-   java-pkg-simple_src_install
-   dodoc {CHANGES,README}.txt
-}
-
-src_test() {
-   cd test || die
-   local CP=".:${S}/${PN}.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}
-}

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

[Agostino Sarubbo]

commit: dd333efcbfc2403d6b94422c895c47be88fc6be1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 11 08:56:04 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 11 08:56:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd333efc

dev-java/stringtemplate: x86 stable wrt bug #795153

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index 8e03a6accb3..e3e79256231 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml

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

[Agostino Sarubbo]

commit: 91b606ff10f6fa8332b93d6094daee7f83d9c230
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 11 08:55:20 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 11 08:55:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b606ff

dev-java/stringtemplate: ppc64 stable wrt bug #795153

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index 1e765c64c6c..8e03a6accb3 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml

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

[Agostino Sarubbo]

commit: 0b6187860665be369c61b633be9c75045d18025d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun 11 08:50:22 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun 11 08:50:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b618786

dev-java/stringtemplate: amd64 stable wrt bug #795153

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index 5ad6b886170..1e765c64c6c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[Miroslav Šulc]

commit: 2419e959eba7ba4945452325216df3ce7c0b1bf7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat May 29 15:58:15 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat May 29 15:58:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2419e959

dev-java/strimgtemplate: fixed tests in 4.0.8-r1

Closes: https://bugs.gentoo.org/791718
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/stringtemplate-4.0.8-fix-tests.patch | 72 ++
 .../stringtemplate/stringtemplate-4.0.8-r1.ebuild  |  1 +
 2 files changed, 73 insertions(+)

diff --git a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch 
b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
new file mode 100644
index 000..994fd42ad5e
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
@@ -0,0 +1,72 @@
+From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
+From: parrt 
+Date: Thu, 8 Nov 2018 11:40:24 -0800
+Subject: [PATCH] make tests work with java 10 and 6, 7, 8
+
+---
+ .../stringtemplate/v4/test/TestRenderers.java | 24 +++
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/test/org/stringtemplate/v4/test/TestRenderers.java 
b/test/org/stringtemplate/v4/test/TestRenderers.java
+index bc5406f7..7b7536e0 100644
+--- a/test/org/stringtemplate/v4/test/TestRenderers.java
 b/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -48,6 +48,8 @@
+ 
+ public class TestRenderers extends BaseTest {
+ 
++  String javaVersion = System.getProperty("java.version");
++
+   // Make sure to use the US Locale during the tests
+   private Locale origLocale;
+ 
+@@ -73,6 +75,9 @@ public void tearDown() {
+   ST st = group.getInstanceOf("dateThing");
+   st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+   String expecting = "datetime: 7/5/05, 12:00 AM";
++  if ( javaVersion.startsWith("1.6") || 
javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++  expecting = "datetime: 7/5/05 12:00 AM";
++  }
+   String result = st.render();
+   assertEquals(expecting, result);
+   }
+@@ -99,7 +104,10 @@ public void tearDown() {
+ ST st = group.getInstanceOf("dateThing");
+ st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+ String expecting = " datetime: 7/5/05, 12:00 AM ";
+-String result = st.render();
++  if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") 
|| javaVersion.startsWith("1.8") ) {
++  expecting = " datetime: 7/5/05 12:00 AM ";
++  }
++  String result = st.render();
+ assertEquals(expecting, result);
+ }
+ 
+@@ -116,9 +124,13 @@ public void tearDown() {
+   
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+   st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+   String expecting = " datetime: Tuesday, July 5, 2005 at 
12:00:00 AM Pacific Daylight Time ";
+-  String result = st.render();
++  if ( javaVersion.startsWith("1.6") || 
javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++  expecting = " datetime: Tuesday, July 5, 2005 12:00:00 
AM PDT ";
++  }
++  String result = st.render();
+   assertEquals(expecting, result);
+-} finally {
++}
++finally {
+   // Restore original Timezone
+   TimeZone.setDefault(origTimeZone);
+ }
+@@ -371,6 +383,10 @@ public void tearDown() {
+   cal.set(2012, Calendar.JUNE, 12);
+   st.add("date", cal);
+ 
+-  assertEquals("12 de junho de 2012", st.render(new 
Locale("pt")));
++  String expected = "12 de junho de 2012";
++  if ( javaVersion.startsWith("1.6") || 
javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
++  expected = "12 de Junho de 2012";
++  }
++  assertEquals(expected, st.render(new Locale("pt")));
+   }
+ }

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
index c2fba7061b0..72831a73fdb 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
@@ -37,6 +37,7 @@ JAVA_SRC_DIR="src"
 PATCHES=(
# These tests are broken but are probably fixed in current master.
"${FILESDIR}/4.0.8-r1-test-fixes.patch"
+   "${FILESDIR}/${P}-fix-tests.patch"
 )
 
 src_unpack() {

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

[Miroslav Šulc]

commit: 612b91fe096ca3a643004727135a56ae029e7cac
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 26 08:30:19 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 27 08:05:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612b91fe

dev-java/stringtemplate: EAPI 7, min java 1.8 (slot 0)

also fix unavailable SRC_URI

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/20991
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/stringtemplate/Manifest   |  2 +-
 .../stringtemplate/stringtemplate-3.2.1-r2.ebuild  | 59 ++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 12164f0f86e..7b192ce400f 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,3 @@
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B 
d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0
 SHA512 
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
-DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 
6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c
 SHA512 
fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
+DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B 
e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435
 SHA512 
76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 
0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3
 SHA512 
21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
new file mode 100644
index 000..5ad6b886170
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz
 --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild 
stringtemplate-3.2.1-r2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.antlr:stringtemplate:3.2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
+DESCRIPTION="A Java template engine"
+HOMEPAGE="https://www.stringtemplate.org/";
+SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# antlr:antlr:2.7.7 -> >=dev-java/antlr-2.7.7:0
+
+CDEPEND="
+   dev-java/antlr:0
+"
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}
+"
+
+DOCS=( {CHANGES,README}.txt )
+
+S="${WORKDIR}/${PN}3-${MY_COMMIT}"
+
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
+JAVA_TEST_RESOURCE_DIRS="test"
+
+src_compile() {
+   local G; for G in action template angle.bracket.template eval group 
interface; do # from build.xml
+   antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+   done
+
+   java-pkg-simple_src_compile
+}

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

[Miroslav Šulc]

commit: 43ef1fcc34f28ffe540618dc4a8e89ae18ad6557
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun May 23 14:50:48 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon May 24 06:37:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ef1fcc

dev-java/stringtemplate: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20950
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/files/4.0.8-test-fixes.patch| 38 --
 1 file changed, 38 deletions(-)

diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch 
b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
deleted file mode 100644
index 9480abe3ed3..000
--- a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java 
test/org/stringtemplate/v4/test/TestGroups.java
 test.orig/org/stringtemplate/v4/test/TestGroups.java   2014-03-25 
11:55:55.0 +
-+++ test/org/stringtemplate/v4/test/TestGroups.java2015-09-13 
11:01:07.999800299 +0100
-@@ -29,6 +29,7 @@
- 
- import org.junit.Assert;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.ST;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
-@@ -527,6 +528,7 @@
-   assertEquals(expected, result);
-   }
- 
-+  @Ignore
-   @Test public void testUnknownNamedArg() throws Exception {
-   String dir = getRandomDir();
-   String groupFile =
-diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 
test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
 test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
2014-03-25 11:55:55.0 +
-+++ test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2015-09-13 
11:01:05.011850826 +0100
-@@ -28,6 +28,7 @@
- package org.stringtemplate.v4.test;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.stringtemplate.v4.STErrorListener;
- import org.stringtemplate.v4.STGroup;
- import org.stringtemplate.v4.STGroupFile;
-@@ -36,6 +37,7 @@
- import static org.junit.Assert.assertEquals;
- 
- public class TestGroupSyntaxErrors extends BaseTest {
-+  @Ignore
-   @Test public void testMissingImportString() throws Exception {
-   String templates =
-   "import\n" +

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[Miroslav Šulc]

commit: 0c02779c69d493fceacb37797e865377bc71e406
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri May 21 09:56:04 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat May 22 09:01:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c02779c

dev-java/stringtemplate: (slot :4) min java 1.8

Problem described in https://bugs.gentoo.org/742554#c4 persists

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/20907
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/files/4.0.8-r1-test-fixes.patch | 73 +
 .../stringtemplate/stringtemplate-4.0.8-r1.ebuild  | 74 ++
 2 files changed, 147 insertions(+)

diff --git a/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch 
b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
new file mode 100644
index 000..0834ccf9bcc
--- /dev/null
+++ b/dev-java/stringtemplate/files/4.0.8-r1-test-fixes.patch
@@ -0,0 +1,73 @@
+--- a/test/org/stringtemplate/v4/test/TestGroups.java  2014-03-25 
11:55:55.0 +
 b/test/org/stringtemplate/v4/test/TestGroups.java  2015-09-13 
11:01:07.999800299 +0100
+@@ -29,6 +29,7 @@
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.ST;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+@@ -527,6 +528,7 @@
+   assertEquals(expected, result);
+   }
+ 
++  @Ignore
+   @Test public void testUnknownNamedArg() throws Exception {
+   String dir = getRandomDir();
+   String groupFile =
+--- a/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java   
2014-03-25 11:55:55.0 +
 b/test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java   
2015-09-13 11:01:05.011850826 +0100
+@@ -28,6 +28,7 @@
+ package org.stringtemplate.v4.test;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+ import org.stringtemplate.v4.STGroupFile;
+@@ -36,6 +37,7 @@
+ import static org.junit.Assert.assertEquals;
+ 
+ public class TestGroupSyntaxErrors extends BaseTest {
++  @Ignore
+   @Test public void testMissingImportString() throws Exception {
+   String templates =
+   "import\n" +
+--- a/test/org/stringtemplate/v4/test/TestRenderers.java
 b/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -59,7 +59,7 @@ public class TestRenderers extends BaseTest {
+   group.registerRenderer(GregorianCalendar.class, new 
DateRenderer());
+   ST st = group.getInstanceOf("dateThing");
+   st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-  String expecting = "datetime: 7/5/05 12:00 AM";
++  String expecting = "datetime: 7/5/05, 12:00 AM";
+   String result = st.render();
+   assertEquals(expecting, result);
+   }
+@@ -85,7 +85,7 @@ public class TestRenderers extends BaseTest {
+ group.registerRenderer(GregorianCalendar.class, new DateRenderer());
+ ST st = group.getInstanceOf("dateThing");
+ st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-String expecting = " datetime: 7/5/05 12:00 AM ";
++String expecting = " datetime: 7/5/05, 12:00 AM ";
+ String result = st.render();
+ assertEquals(expecting, result);
+ }
+@@ -102,7 +102,7 @@ public class TestRenderers extends BaseTest {
+   // set Timezone to "PDT"
+   
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+   st.add("created", new GregorianCalendar(2005, 07-1, 05));
+-  String expecting = " datetime: Tuesday, July 5, 2005 12:00:00 
AM PDT ";
++  String expecting = " datetime: Tuesday, July 5, 2005 at 
12:00:00 AM Pacific Daylight Time ";
+   String result = st.render();
+   assertEquals(expecting, result);
+ } finally {
+@@ -358,6 +358,6 @@ public class TestRenderers extends BaseTest {
+   cal.set(2012, Calendar.JUNE, 12);
+   st.add("date", cal);
+ 
+-  assertEquals("12 de Junho de 2012", st.render(new 
Locale("pt")));
++  assertEquals("12 de junho de 2012", st.render(new 
Locale("pt")));
+   }
+ }

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
new file mode 100644
index 000..c2fba7061b0
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANTLR3="3.5.2"
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 ja

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

[Miroslav Šulc]

commit: d8b4aaa1c7f422a36a20010fa637dbdce874cb12
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat May 22 09:00:45 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat May 22 09:01:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b4aaa1

dev-java/stringtemplate: removed obsolete 4.0.8

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../stringtemplate/stringtemplate-4.0.8.ebuild | 71 --
 1 file changed, 71 deletions(-)

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
deleted file mode 100644
index 30f96503ef2..000
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ANTLR3="3.5.2"
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/";
-SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-   http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar";
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-   test? ( dev-java/junit:4 )"
-
-# StringTemplate has a cyclic dependency on ANTLR 3. The runtime classes
-# are needed at build time and runtime and the tool is also needed at
-# build time. To break out of this, we use a prebuilt copy of ANTLR 3 at
-# build time and manually register a dependency on the package, which
-# will be present at runtime thanks to this PDEPEND. No prebuilt
-# software is actually installed onto the system.
-PDEPEND=">=dev-java/antlr-${ANTLR3}:3.5"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/antlr-${ANTLR3}-complete.jar"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-   unpack ${P}.tar.gz
-}
-
-java_prepare() {
-   # These tests are broken but are probably fixed in current master.
-   epatch "${FILESDIR}/${PV}-test-fixes.patch"
-
-   # Some of these tests requires a graphical display.
-   rm -v test/org/stringtemplate/v4/test/TestEarlyEvaluation.java || die
-}
-
-src_compile() {
-   java -jar "${JAVA_GENTOO_CLASSPATH_EXTRA}" -lib 
${JAVA_SRC_DIR}/org/stringtemplate/v4/compiler $(find ${JAVA_SRC_DIR} -name 
"*.g") || die
-   java-pkg-simple_src_compile
-}
-
-src_install() {
-   java-pkg-simple_src_install
-   java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
-   dodoc {CHANGES,contributors,README}.txt
-}
-
-src_test() {
-   cd test || die
-   local CP=".:${S}/${PN}.jar:$(java-pkg_getjars 
junit-4):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-   local TESTS=$(find * -name "Test*.java")
-   TESTS="${TESTS//.java}"
-   TESTS="${TESTS//\//.}"
-
-   ejavac -classpath "${CP}" $(find -name "*.java")
-   ejunit4 -classpath "${CP}" ${TESTS}
-}

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

[Sam James]

commit: 8e93292c1ecf0f5253bd221a8fd1543319969eef
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 20 01:09:07 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 20 01:09:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e93292c

dev-java/stringtemplate: arm64 keyworded (bug #720116)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index f15d93c44e9..c29b32ef39e 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz 
-> ${P}.tar.gz
http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar";
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

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

[Alexis Ballier]

commit: d580955cd97ec9f88ae6e69fd188921fe9fd7403
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul 13 12:10:49 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul 13 12:13:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d580955c

dev-java/stringtemplate: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

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

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 1c765b5393b..22164ff6a6e 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.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"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.stringtemplate.org/";
 SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0"

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

[James Le Cuirot]

commit: 706a9d085f03b80119fe9c3299057ba7c62c6c6e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Oct  7 20:33:03 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Oct  7 20:55:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706a9d08

dev-java/stringtemplate: 4.0.8 stable on amd64, ppc64, x86 (ALLARCHES)

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 183a91c..9d91123 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz 
-> ${P}.tar.gz
http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar";
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[James Le Cuirot]

commit: cedf2f14fcc773034aa4eaa02360d85f231069b4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 20:29:08 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 14 21:42:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cedf2f14

dev-java/stringtemplate: Remove old

Package-Manager: portage-2.2.26

 dev-java/stringtemplate/Manifest   |  1 -
 .../files/stringtemplate-3.1_beta1-javadoc.patch   | 19 
 dev-java/stringtemplate/stringtemplate-3.2.ebuild  | 54 --
 3 files changed, 74 deletions(-)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 8c8cf12..f5234a3 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,4 +1,3 @@
 DIST antlr-3.5.2-complete.jar 2456317 SHA256 
26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 WHIRLPOOL 
bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 
3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 
fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
 WHIRLPOOL 
be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
-DIST stringtemplate-3.2.tar.gz 741708 SHA256 
de85449fca6c11bf2efff73fa2c852ccf84b0db1e129a6948748659952f6825e SHA512 
23b657fe15fd37ccbacea3f8d7ab4ef4a7870b6bafed73cfb2ffb44b3d8ee1f473aa57d39f864017d74c97f4ee431d776eaf0439065c6d1b94d4d5a2fec5d226
 WHIRLPOOL 
eff58073d8c4773fb75dfa25fb76b5973297dd329c451c1fda1f1d53f3e620119382ffe3986e5b941473b4089807cfc7807bb17545c66dc9d4cfa6575ccc9446
 DIST stringtemplate-4.0.8.tar.gz 147305 SHA256 
07013e36d16968b514092b1e33cbe53f811a70a12c96e2e56c2e97a4304431df SHA512 
21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 WHIRLPOOL 
61562310995301cd005eb6a553f973304e166bca0b10d59a7d0877d73599a3bd26a2abf4cc7cb0ff98b61a1ef869c08f2d6933833217cac67f92d992a9a6d53d

diff --git 
a/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch 
b/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
deleted file mode 100644
index c4fbbf1..000
--- a/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 build.xml  2007-05-25 23:07:06.0 +0200
-+++ build.xml  2007-05-25 23:07:31.0 +0200
-@@ -189,7 +189,7 @@
-   
-   
- 
--
-   
- 

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.ebuild
deleted file mode 100644
index 7ff3a23..000
--- a/dev-java/stringtemplate/stringtemplate-3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-antlr"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-S_PV="${PV/_beta/.b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/";
-SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz";
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-# no junit targets in build.xml, but unconditional compile and jar of test
-# classes, oh well
-COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]
-   dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-   ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${S_PV}"
-
-java_prepare() {
-   # fix  call
-   epatch "${FILESDIR}/${PN}-3.1_beta1-javadoc.patch"
-   java-ant_rewrite-classpath
-   rm -v lib/*.jar || die
-   # force regeneration with our antlr2
-   touch src/org/antlr/stringtemplate/language/*.g || die
-}
-
-EANT_GENTOO_CLASSPATH="antlr,junit"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-   java-pkg_dojar build/${PN}.jar
-
-   dodoc README.txt CHANGES.txt || die
-   use doc && java-pkg_dojavadoc docs/api
-   use source && java-pkg_dosrc src/org
-}

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

[James Le Cuirot]

commit: 15a7e6d317e85e4047b2567427292fc394950af9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 20:28:07 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 14 21:42:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a7e6d3

dev-java/stringtemplate: Mark 3.2.1-r1 stable using ALLARCHES policy

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 1179a5b..f2df14f 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.stringtemplate.org/";
 SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0"

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/

[James Le Cuirot]

commit: 49d428bd9fecbd5138782e8e74edda2d4be43f45
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec  5 23:24:18 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec  5 23:41:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d428bd

dev-java/stringtemplate: Version bump into new SLOT 4 (fixes #417895)

This is needed by newer versions of ANTLR.

Package-Manager: portage-2.2.26

 dev-java/stringtemplate/Manifest   |  2 +
 .../stringtemplate/files/4.0.8-test-fixes.patch| 38 
 .../stringtemplate/stringtemplate-4.0.8.ebuild | 71 ++
 3 files changed, 111 insertions(+)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index a2f7a94..8c8cf12 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,2 +1,4 @@
+DIST antlr-3.5.2-complete.jar 2456317 SHA256 
26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 
560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 WHIRLPOOL 
bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 
3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 
fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
 WHIRLPOOL 
be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
 DIST stringtemplate-3.2.tar.gz 741708 SHA256 
de85449fca6c11bf2efff73fa2c852ccf84b0db1e129a6948748659952f6825e SHA512 
23b657fe15fd37ccbacea3f8d7ab4ef4a7870b6bafed73cfb2ffb44b3d8ee1f473aa57d39f864017d74c97f4ee431d776eaf0439065c6d1b94d4d5a2fec5d226
 WHIRLPOOL 
eff58073d8c4773fb75dfa25fb76b5973297dd329c451c1fda1f1d53f3e620119382ffe3986e5b941473b4089807cfc7807bb17545c66dc9d4cfa6575ccc9446
+DIST stringtemplate-4.0.8.tar.gz 147305 SHA256 
07013e36d16968b514092b1e33cbe53f811a70a12c96e2e56c2e97a4304431df SHA512 
21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
 WHIRLPOOL 
61562310995301cd005eb6a553f973304e166bca0b10d59a7d0877d73599a3bd26a2abf4cc7cb0ff98b61a1ef869c08f2d6933833217cac67f92d992a9a6d53d

diff --git a/dev-java/stringtemplate/files/4.0.8-test-fixes.patch 
b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
new file mode 100644
index 000..9480abe
--- /dev/null
+++ b/dev-java/stringtemplate/files/4.0.8-test-fixes.patch
@@ -0,0 +1,38 @@
+diff -Naur test.orig/org/stringtemplate/v4/test/TestGroups.java 
test/org/stringtemplate/v4/test/TestGroups.java
+--- test.orig/org/stringtemplate/v4/test/TestGroups.java   2014-03-25 
11:55:55.0 +
 test/org/stringtemplate/v4/test/TestGroups.java2015-09-13 
11:01:07.999800299 +0100
+@@ -29,6 +29,7 @@
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.ST;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+@@ -527,6 +528,7 @@
+   assertEquals(expected, result);
+   }
+ 
++  @Ignore
+   @Test public void testUnknownNamedArg() throws Exception {
+   String dir = getRandomDir();
+   String groupFile =
+diff -Naur test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 
test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
+--- test.orig/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java
2014-03-25 11:55:55.0 +
 test/org/stringtemplate/v4/test/TestGroupSyntaxErrors.java 2015-09-13 
11:01:05.011850826 +0100
+@@ -28,6 +28,7 @@
+ package org.stringtemplate.v4.test;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.STErrorListener;
+ import org.stringtemplate.v4.STGroup;
+ import org.stringtemplate.v4.STGroupFile;
+@@ -36,6 +37,7 @@
+ import static org.junit.Assert.assertEquals;
+ 
+ public class TestGroupSyntaxErrors extends BaseTest {
++  @Ignore
+   @Test public void testMissingImportString() throws Exception {
+   String templates =
+   "import\n" +

diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild 
b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
new file mode 100644
index 000..e36b97f
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANTLR3="3.5.2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/";
+SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.

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

[James Le Cuirot]

commit: 9667c9c0eb73ef104a6b4251ca76eaa72a68aa78
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec  4 23:00:20 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec  4 23:01:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9667c9c0

dev-java/stringtemplate: Remove old

Package-Manager: portage-2.2.26

 .../stringtemplate/stringtemplate-3.2.1.ebuild | 79 --
 1 file changed, 79 deletions(-)

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
deleted file mode 100644
index 130dbca..000
--- a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-S_PV="${PV/_beta/.b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/";
-SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz";
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]"
-
-RDEPEND=">=virtual/jre-1.5
-   ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-   test? ( dev-java/junit:4 )
-   ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${S_PV}"
-
-java_prepare() {
-   find . -name "*.class" -print -delete || die "Failed deleting 
precompiled classes"
-   find . -name "*.jar" -print -delete || die "Failed deleting prebuilt 
classes"
-}
-
-antlr2() {
-   java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 
failed"
-}
-
-src_compile() {
-   einfo "Generate from grammars"
-   cd src/org/antlr/stringtemplate/language || die
-   # order same as in pom.xml
-   antlr2 template.g
-   antlr2 angle.bracket.template.g
-   antlr2 action.g
-   antlr2 eval.g
-   antlr2 group.g
-   antlr2 interface.g
-
-   cd "${S}" || die
-   find src -name "*.java" >> "${T}/sources" || die
-   ejavac -d target/classes -cp $(java-pkg_getjars antlr) "@${T}/sources"
-
-   # create javadoc
-   if use doc; then
-   javadoc -classpath $(java-pkg_getjars antlr) -d javadoc 
"@${T}/sources" || die "Javadoc failed"
-   fi
-
-   # jar things up
-   cd target/classes || die
-   find -type f >> "${T}/classes" || die
-   jar cf ${PN}.jar "@${T}/classes" || die "jar failed"
-}
-
-src_install() {
-   java-pkg_dojar target/classes/${PN}.jar
-   dodoc README.txt CHANGES.txt || die
-   use source && java-pkg_dosrc src/*
-   use doc && java-pkg_dojavadoc javadoc
-}
-
-src_test() {
-   find test -name "*.java" >> "${T}/test-sources" || die
-   ejavac -cp target/classes:$(java-pkg_getjars antlr,junit-4) -d 
target/test-classes "@${T}/test-sources"
-   ejunit4 -cp target/classes:target/test-classes 
org.antlr.stringtemplate.test.TestStringTemplate
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/

[James Le Cuirot]

commit: 3a57ade8bf9d44d13317237dcc8345eb522e80b4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec  4 22:57:32 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec  4 23:01:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a57ade8

dev-java/stringtemplate: Rewrite, EAPI bump, test fixes wrt bug #405057

Package-Manager: portage-2.2.26

 .../stringtemplate/files/3.2.1-test-fixes.patch| 53 ++
 .../stringtemplate/stringtemplate-3.2.1-r1.ebuild  | 62 ++
 2 files changed, 115 insertions(+)

diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch 
b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
new file mode 100644
index 000..fd625ab
--- /dev/null
+++ b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
@@ -0,0 +1,53 @@
+https://github.com/antlr/stringtemplate3/pull/3
+
+--- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig
2015-09-18 22:04:18.131902875 +0100
 test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 
22:04:21.651848456 +0100
+@@ -36,6 +36,10 @@
+ import java.text.SimpleDateFormat;
+ import java.util.*;
+ 
++import org.junit.FixMethodOrder;
++import org.junit.runners.MethodSorters;
++
++@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+ public class TestStringTemplate extends TestCase {
+ static final String newline = System.getProperty("line.separator");
+ 
+@@ -87,7 +91,7 @@
+   assertEquals(expecting,I.toString());
+   }
+ 
+-  public void testNoGroupLoader() throws Exception {
++  public void testAaaNoGroupLoader() throws Exception {
+   // this also tests the group loader
+   StringTemplateErrorListener errors = new ErrorBuffer();
+   String tmpdir = System.getProperty("java.io.tmpdir");
+@@ -2214,8 +2218,12 @@
+   s.add("2");
+   s.add("3");
+   st.setAttribute("items", s);
+-  expecting = "321";
+-  assertEquals(expecting, st.toString());
++  String[] split = st.toString().split("(){1,2}");
++  Arrays.sort(split);
++  assertEquals("",  split[0]);
++  assertEquals("1", split[1]);
++  assertEquals("2", split[2]);
++  assertEquals("3", split[3]);
+   }
+ 
+   public void testDumpMapAndSet() throws Exception {
+@@ -2235,8 +2243,11 @@
+   s.add("2");
+   s.add("3");
+   st.setAttribute("items", s);
+-  expecting = "3,2,1";
+-  assertEquals(expecting, st.toString());
++  String[] split = st.toString().split(",");
++  Arrays.sort(split);
++  assertEquals("1", split[0]);
++  assertEquals("2", split[1]);
++  assertEquals("3", split[2]);
+   }
+ 
+   public class Connector3 {

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild 
b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
new file mode 100644
index 000..1179a5b
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/";
+SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+RDEPEND="${CDEPEND}
+   >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.6
+   test? ( >=dev-java/junit-4.11:4 )"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+   # https://github.com/antlr/stringtemplate3/pull/3
+   epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+   java-pkg_clean
+}
+
+src_compile() {
+   local G; for G in action template angle.bracket.template eval group 
interface; do # from build.xml
+   antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+   done
+
+   java-pkg-simple_src_compile
+}
+
+src_install() {
+   java-pkg-simple_src_install
+   dodoc {CHANGES,README}.txt
+}
+
+src_test() {
+   cd test || die
+   local CP=".:${S}/${PN}.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}
+}