dev-java/rhino-1.7.14: Version bump

dev-java/rhino/Manifest

@@ -1,4 +1 @@
-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
-EBUILD rhino-1.7.7-r1.ebuild 2084 BLAKE2B e943aa034cf71150da32db6af5301d5a094564715a3e2ae660e91abb50563e47eac6b5d9003a03e7bf8cd37c3184409f7cd005772a2131aea6cdbe3d88ad3a5c SHA512 c04269f891908b81b38da033eb111941cc6248ff3308ceb3d75c5d6f3a36eebe42547cb0df8fc5fa014ade8277e713b262f8bcfbce6c24fdfd898470f19b120d
-MISC metadata.xml 510 BLAKE2B 9b51ffca1a744e3a725e3966e25e60744e50fac1dfad6099ee24c4c1a671b986c777979ee9307e928a2adb132e6e8ab21dae8e358d160b93286d6827a209f76a SHA512 612798c48a62f7bbfe40219643d9ddcf0658384b50f0fc8bc511c054870c81a94e60636a533b647c89e5233dc900e0f8899b17d0e831f89423909073cb7e0c0e
+DIST Rhino1_7_14_Release.zip 7745143 BLAKE2B aa38e758c3fde041b4a8067a9e1ac29293ae80fce56be2207f9ef9f658d2b9675ca92f6f92f025d7159bb8b1ab307fe0ef7e8b8a657ea9f57fa760004633dcb0 SHA512 b810114578f0ac36501dc95a9ae71ed9322fbef16deb254d8519e368b6bf394412fbaf088b0ff373172b28b5a495f12e091c586ed59b4772541205f9ca3836f0

dev-java/rhino/rhino-1.7.7-r1.ebuild → dev-java/rhino/rhino-1.7.14.ebuild

@@ -3,9 +3,9 @@
 
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="org.mozilla:rhino:1.7.7"
+MAVEN_ID="org.mozilla:rhino:1.7.14"
 
-inherit java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 versionator
 
 # rhino -> Rhino
 MY_PN="${PN^}"
@@ -16,12 +16,12 @@ 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"
+# 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/"
+HOMEPAGE="https://mozilla.github.io/rhino/"
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="1.6"
@@ -32,9 +32,10 @@ IUSE=""
 S="${WORKDIR}/${PN}-${MY_RELEASE}"
 
 CDEPEND=""
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8
+	dev-java/gradle-bin:7.2
 	test? (
 		dev-java/emma:0
 		dev-java/junit:4
@@ -43,53 +44,35 @@ DEPEND=">=virtual/jdk-1.6
 	)
 	${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[@]}"
+egradle() {
+	local gradle="/usr/bin/gradle-bin-7.2"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
 
-	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
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
 }
 
 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
+	egradle jar
 }
 
 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
 }