gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 10 insertions, 11 deletions

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index bd1c71853f2e..21a25290459c 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,10 @@
 AUX stringtemplate-3.2.1-TestStringTemplate.patch 463 BLAKE2B f4c9b1bce8b48a2d1299e866510a87038d34b636f2da942ca14e2ba9b75a77397abe7b430adcca35380d6362b5e3a6c6150f37b4e1efba521d1b63417cf7d4de SHA512 8f69547dd3e48ce32619f21daff19888f3cdf1d0df41e2f35ac534001c56eaa0e504edf481fd692241e2041c3d62f120df6ab4bb5b961f15662a399b9a915f8c
 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
+AUX stringtemplate-4.3.4-Java21+-TestRenderers.patch 2437 BLAKE2B fec8d2c0726a3bc130e0a43da3e4444d02afd9cd2882b75bb8e52e77caa0a9594682ac59e4f4a0a72b0d6346c98556ccaf422108558f3d1dffe68c275e537a4c SHA512 ea887454b1a26d6f04ac9be69d793bff61340c51c75ba55c1160c76f537e3a8b37a719b5134874b80ad1f894423698621c80c4af940cb78586be8ce5d77e5be4
 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
 EBUILD stringtemplate-3.2.1-r3.ebuild 1453 BLAKE2B 21864c434a6d4bd30706ecb52ac4bf74ea95796479288f6112c303918f64aa1cefb5d2ec1bf9cf9e3de0471be049ef2ae5d7beab3e93dee0e43223fd400a6e98 SHA512 63d481137f9254f98921386ce84b213ac36cc9a40b09ad31d600415c84eae37be6bb24187c02bed39cd7e791bfeff1eef9bf68ff22dc5046b31e6f536a29db0b
-EBUILD stringtemplate-4.3.4.ebuild 3075 BLAKE2B 0bb4e03971e0eaf7e075335ab9beb80f9a1d4aaf2b7410590745b1559aba0992978b366899fe7b7ae6cc8c932c01f5deca852e75d8f3a5c1434095a73ecd764d SHA512 20133120b08e0bbcc172029594f0038a227d45312ce2f092b0405017f7a9cffb12a73f0399bfe3955a8f6f7ac53c191a19e378a89695ad83752d101bb2987ae3
+EBUILD stringtemplate-4.3.4.ebuild 2968 BLAKE2B d20d6fdd4f51284f89dfeadc900d51d59cdd3f7c53cb99067ec7d2503c4831655cd32372e763acaa97ee41da4c09540f033664ec4a5855a9d01b8030073f3a34 SHA512 065d2d8045efa3678981cf978b9ec4a1c1481bb05a137ee05294c147fd10707da641848eabb781a8e1627f7e6678a5330226f16816440b171c261b10f5877089
 MISC metadata.xml 384 BLAKE2B 16689f763ad8d9c0ce861933ca359a87ff74e2b464b740989a12700c9ad9eb8b2a79b0dd4ca6a2aecfe908b107c6abd907e1a25775783ea911a4a76fdf0d6e19 SHA512 71e70442b1128c1fbddc8ea936584090bf17ab8ecefc0ad35674b7d04bbab4f9981e0b2ea3465a386d43cc3363710fcf0bfd78412f29f387e85b5ebad998dbea
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
index 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}")"