public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/
@ 2015-12-05 23:41 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2015-12-05 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     49d428bd9fecbd5138782e8e74edda2d4be43f45
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  5 23:24:18 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec  5 23:41:24 2015 +0000
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 0000000..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.000000000 +0000
++++ 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 =
+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.000000000 +0000
++++ 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 0000000..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}.tar.gz
+	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="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}
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/
@ 2016-01-14 21:44 James Le Cuirot
  0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-01-14 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cedf2f14fcc773034aa4eaa02360d85f231069b4
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 20:29:08 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
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..0000000
--- 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.000000000 +0200
-+++ build.xml	2007-05-25 23:07:31.000000000 +0200
-@@ -189,7 +189,7 @@
-   <!-- =================================================================== -->
-   <target name="javadocs" depends="init,prepare-sources">
-     <mkdir dir="${build.javadocs}"/>
--    <javadoc packagenames="${packages}"
-+    <javadoc
-       sourcepath="${build.src}"
-       destdir="${build.javadocs}"
-       author="true"
-@@ -197,7 +197,6 @@
-       windowtitle="${Name} API"
-       doctitle="${Name} API Documentation"
-       bottom="Copyright &#169; ${copyright}"
--      additionalparam="${javadocs.additionalparam}"
-       />
-   </target>
- 

diff --git a/dev-java/stringtemplate/stringtemplate-3.2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.ebuild
deleted file mode 100644
index 7ff3a23..0000000
--- 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 <javadoc> 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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/
@ 2021-05-22  9:01 Miroslav Šulc
  0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-05-22  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     0c02779c69d493fceacb37797e865377bc71e406
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 21 09:56:04 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 22 09:01:04 2021 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20907
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 00000000000..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.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/stringtemplate-4.0.8-r1.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8-r1.ebuild
new file mode 100644
index 00000000000..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 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"
+)
+
+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/, dev-java/stringtemplate/files/
@ 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:     8e2dfc4e18f9323d171a42526d508892596a2b5c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Nov 21 07:57:32 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=8e2dfc4e

dev-java/stringtemplate: minor style update

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33606
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 000000000000..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 <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(-)
+
+--- 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<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.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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/
@ 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:     1210dc8f95787cdbd313ee1edcb700fafc1c23f9
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Nov 21 07:41:23 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=1210dc8f

dev-java/stringtemplate: add 4.3.4

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-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 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-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
new file mode 100644
index 000000000000..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-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: <created>\"\n";
+         writeFile(tmpdir, "t.stg", templates);
+@@ -95,7 +96,7 @@ public class TestRenderers extends BaseTest {
+         assertEquals(expecting, result);
+     }
+ 
+-    @Test public void testRendererWithPredefinedFormat() throws Exception {
++    @Test @Ignore public void testRendererWithPredefinedFormat() throws Exception {
+         String templates =
+                 "dateThing(created) ::= << datetime: <created; format=\"short\"> >>\n";
+         writeFile(tmpdir, "t.stg", templates);
+@@ -111,7 +112,7 @@ public class TestRenderers extends BaseTest {
+         assertEquals(expecting, result);
+     }
+ 
+-    @Test public void testRendererWithPredefinedFormat2() throws Exception {
++    @Test @Ignore public void testRendererWithPredefinedFormat2() throws Exception {
+         String templates =
+                 "dateThing(created) ::= << datetime: <created; format=\"full\"> >>\n";
+         writeFile(tmpdir, "t.stg", templates);
+@@ -150,7 +151,7 @@ public class TestRenderers extends BaseTest {
+         assertEquals(expecting, result);
+     }
+ 
+-    @Test public void testRendererWithPredefinedFormat4() throws Exception {
++    @Test @Ignore public void testRendererWithPredefinedFormat4() throws Exception {
+         String templates =
+                 "dateThing(created) ::= << time: <created; format=\"time:medium\"> >>\n";
+ 
+--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestGroups.java
++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestGroups.java
+@@ -29,6 +29,7 @@ package org.stringtemplate.v4.test;
+ 
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.stringtemplate.v4.*;
+ import org.stringtemplate.v4.misc.ErrorBuffer;
+ 
+@@ -813,7 +814,7 @@ public class TestGroups extends BaseTest {
+   }
+ 
+ 
+-  @Test public void testGroupStringMultipleThreads() throws Exception {
++  @Test @Ignore public void testGroupStringMultipleThreads() throws Exception {
+     String templates =
+         "stat(name,value={99}) ::= \"x=<value>; // <name>\"" + newline;
+     final STGroup group = new STGroupString(templates);

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
new file mode 100644
index 000000000000..14530a5b8587
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 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:${PV}"
+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/stringtemplate4/archive/ST4-${PV}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-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-ST4-${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() {
+	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}")"
+	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}"
+
+	# The JAR used as a test resource file needs to be in the classpath
+	# https://github.com/antlr/stringtemplate4/blob/4.3.2/pom.xml#L53-L58
+	new_test_cp+=":${JAVA_TEST_SRC_DIR}/test.jar"
+
+	# 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
+	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/, dev-java/stringtemplate/files/
@ 2024-01-10  8:29 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2024-01-10  8:29 UTC (permalink / raw
  To: gentoo-commits

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

dev-java/stringtemplate: drop 4.3.2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34696
Signed-off-by: Florian Schmaus <flow <AT> 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 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-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..000000000000
--- 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 <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.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
deleted file mode 100644
index 86fa55098e53..000000000000
--- 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="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 ~x64-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://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}"
-
-	# The JAR used as a test resource file needs to be in the classpath
-	# https://github.com/antlr/stringtemplate4/blob/4.3.2/pom.xml#L53-L58
-	new_test_cp+=":${JAVA_TEST_SRC_DIR}/test.jar"
-
-	# 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
-	einstalldocs # https://bugs.gentoo.org/789582
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-10  8:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-22  9:01 [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/, dev-java/stringtemplate/files/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2024-01-10  8:29 Florian Schmaus
2023-12-08 10:39 Miroslav Šulc
2023-12-08 10:39 Miroslav Šulc
2016-01-14 21:44 James Le Cuirot
2015-12-05 23:41 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