diff options
author | Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2022-03-17 07:35:50 +0100 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2022-03-17 09:56:28 +0100 |
commit | 3fc8eb9e269b59e7c26b76f14ca3236417bdae3c (patch) | |
tree | 2e4a1a7e6c2e88c0efee695949805f2c995b78c9 /dev-java | |
parent | dev-java/antlr: Drop 3.5.2-r1, 4.5.1 and 4.5.3-r1 (diff) | |
download | gentoo-3fc8eb9e269b59e7c26b76f14ca3236417bdae3c.tar.gz gentoo-3fc8eb9e269b59e7c26b76f14ca3236417bdae3c.tar.bz2 gentoo-3fc8eb9e269b59e7c26b76f14ca3236417bdae3c.zip |
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@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
4 files changed, 0 insertions, 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 -} |