Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/stringtemplate/
Date: Fri, 06 May 2022 06:24:22
Message-Id: 1651818247.13b60ee19e790bdf09435714c124a385022d156a.fordfrog@gentoo
1 commit: 13b60ee19e790bdf09435714c124a385022d156a
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 6 06:24:07 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri May 6 06:24:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b60ee1
7
8 dev-java/stringtemplate: dropped obsolete 4.3.1
9
10 Bug: https://bugs.gentoo.org/842729
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/stringtemplate/Manifest | 2 -
14 .../stringtemplate/stringtemplate-4.3.1.ebuild | 97 ----------------------
15 2 files changed, 99 deletions(-)
16
17 diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
18 index b44912b51312..3e6c9904de13 100644
19 --- a/dev-java/stringtemplate/Manifest
20 +++ b/dev-java/stringtemplate/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
23 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
24 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
25 -DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
26 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
27
28 diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
29 deleted file mode 100644
30 index 96b458d2cc14..000000000000
31 --- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
32 +++ /dev/null
33 @@ -1,97 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -JAVA_PKG_IUSE="doc source test"
40 -MAVEN_ID="org.antlr:ST4:4.3.1"
41 -JAVA_TESTING_FRAMEWORKS="junit-4"
42 -
43 -inherit java-pkg-2 java-pkg-simple
44 -
45 -DESCRIPTION="A Java template engine"
46 -HOMEPAGE="https://www.stringtemplate.org/"
47 -# Maven Central sources JAR for *.java sources pre-generated from *.g files;
48 -# the source generation requires antlr-tool-3.5, which depends on this package.
49 -# Tarball for the test suite and DOCS files
50 -SRC_URI="
51 - https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
52 - https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
53 -"
54 -
55 -LICENSE="BSD"
56 -SLOT="4"
57 -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
58 -
59 -CP_DEPEND="
60 - dev-java/antlr-runtime:3.5
61 -"
62 -
63 -BDEPEND="
64 - app-arch/unzip
65 -"
66 -
67 -DEPEND="
68 - >=virtual/jdk-1.8:*
69 - ${CP_DEPEND}
70 - test? (
71 - dev-java/antlr-tool:3.5
72 - )
73 -"
74 -
75 -RDEPEND="
76 - >=virtual/jre-1.8:*
77 - ${CP_DEPEND}
78 -"
79 -
80 -S="${WORKDIR}"
81 -TARBALL_S="${S}/${PN}4-${PV}"
82 -
83 -JAVA_SRC_DIR="org"
84 -
85 -JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
86 -JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
87 -
88 -DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
89 -
90 -src_prepare() {
91 - java-pkg_clean # Just in case Maven Central sources JAR contains binary
92 - if use test; then
93 - pushd "${TARBALL_S}" > /dev/null ||
94 - die "Failed to enter directory storing tarball contents"
95 - eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
96 - popd > /dev/null ||
97 - die "Failed to leave directory storing tarball contents"
98 - fi
99 - java-pkg-2_src_prepare
100 - # Some of these tests requires a graphical display.
101 - rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
102 -}
103 -
104 -src_test() {
105 - # Make sure no older versions of this slot are present in the classpath
106 - # https://bugs.gentoo.org/834138#c4
107 - local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
108 - local new_test_cp="$(\
109 - java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
110 - new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
111 -
112 - # Some of the test cases require an absolute path to the JAR being tested
113 - # against to be in the classpath, due to the fact that they call the 'java'
114 - # command outside ${S} and reuse the classpath for the tests:
115 - # https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
116 - # https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
117 - new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
118 -
119 - # Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
120 - local JAVA_TEST_GENTOO_CLASSPATH=""
121 - [[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
122 - JAVA_GENTOO_CLASSPATH_EXTRA+=":"
123 - JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
124 - java-pkg-simple_src_test
125 -}
126 -
127 -src_install() {
128 - java-pkg-simple_src_install
129 - einstalldocs # https://bugs.gentoo.org/789582
130 -}