From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8754D159C96 for ; Fri, 26 Jul 2024 09:34:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C5DE29F2; Fri, 26 Jul 2024 09:34:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80057E29F2 for ; Fri, 26 Jul 2024 09:34:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 763BF34027D for ; Fri, 26 Jul 2024 09:34:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD6711ADC for ; Fri, 26 Jul 2024 09:34:21 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1721986427.8fc319802f811bfc774024d7cf46d3a6815aabde.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/files/, dev-java/stringtemplate/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch dev-java/stringtemplate/stringtemplate-4.3.4.ebuild X-VCS-Directories: dev-java/stringtemplate/ dev-java/stringtemplate/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 8fc319802f811bfc774024d7cf46d3a6815aabde X-VCS-Branch: master Date: Fri, 26 Jul 2024 09:34:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2bfe157a-642b-4192-92f5-2247a08dbf27 X-Archives-Hash: c5714b1c44a5dcd234de1b8703e90ab1 commit: 8fc319802f811bfc774024d7cf46d3a6815aabde Author: Miroslav Šulc gentoo org> AuthorDate: Fri Jul 26 09:33:47 2024 +0000 Commit: Miroslav Šulc gentoo 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 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}")"