gentoo resync : 16.04.2022

4 files changed, 2 insertions, 140 deletions

diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 59dedf17e9b7..cc53f586d638 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,6 +1,3 @@
-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
+EBUILD rhino-1.7.14.ebuild 3851 BLAKE2B 91be866b8bb6f7fcfe571ea236d9091fdfd503e1b70b785c83fe325eb3c541f4fd1d1e1c4851653c2a0bf5f31e647a1a7929bffb795fc35e6177c9f9e26c1f6a SHA512 b6998a1846346f92fd6b2515ebc2a3cdd30e2ad4989b26c3869c3056cf61a1e669acb39b0713d411a29c0563f938524ff0a44f6730a130b441c74f7614db00ae
 MISC metadata.xml 658 BLAKE2B 95a465da3522f815ddd5576c81bb54e9d8ce55da3ec055cd80568fd919227360a10d86e2134db02a4d5bb669a8f3c34c05f0bb879924a008ccaf7ebd2ccdf3ad SHA512 477809635ecc04713f8d9d5f00d17b298597555a30cc9d6aacd6353ae17c98de41d0f83596a004dc96859799948e9ca813a9825577c2869bc6279ccabf20ba51
diff --git a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
deleted file mode 100644
index 4760e980245d..000000000000
--- a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- testsrc/build.xml.orig	2015-08-05 23:41:56.815000000 +0000
-+++ testsrc/build.xml	2015-08-05 23:46:10.026000000 +0000
-@@ -46,15 +46,8 @@
-   -->
-   <property name="test.vm.mx" value="256m" />
- 
--  <target name="get-junit" unless="offline">
--    <mkdir dir="lib"/>
--    <get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true"/>
--    <get src="${test.hamcrest.url}" dest="lib/hamcrest.jar" usetimestamp="true"/>
--  </target>
--
-   <target name="junit-compile">
-     <mkdir dir="${test.classes}" />
--    <antcall target="get-junit"/>
-     <javac
-       destdir="${test.classes}" debug="true"
-       encoding="UTF-8"
-@@ -75,7 +68,6 @@
- 
-   <target name="compile">
-     <mkdir dir="${test.classes}" />
--	<antcall target="get-junit"/>
-     <javac
-       srcdir="testsrc"
-       destdir="${test.classes}" debug="true"
-@@ -105,12 +97,7 @@
-     <delete dir="${test.classes}" />
-   </target>
- 
--  <target name="get-emma" unless="offline">
--    <get src="${test.emma.url}" dest="lib/emma.jar" usetimestamp="true"/>
--    <get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true"/>
--  </target>
--
--  <target name="coverage-instrument" depends="get-emma">
-+  <target name="coverage-instrument">
-     <property name="coverage.dir" location="${build.dir}/coverage"/>
-     <property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>
-     <mkdir dir="${coverage.classes.dir}"/>
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14.ebuild
index f73aed7eae8d..0826d783bf62 100644
--- a/dev-java/rhino/rhino-1.7.14.ebuild
+++ b/dev-java/rhino/rhino-1.7.14.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="1.6"
 
 # There are too many test failures:
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
deleted file mode 100644
index 656ddd97e01f..000000000000
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="org.mozilla:rhino:1.7.7"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-# rhino -> Rhino
-MY_PN="${PN^}"
-
-# 1.7.7 -> 1_7_7
-MY_PV="$(replace_all_version_separators _ ${PV})"
-
-# rhino1.7.7
-MY_P="${PN}${PV}"
-
-# Rhino1_7_7_RELEASE
-MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
-
-# ../rhino-Rhino1_7_7_RELEASE
-S="${WORKDIR}/${PN}-${MY_RELEASE}"
-
-CDEPEND=""
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/emma:0
-		dev-java/junit:4
-		dev-java/ant-junit:0
-		dev-java/hamcrest-core:1.3
-	)
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testsrc-build.xml.patch
-)
-
-EANT_TEST_TARGET="junit"
-
-# StackOverFlow errors arise on some tests.
-# Further, the test suite takes way too much time (> 5 min).
-# Maybe reduce the numbers of tests?
-RESTRICT="test"
-
-java_prepare() {
-	java-pkg_clean
-
-	epatch "${PATCHES[@]}"
-
-	if use test; then
-		mkdir lib || die
-		java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
-		java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar
-		java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar
-		java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
-	fi
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	if use source; then
-		EANT_BUILD_TARGET="source-zip" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}