* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2015-12-04 23:01 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2015-12-04 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 3a57ade8bf9d44d13317237dcc8345eb522e80b4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 22:57:32 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 23:01:38 2015 +0000
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 0000000..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 = "<li>3</li><li>2</li><li>1</li>";
+- assertEquals(expecting, st.toString());
++ String[] split = st.toString().split("(</?li>){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 0000000..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}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2021-05-29 15:58 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-05-29 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 2419e959eba7ba4945452325216df3ce7c0b1bf7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 15:58:15 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 29 15:58:33 2021 +0000
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 <fordfrog <AT> 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 00000000000..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 <parrt@cs.usfca.edu>
+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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2022-01-25 9:30 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2022-01-25 9:30 UTC (permalink / raw
To: gentoo-commits
commit: ee4ae9f475412915941b4c4ed4a479bf528cc5b0
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Jan 20 02:51:31 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 09:30:03 2022 +0000
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 <liaoyuan <AT> gmail.com>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 000000000000..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 <liaoyuan@gmail.com>
+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 <liaoyuan@gmail.com>
+---
+ 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<String> 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 000000000000..3eb42e302549
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -0,0 +1,74 @@
+# 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_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2022-03-17 8:56 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2022-03-17 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 3fc8eb9e269b59e7c26b76f14ca3236417bdae3c
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 17 06:35:50 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 08:56:28 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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..000000000000
--- 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.000000000 +0000
-+++ 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.000000000 +0000
-+++ 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/files/stringtemplate-4.0.8-fix-tests.patch b/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
deleted file mode 100644
index 994fd42ad5e6..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.0.8-fix-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3ea94a870b6e139399abbf932da1dfa2f9bd37e3 Mon Sep 17 00:00:00 2001
-From: parrt <parrt@cs.usfca.edu>
-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
deleted file mode 100644
index 72831a73fdbb..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 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
- https://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"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-# 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"
-
-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() {
- unpack ${P}.tar.gz
-}
-
-src_prepare() {
- default
-
- # 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_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}
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_register-dependency antlr-3.5 antlr-runtime.jar
- dodoc {CHANGES,contributors,README}.txt
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2023-12-08 10:39 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2023-12-08 10:39 UTC (permalink / raw
To: gentoo-commits
commit: e8b8f7b9856b2b3899c723ef020d6ff9c0c566f4
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Oct 31 13:58:06 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 10:38:57 2023 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 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 000000000000..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/antlr-2.7.7:0
-
-CDEPEND="
- dev-java/antlr:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
+CP_DEPEND="dev-java/antlr:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
DOCS=( {CHANGES,README}.txt )
+PATCHES=(
+ "${DISTDIR}/stringtemplate-${DEB}-java21-compatibility.patch"
+ "${FILESDIR}/stringtemplate-3.2.1-TestStringTemplate.patch"
+)
-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_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/
@ 2024-07-26 9:34 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-07-26 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 8fc319802f811bfc774024d7cf46d3a6815aabde
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:33:47 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 09:33:47 2024 +0000
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 <fordfrog <AT> 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}")"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-26 9:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 9:30 [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-07-26 9:34 Miroslav Šulc
2023-12-08 10:39 Miroslav Šulc
2022-03-17 8:56 Miroslav Šulc
2021-05-29 15:58 Miroslav Šulc
2015-12-04 23:01 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox