Version bump. Fixes bug 524528.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 158 insertions, 9 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 8dc3e667da22..9034e96abbcc 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/rhino
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.78 2015/06/13 21:57:24 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.79 2015/08/06 10:01:23 monsieurp Exp $
+
+*rhino-1.7.7 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/rhino-1.7.7-testsrc-build.xml.patch, +rhino-1.7.7.ebuild:
+  Version bump. Fixes bug 524528.
 
   13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -rhino-1.5.5-r4.ebuild,
   -rhino-1.5.5-r5.ebuild:
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 6fb7924311af..13d824aa2b65 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -5,21 +5,24 @@ AUX 00_dont-fetch-swing-ex.patch 604 SHA256 c3be56ceb25582e46ba1ec605b8c9fbf35ed
 AUX 1.5.5_jdk15.patch 1217 SHA256 6c89bf649d91626f82b9cc103a34a9afd19f747aba4d6fc0c29edf51542a2b6b SHA512 cb999b0cb83bd03016a6d27142bacd5d6a4b031f4ec2257c02d56c0192f9d00d594ae185810f99b8999307c8b94c7e7f805420b25ad30eed9a10c0ae3f261292 WHIRLPOOL 82ba8eda8cf787a9a829bbc21ebb544ad13dee15d11d0add3cd4fe495059630471b8457b179ec6d907e13697c10715143ad37a74ed5d11f46bda0a70b0606721
 AUX public-NativeScript.patch 456 SHA256 fa6d35f81e4090f38e12eed585c73c64765723064588ac4501ce47743a178422 SHA512 0342c291806bd98d3e265f80f6269bfd047a7113fa5f81e69ee2fa3cf9824c446638c108c1fc8cc99ce795dc08ceb8bb321c37e30660eeef83275ca286bea007 WHIRLPOOL a70bb673f6456a24ccb62add0a890e08410aaa0d44c83230ef3305843ecfb416ad4450a00ae84adc37bda39651d7bb2fe7f3a4e08eba2197e3c03d3a8c78983b
 AUX rhino-1.6-noget.patch 601 SHA256 2311dbd14a77dda04a6f12bed9cd973a2ba24e6fe8a0d847d49999d396319171 SHA512 215d3cb6769dd4b434be1849c4e866fe1a72d3ec1aea0df68071faa59684e299d067590f7cc6007d0c6130fced5c1c3ceff087786598f620e9dbc3bef9a28044 WHIRLPOOL 2c9a44da964df7f8766ccea6be792adb1b3b74dba8a1504d8dc7f0363a1c9d2b24cf0f2663c097be42ee9fd4db5183977256545e6f5201ed19d28ae338ea2fb2
+AUX rhino-1.7.7-testsrc-build.xml.patch 1414 SHA256 b47039364188c26900d838ed4bd5f6887ca5059f9d35eab87d60f798675c30a4 SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe WHIRLPOOL 15754728010b5db04e11bbc743c4eb0bca07214a19b33ed44d40747a1017549c5a18d4b16fe9f301e0d69044ec3b0d3aeb77fcab1d27bd10966d69db79e4cbdd
+DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896
 DIST rhino-swing-ex-1.0.zip 19708 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SHA512 f2c1f970595cb08ac301d2fc21e0a2f1090b2007c849d993094ef3215a39456a5865bcaaf9424da93a09d6f0d151be6ec77f844bde2540d725c85c4b54a5f248 WHIRLPOOL 4dd40c1c80a70cd08584ac44abd3b42a790080f93449da8e241ed568ff5b3a5ac6cef12951632eba91547845be49401102d072b05a83a3ed78705acd768b1ced
 DIST rhino1_6R5.zip 1822832 SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f SHA512 bd10b2e687925e06a5a4da5bc0e29a65cff08fc26792e3183f2ab28efb71efcdbc2fb08142be2fd2622c0b94dfa2691ce898ba847935def780e8686a879720f0 WHIRLPOOL 5fda95c5a99a6e99322a81fda513135cece56df0c7d17efcaea0b5f9f8f63b3adccd47bf30f26521b36e33f34e642e05107d7e0f202b8d532356884954d01049
 DIST rhino1_7R2.zip 2996867 SHA256 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc SHA512 e4472e11377e93b64df3a2a9f266956d86ba78c85ceba57ff05c983d577143351fcbbbc0b63f7034718fd74c13a9e50bac6e8813f320b86fcd09b571e919b858 WHIRLPOOL 546f9a0e565881dd6128e000ca8c8e017cf7432e40df885268c4827e2dbd28f86cde37dbc7284bd1b08b062060eca1465716f850dbd54f176ead475b4b55351d
 EBUILD rhino-1.6.5.ebuild 1816 SHA256 9e8842ce373ceadb8ee3dfc62dc2d09e8230f4522feadb7a137b2b5d7fd25a59 SHA512 453ed5b772384d38c104ef2c24fa7139de108622b98ba9aebcdda0e73cb1e5797516aad609a6ef5b15e9430f23f90ed42b34656661e9fc394b584b4607a30c27 WHIRLPOOL 2403e6875f85a3d33660659c1a13413ef5ed5446668f3438e8ef41c4d36540f4c2a525974f8644a27d4b22362dce3e77b88400ba3fa9f63d1dbc1ab105284486
 EBUILD rhino-1.7.2-r2.ebuild 1878 SHA256 00423adb3b6e6ed14102d17e025faa31c8c4af6fd90bc446273c0cb4bce90b53 SHA512 d7835e591c5bc590a6e6d26ce804e8a9ea007918b1bef1a472faa44332b5cb349f93a81a44e9fd31f43b342e78ff93af0b610f34f808529bd20569bc42473031 WHIRLPOOL 9ba5bfd6ec590ae2bdf7de50353ab13fc3101bd9f68f31bf5c570778e21512dec2522e9b40364e65844cb1182b26669e5b73a087f8397c31b8043bbe4ce352b7
