public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/
Date: Tue,  5 Apr 2022 04:59:24 +0000 (UTC)	[thread overview]
Message-ID: <1649134757.d381b561978c8acc70f947d76fbcfcc1dd263db0.fordfrog@gentoo> (raw)

commit:     d381b561978c8acc70f947d76fbcfcc1dd263db0
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Apr  5 04:45:43 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 04:59:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d381b561

dev-java/stringtemplate: Add 4.3.2

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24914
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/stringtemplate/Manifest                   |   2 +
 .../stringtemplate/stringtemplate-4.3.2.ebuild     | 103 +++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index a8ee4deb0a40..b44912b51312 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,5 @@
 DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
+DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
+DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1

diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
new file mode 100644
index 000000000000..1d0130c2b54f
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -0,0 +1,103 @@
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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
+}


             reply	other threads:[~2022-04-05  4:59 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05  4:59 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-07 12:42 [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/ Arthur Zamarin
2024-01-07 12:42 Arthur Zamarin
2023-12-08 10:39 Miroslav Šulc
2022-05-06  6:24 Miroslav Šulc
2022-05-05 17:59 Arthur Zamarin
2022-05-05 10:34 Jakov Smolić
2022-05-05  9:54 Jakov Smolić
2022-05-05  9:54 Jakov Smolić
2022-03-17  0:57 Sam James
2022-02-27  8:11 Miroslav Šulc
2022-02-25 21:31 Sam James
2022-02-24  8:46 Jakov Smolić
2022-02-24  8:46 Jakov Smolić
2021-11-23 21:36 Sam James
2021-08-06  5:49 Miroslav Šulc
2021-06-11  8:56 Agostino Sarubbo
2021-06-11  8:55 Agostino Sarubbo
2021-06-11  8:50 Agostino Sarubbo
2021-05-27  8:08 Miroslav Šulc
2021-05-22  9:01 Miroslav Šulc
2020-07-20  1:10 Sam James
2020-05-17 16:55 Aaron Bauman
2017-07-13 12:13 Alexis Ballier
2016-10-07 20:55 James Le Cuirot
2016-01-14 21:44 James Le Cuirot
2015-12-04 23:01 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1649134757.d381b561978c8acc70f947d76fbcfcc1dd263db0.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox