gentoo auto-resync : 27:02:2023 - 10:00:13

2 files changed, 118 insertions, 0 deletions

diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 3d71472de586..05c31cd6d46a 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,5 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
+DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
 EBUILD bsh-2.0_beta6-r1.ebuild 1363 BLAKE2B cc838347fd0951d3e5fc26e473d6fb1febea04080bb85f30aee9bb33bc48f4e1784d55f73e81e47dc726ae4b200ef4c997765c96e9c062b9835effec40d0b310 SHA512 6ec85dc3b5cfe11e32821ed5f62cf63f06a9adf88978140c21846b5659d89bb3767e0e5e47d8cafd26d448a69f3865fc8548dff49740a3049bc72820b8d50695
+EBUILD bsh-2.1.1.ebuild 3293 BLAKE2B 1a81df14ecf67d0a3611b116173faef1de442fdc2186ef3333a46605a61b1e60c44f586f4d008ea53cd76de46dd8a8f888f4eacfe83812fd9a871d8f363ec9c5 SHA512 95c5b16fd630970a35dab87a049f7421e1f73bcaa275eba31ec447e3649c1ab47f4096193162a3aecb0b59f07be67375ffed7504d15e1a6271c03bfb5b537359
 MISC metadata.xml 331 BLAKE2B faccf5565dc11dfae5b8874e970f2d055f49319264c1c2d11a685659cd5c0dacbd2f915c8e45d376e8b210dac6221e172909f62be63030e4e257157feface3bb SHA512 bce4790cca3f4c4c883c1befc7d2dcabb1456dd88fef57cd2ffb25f45f9505f921a428c830d17c0ca92f876d921d56684bf7bce3bbe277c33ddd19fb03118381
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
new file mode 100644
index 000000000000..f593111f6a84
--- /dev/null
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/beanshell/beanshell/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/beanshell-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# There was 1 failure:
+# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
+# bsh.TargetError: Sourced file: inline evaluation of: ``import java.net.URL;
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/bsf:2.3
+	dev-java/jakarta-servlet-api:4"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+DOCS=(
+	CHANGES.md
+	NOTICE
+	README.md
+)
+
+JAVA_LAUNCHER_FILENAME="bsh-console"
+JAVA_MAIN_CLASS="bsh.Console"
+JAVA_RESOURCE_DIRS="resources/src"
+JAVA_SRC_DIR=( src bsf/src engine/src )
+JAVA_TEST_EXCLUDES=(
+	bsh.TestUtil	# invalid test class
+	bsh.TestFilter	# invalid test class
+	bsh.Class3_Test
+	bsh.Class13Test
+	bsh.Issue_7_Test
+	bsh.Issue_8_Test
+	bsh.OldScriptsTest # ?? As the name says Old...
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="tests/junitTests/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	# These classes are not in upstream jar file
+	rm engine/src/bsh/TestBshScriptEngine.java || die
+	rm src/bsh/JThis.java || die
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir resources || die
+	find src -type f \
+		! -name '*.java' \
+		! -name 'bsh.jj*' \
+		! -name '*.scripted' \
+		! -name '*.txt' \
+		! -name '*.xml' \
+		! -name '.errLog' \
+		! -name 'index.html' \
+		! -name 'Changes.html' \
+		! -name 'CodeMap.html' \
+		! -name 'Manifest.*' \
+		| xargs cp --parent -t resources || die
+
+	# Some but not all tests in these test classes fail
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/diamond_operator()/i @Ignore' \
+		-e '/try_with_resource()/i @Ignore' \
+		-e '/integer_literal_enhancements()/i @Ignore' \
+		-i tests/junitTests/src/bsh/Project_Coin_Test.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/parsing_very_large_hex_literal()/i @Ignore' \
+		-e '/integer_literal_enhancements_binary()/i @Ignore' \
+		-e '/parsing_large_hex_literal()/i @Ignore' \
+		-i tests/junitTests/src/bsh/NumberLiteralTest.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/define_interface_with_constants()/i @Ignore' \
+		-i tests/junitTests/src/bsh/ClassGeneratorTest.java || die
+}
+
+src_test() {
+	# tests/junitTests/src/bsh/Issue_55_Test.java:47: error: cannot find symbol
+	#                 final Object scriptEngineResult = new BshScriptEngineFactory().getScriptEngine().eval(script);
+	#                                                       ^
+	#   symbol:   class BshScriptEngineFactory
+	#   location: class Issue_55_Test
+	rm tests/junitTests/src/bsh/Issue_55_Test.java || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+}