gentoo auto-resync : 08:12:2023 - 17:08:32

7 files changed, 207 insertions, 32 deletions

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index bdbbc128c43e..6980d09e179a 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,7 +1,14 @@
+AUX stringtemplate-3.2.1-TestStringTemplate.patch 463 BLAKE2B f4c9b1bce8b48a2d1299e866510a87038d34b636f2da942ca14e2ba9b75a77397abe7b430adcca35380d6362b5e3a6c6150f37b4e1efba521d1b63417cf7d4de SHA512 8f69547dd3e48ce32619f21daff19888f3cdf1d0df41e2f35ac534001c56eaa0e504edf481fd692241e2041c3d62f120df6ab4bb5b961f15662a399b9a915f8c
 AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
+AUX stringtemplate-4.3.4-BaseTest-javac-source-target.patch 1233 BLAKE2B abafe7d60c9667cb0838b33d67d9e4eee1afe9f5f989e2152fb03a5e88c402bda49b927320ad912990b617b6c60322e99417c5fad0c3e60d48b9e8bb4a69053d SHA512 fc5da02c16109817ab7bb30c31a90ce535560e8bf1e7e1dfb203846e930bbd665aeaf46a4641d67e2960e8ae9d88b21275317b0b6e0494eeac8f20aa4f546a04
+AUX stringtemplate-4.3.4-Java21-TestRenderers.patch 2293 BLAKE2B 48a0ac8fcf10dd67511c5f679c3194d980f22b3c4a471a200a6a5f228bdf5769bf0a89857dd29f0575e2648d71f79a15dd8b63f45bd01543497d5a0dbbd4e4c9 SHA512 094bd4c6f0678579b0f0419a5a2a6c7a1dac1c86602e137d0b66da7d4a49ab4faa85d26b20266a54b3106964521cb33f6690aaa6265a1348fddc0fe3b93eaa74
 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
-EBUILD stringtemplate-3.2.1-r2.ebuild 1512 BLAKE2B dbd5d78454b007aa6547dd81b6f129b92ad68b4cc2b8e60b73e3b0f14c8eef050a7c7c461e91d700b970a2f466ba7acc33bbf7a14b9e7f55eabb79b65062c25e SHA512 9d5c298bc3f22c169afe4218486eb85cf9b5c8a67beaccc0365f87ba3092e7295d4f531853743617a6d16f6309b52608e2db175922238a5da3a3b1deb2695a5d
+EBUILD stringtemplate-3.2.1-r3.ebuild 1453 BLAKE2B 21864c434a6d4bd30706ecb52ac4bf74ea95796479288f6112c303918f64aa1cefb5d2ec1bf9cf9e3de0471be049ef2ae5d7beab3e93dee0e43223fd400a6e98 SHA512 63d481137f9254f98921386ce84b213ac36cc9a40b09ad31d600415c84eae37be6bb24187c02bed39cd7e791bfeff1eef9bf68ff22dc5046b31e6f536a29db0b
 EBUILD stringtemplate-4.3.2.ebuild 3267 BLAKE2B e8468a2985540109fa1159d5cc853607cbca7ea712b139d90a6a222c3364ea5d92c9d16003abc5bb7986d4d6037651805f2ccc4419c70d47f4329af8374926bf SHA512 fc353764974ea280a98c9f7aed22c532071cbfa527fe729af3bc1047950388b715638ac249034affe7ceaad88b311780d25dbd5e66dc9ac532aa5e96947861be
-MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
+EBUILD stringtemplate-4.3.4.ebuild 3079 BLAKE2B f689e1be68e58f47b72fcbce3af2991fd2e6597f22428822ede0a81ae0e191c22f9518fd3047e7e81fe5d63434d0746b99e3e67ab62fe329690f4b2a171b329a SHA512 5e8192631e414dfc1720e423c7370cb10efcc962c70e94e7d1da4acf6e3aa051eba677d8b3569411dafdae4e09b78699dfa409f02ef117f48fa9bbd99a87062b
+MISC metadata.xml 384 BLAKE2B 16689f763ad8d9c0ce861933ca359a87ff74e2b464b740989a12700c9ad9eb8b2a79b0dd4ca6a2aecfe908b107c6abd907e1a25775783ea911a4a76fdf0d6e19 SHA512 71e70442b1128c1fbddc8ea936584090bf17ab8ecefc0ad35674b7d04bbab4f9981e0b2ea3465a386d43cc3363710fcf0bfd78412f29f387e85b5ebad998dbea
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/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/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..127f5e0a4b61
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
@@ -0,0 +1,41 @@
+there are different space characters used in java 21 (narrow space)
+
+--- 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
+@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest {
+         String expecting = "datetime: 7/5/05, 12:00 AM";
+         if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+             expecting = "datetime: 7/5/05 12:00 AM";
++        } else if ( javaVersion.startsWith("21") ) {
++            expecting = "datetime: 7/5/05, 12:00 AM";
+         }
+         String result = st.render();
+         assertEquals(expecting, result);
+@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest {
+         String expecting = " datetime: 7/5/05, 12:00 AM ";
+         if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+             expecting = " datetime: 7/5/05 12:00 AM ";
++        } else if ( javaVersion.startsWith("21") ) {
++            expecting = " datetime: 7/5/05, 12:00 AM ";
+         }
+         String result = st.render();
+         assertEquals(expecting, result);
+@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest {
+             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") ) {
++                expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
+             }
+             String result = st.render();
+             assertEquals(expecting, result);
+@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest {
+         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") ) {
++            expecting = " time: 12:00:00 AM ";
++        }
+         String result = st.render();
+         assertEquals(expecting, result);
+     }
diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
index fb8783e44aee..b4aba6185def 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">antlr/stringtemplate3</remote-id>
 		<remote-id type="github">antlr/stringtemplate4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/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
 }
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..9fff5776a1d3
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -0,0 +1,96 @@
+# 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
+"
+S="${WORKDIR}"
+TARBALL_S="${S}/${PN}4-ST4-${PV}"
+
+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}
+"
+
+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} )
+PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
+
+src_prepare() {
+	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
+}
+
+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
+}