gentoo resync : 20.03.2022

3 files changed, 118 insertions, 1 deletions

diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index d017f921c657..59dedf17e9b7 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1,6 @@
 AUX rhino-1.7.7-testsrc-build.xml.patch 1414 BLAKE2B c96d595d6c0bcd0225f8df9ac63e28a68cd6045b0f5395a13826fd7b7c7bce01ccc6963e58e2a07e41cd3c138de92cabd2627163cb16b5b2c21bc4f91b4a7eac SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe
 DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
+DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
+EBUILD rhino-1.7.14.ebuild 3855 BLAKE2B b34e54b7d85d159708dd29b5513d8d7b4a9b58d8f8c502b6af0f253aeb58ac7ad330f1199e296bf623fef166016a18f5d96f0a3498c106b5d1ffc36574c8d48c SHA512 984461442e826f09f68ec799989679818af3ec5a703c2e6b972b4e577be59d25184df0e6b12bca372c45c395cf88dacb8f8e65c9331332b7ee30e2cd4b3c7d8d
 EBUILD rhino-1.7.7-r1.ebuild 2084 BLAKE2B e943aa034cf71150da32db6af5301d5a094564715a3e2ae660e91abb50563e47eac6b5d9003a03e7bf8cd37c3184409f7cd005772a2131aea6cdbe3d88ad3a5c SHA512 c04269f891908b81b38da033eb111941cc6248ff3308ceb3d75c5d6f3a36eebe42547cb0df8fc5fa014ade8277e713b262f8bcfbce6c24fdfd898470f19b120d
-MISC metadata.xml 510 BLAKE2B 9b51ffca1a744e3a725e3966e25e60744e50fac1dfad6099ee24c4c1a671b986c777979ee9307e928a2adb132e6e8ab21dae8e358d160b93286d6827a209f76a SHA512 612798c48a62f7bbfe40219643d9ddcf0658384b50f0fc8bc511c054870c81a94e60636a533b647c89e5233dc900e0f8899b17d0e831f89423909073cb7e0c0e
+MISC metadata.xml 658 BLAKE2B 95a465da3522f815ddd5576c81bb54e9d8ce55da3ec055cd80568fd919227360a10d86e2134db02a4d5bb669a8f3c34c05f0bb879924a008ccaf7ebd2ccdf3ad SHA512 477809635ecc04713f8d9d5f00d17b298597555a30cc9d6aacd6353ae17c98de41d0f83596a004dc96859799948e9ca813a9825577c2869bc6279ccabf20ba51
diff --git a/dev-java/rhino/metadata.xml b/dev-java/rhino/metadata.xml
index 603129d072cc..8ba5d74b80e6 100644
--- a/dev-java/rhino/metadata.xml
+++ b/dev-java/rhino/metadata.xml
@@ -12,5 +12,7 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">mozilla/rhino</remote-id>
+		<changelog>https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md</changelog>
+		<bugs-to>https://github.com/mozilla/rhino/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14.ebuild
new file mode 100644
index 000000000000..f73aed7eae8d
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.14.ebuild
@@ -0,0 +1,113 @@
+# 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.mozilla:rhino:1.7.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+HOMEPAGE="https://github.com/mozilla/rhino"
+SRC_URI="https://github.com/mozilla/rhino/archive/Rhino${PV//./_}_Release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="1.6"
+
+# There are too many test failures:
+# FAILURES!!!
+# Tests run: 10504,  Failures: 613
+# With openjdk-11 tests even fail to compile:
+# ./testsrc/tests/src/com/netscape/javascript/qa/liveconnect/LiveConnectTest.java:104: error: cannot find symbol
+#         global  = JSObject.getWindow( this );
+#                           ^
+#   symbol:   method getWindow(LiveConnectTest)
+#   location: class JSObject
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/emma:0
+		dev-java/jakarta-xml-soap-api:1
+		dev-java/jmh-core:0
+		dev-java/hamcrest-core:1.3
+		dev-java/snakeyaml:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DOCS=( {CODE_OF_CONDUCT,README,RELEASE-NOTES,RELEASE-STEPS}.md {NOTICE-tools,NOTICE}.txt )
+
+S="${WORKDIR}/rhino-Rhino${PV//./_}_Release"
+
+JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
+JAVA_RESOURCE_DIRS="res"
+JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
+JAVA_TEST_SRC_DIRS="testsrc"
+JAVA_TEST_RESOURCE_DIRS="testres"
+
+# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L81-L87
+JAVA_TEST_EXTRA_ARGS=(
+	-Djava.awt.headless=true
+	-Dmozilla.js.tests=testsrc/tests
+	-Dmozilla.js.tests.timeout=60000
+	-Duser.language=en
+	-Duser.country=US
+	-Duser.timezone=America/Los_Angeles
+	-Dfile.encoding=UTF-8
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	mkdir -p res/org/mozilla/javascript/tools/{resources,debugger} || die
+
+	cp -r "src/org" "res" || die
+	find "res" -type f -name '*.java' -exec rm -rf {} + || die
+
+	cp {toolsrc,res}/org/mozilla/javascript/tools/resources/Messages.properties || die
+	cp {toolsrc,res}/org/mozilla/javascript/tools/debugger/test.js || die
+
+	mv {src,testsrc}/org/mozilla/javascript/engine || die
+	cp -r "testsrc" "testres" || die
+	find "testres" -type f -name '*.java' -exec rm -rf {} + || die
+
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/MacRefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/ObservedTask.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoEnv.java || die
+}
+
+src_test() {
+	# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L71-L77
+	rm -r testsrc/benchmarks || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -gt "1.8" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/javax.swing.table=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}