commit: e8b8f7b9856b2b3899c723ef020d6ff9c0c566f4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Oct 31 13:58:06 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=e8b8f7b9
dev-java/stringtemplate: add java21-compatibility.patch, EAPI 7 -> 8 (slot 0) moves dev-java/antlr:0 to CP_DEPEND Closes: https://bugs.gentoo.org/916571 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/stringtemplate/Manifest | 1 + .../stringtemplate-3.2.1-TestStringTemplate.patch | 11 +++++ ....1-r2.ebuild => stringtemplate-3.2.1-r3.ebuild} | 53 ++++++++++------------ 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest index 3e6c9904de13..a3e375a5b4f2 100644 --- a/dev-java/stringtemplate/Manifest +++ b/dev-java/stringtemplate/Manifest @@ -1,3 +1,4 @@ DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f +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-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/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild similarity index 57% rename from dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild rename to 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 }