-MISC ChangeLog 10354 SHA256 057df003417359d484fd10f66768d1f0b8bc843c508dd780770a82e9724cf77d SHA512 b3611eb329e17be06aa2719f03a73f6e8c04809cd9c814ebefb2a500acc3f54a1ca2c3364b270c8d8a64fed0d22ce5bf0ae1799e4b1cb997849fbff68ef4d04f WHIRLPOOL 63198e588d7ca6fb4a15c241dcfbddfa0335b903364da223bf5f1d35ffee8762b2cf653f22fdddb47486670c1c12f34bf81c1addcb8bea236d3b1fcc42ce38b5
+EBUILD rhino-1.7.7.ebuild 2311 SHA256 963266178d0a11a0dfac810a075ceae4387adb6c3e139c0d9508b02930b6b388 SHA512 10255af38cf23af98c84a82186c9694cdc87d979c6edcd36380d627d9f68e9a2880a7915049cd4a4fb8e8a0fd0d9635ba368f747142b83d402d04547b797368e WHIRLPOOL 63a395b3c65bc5a0dd7cd7e6c5508e862c4bc297bb4561db87dc9de3e3a33d7d3f3102a8136f5f95c3f7c45784a735a121009bb35fce76759c1684b8888abe48
+MISC ChangeLog 10538 SHA256 6d6ad040d8ed73a06aefd9ace6d0768cadf67aeb9b7839b310a3d853df284b7a SHA512 181026647eb76dce9eae7dd5c34a114e5298d1c4a1e10430a85331e1cdaf88565a9161d9526f2b3c2545ebfc08caab171b2c90316c31d19e65682d2b6792166c WHIRLPOOL 9cd0d48cca139b80cd72cbd85f0b92697aadc7a485ba48a48e18629c8fa4a793ad0cf8da84eaf8a7e7ebfc2e2cb9bd5cd70c49e1fada3361ba34f05832633b88
 MISC metadata.xml 353 SHA256 ebb538112f2fe159534174fc42c3f2ea3a148f110321e4689e38761ed52d4526 SHA512 ea4f5d870776d043910a51907a193a91bfd9b0e6b3b62afe86db606a02a0dc022de0d866cf549132bc26448450f5eabb2913d1aaad998f9b562c6d5a68af3744 WHIRLPOOL c6958100cf0e04b6e6f413910746894fc6964dcf7a4cd22d49e54302d5a7f6385e8ce56d3848ed99b29064020bed1251e70aa5203a4be06606640989c253926c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVfKa5AAoJEJGRpfGTSRu4eksH/RDHk+ogt0JCJnjWF0KMVBNm
-qJC3IYR8hGuT85wKQPr98SFedi8rF2XOvBxrOlkhvVBb9xFfyEMIRlD1EOgALKbC
-Z0KoU4AodlSSsbn6OLcQuveXsl0cO+0y55Dfmuay8XE1T08pMiKe5Zw6cFtGGden
-k4npuDqyI54oPZar8tfHrCXW3tap20JMYngG0B/vylq7BCUxJ4ZgX9tYrXxy3fpf
-J0WjEX+fg2+R4S18D7sh2B2xQTUW86KVWiqAXyYboP7/W5TDYxCE6MAiqlRZ5tvs
-lVMPpCD0WAufvoipIvfvwXwdopZ3j7vnaNpzXYUvfNztb+Go7Y7J+iDnGW3SEJc=
-=qZ25
+iQEcBAEBCAAGBQJVwz7VAAoJEJGRpfGTSRu4K+4H/ivvaCJpOS3SfePkSi/RJ+6W
+VmD1fAv9UOKVIDeX3+Ao9Fe3R7z6zRM6Rpz20Y33nM/ph5CDb9iwrU1tMqdtzDsB
+RXtzNl/AdmVz3LY6623+Lq7twTzQLHP4CSudCYdL4Q+MNkI5zLotezdH/gbvmden
+BxWZNKWqwlBupt0uijjD6QYpvTkSU+sVGOWI5v7fOKKgbz9IDCCM1VdE4/Wyg9Ef
+rJx6TnXlkPZJ2ITSpVO8Err1cW+FzUvLybnjV8njRI5vIXy3f3mAJJN00OFa39ed
+5N0YpLwuyBdeazx+fy9Dhj+5cz5TLctCUVtDLO498AJHCHebXX/0BdW3e3fG1PI=
+=bUzf
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..4760e980245d
--- /dev/null
+++ b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
@@ -0,0 +1,40 @@
+--- 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.7.ebuild b/dev-java/rhino/rhino-1.7.7.ebuild
new file mode 100644
index 000000000000..2fb834d606ec
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild,v 1.1 2015/08/06 10:01:23 monsieurp Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source test"
+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.7"
+KEYWORDS="~amd64 ~ppc ~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"
+EANT_BUILD_XML="${S}/build.xml"
+EANT_BUILD_TARGET="jar"
+
+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() {
+	find . \
+		-type f \
+		-name \*.jar \
+		-print \
+		-exec rm -v {} \; || die "Couldn't delete bundled jar files."
+
+	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
+}