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/bsh/
Date: Mon, 27 Feb 2023 05:53:22
Message-Id: 1677477191.7e8baa625d33014892243efce77a6dc286871c28.fordfrog@gentoo
1 commit: 7e8baa625d33014892243efce77a6dc286871c28
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Thu Feb 9 12:25:03 2023 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 05:53:11 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8baa62
7
8 dev-java/bsh: add 2.1.1
9
10 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
11 Closes: https://github.com/gentoo/gentoo/pull/29506
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 dev-java/bsh/Manifest | 1 +
15 dev-java/bsh/bsh-2.1.1.ebuild | 116 ++++++++++++++++++++++++++++++++++++++++++
16 2 files changed, 117 insertions(+)
17
18 diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
19 index 45f1210949a7..ad27f0978a5e 100644
20 --- a/dev-java/bsh/Manifest
21 +++ b/dev-java/bsh/Manifest
22 @@ -1 +1,2 @@
23 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
24 +DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
25
26 diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
27 new file mode 100644
28 index 000000000000..f593111f6a84
29 --- /dev/null
30 +++ b/dev-java/bsh/bsh-2.1.1.ebuild
31 @@ -0,0 +1,116 @@
32 +# Copyright 1999-2023 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=8
36 +
37 +JAVA_PKG_IUSE="doc source test"
38 +MAVEN_ID="org.apache-extras.beanshell:bsh:2.1.1"
39 +JAVA_TESTING_FRAMEWORKS="junit-4"
40 +
41 +inherit java-pkg-2 java-pkg-simple
42 +
43 +DESCRIPTION="A small embeddable Java source interpreter"
44 +HOMEPAGE="https://github.com/beanshell/beanshell"
45 +SRC_URI="https://github.com/beanshell/beanshell/archive/${PV}.tar.gz -> ${P}.tar.gz"
46 +S="${WORKDIR}/beanshell-${PV}"
47 +
48 +LICENSE="LGPL-2.1"
49 +SLOT="0"
50 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
51 +
52 +# There was 1 failure:
53 +# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
54 +# bsh.TargetError: Sourced file: inline evaluation of: ``import java.net.URL;
55 +PROPERTIES="test_network"
56 +RESTRICT="test"
57 +
58 +CP_DEPEND="
59 + dev-java/bsf:2.3
60 + dev-java/jakarta-servlet-api:4"
61 +
62 +RDEPEND="${CP_DEPEND}
63 + >=virtual/jre-1.8:*"
64 +
65 +DEPEND="${CP_DEPEND}
66 + virtual/jdk:1.8"
67 +
68 +DOCS=(
69 + CHANGES.md
70 + NOTICE
71 + README.md
72 +)
73 +
74 +JAVA_LAUNCHER_FILENAME="bsh-console"
75 +JAVA_MAIN_CLASS="bsh.Console"
76 +JAVA_RESOURCE_DIRS="resources/src"
77 +JAVA_SRC_DIR=( src bsf/src engine/src )
78 +JAVA_TEST_EXCLUDES=(
79 + bsh.TestUtil # invalid test class
80 + bsh.TestFilter # invalid test class
81 + bsh.Class3_Test
82 + bsh.Class13Test
83 + bsh.Issue_7_Test
84 + bsh.Issue_8_Test
85 + bsh.OldScriptsTest # ?? As the name says Old...
86 +)
87 +JAVA_TEST_GENTOO_CLASSPATH="junit-4"
88 +JAVA_TEST_SRC_DIR="tests/junitTests/src"
89 +
90 +src_prepare() {
91 + java-pkg-2_src_prepare
92 + java-pkg_clean
93 +
94 + # These classes are not in upstream jar file
95 + rm engine/src/bsh/TestBshScriptEngine.java || die
96 + rm src/bsh/JThis.java || die
97 +
98 + # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
99 + mkdir resources || die
100 + find src -type f \
101 + ! -name '*.java' \
102 + ! -name 'bsh.jj*' \
103 + ! -name '*.scripted' \
104 + ! -name '*.txt' \
105 + ! -name '*.xml' \
106 + ! -name '.errLog' \
107 + ! -name 'index.html' \
108 + ! -name 'Changes.html' \
109 + ! -name 'CodeMap.html' \
110 + ! -name 'Manifest.*' \
111 + | xargs cp --parent -t resources || die
112 +
113 + # Some but not all tests in these test classes fail
114 + sed \
115 + -e '/import org.junit.Test/a import org.junit.Ignore;' \
116 + -e '/diamond_operator()/i @Ignore' \
117 + -e '/try_with_resource()/i @Ignore' \
118 + -e '/integer_literal_enhancements()/i @Ignore' \
119 + -i tests/junitTests/src/bsh/Project_Coin_Test.java || die
120 +
121 + sed \
122 + -e '/import org.junit.Test/a import org.junit.Ignore;' \
123 + -e '/parsing_very_large_hex_literal()/i @Ignore' \
124 + -e '/integer_literal_enhancements_binary()/i @Ignore' \
125 + -e '/parsing_large_hex_literal()/i @Ignore' \
126 + -i tests/junitTests/src/bsh/NumberLiteralTest.java || die
127 +
128 + sed \
129 + -e '/import org.junit.Test/a import org.junit.Ignore;' \
130 + -e '/define_interface_with_constants()/i @Ignore' \
131 + -i tests/junitTests/src/bsh/ClassGeneratorTest.java || die
132 +}
133 +
134 +src_test() {
135 + # tests/junitTests/src/bsh/Issue_55_Test.java:47: error: cannot find symbol
136 + # final Object scriptEngineResult = new BshScriptEngineFactory().getScriptEngine().eval(script);
137 + # ^
138 + # symbol: class BshScriptEngineFactory
139 + # location: class Issue_55_Test
140 + rm tests/junitTests/src/bsh/Issue_55_Test.java || die
141 + java-pkg-simple_src_test
142 +}
143 +
144 +src_install() {
145 + java-pkg-simple_src_install
146 + java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
147 +}