Remove the jsr173 dep which is not needed. Bug #313573 thanks to Andrew John Hughes <gnu_andrew@member.fsf.org>.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 72 insertions, 2 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 9e958fd2ed46..ecb9b3f696b5 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/rhino
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.64 2010/04/01 20:12:57 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.65 2010/04/06 22:11:51 caster Exp $
+
+*rhino-1.7.2-r2 (06 Apr 2010)
+
+  06 Apr 2010; Vlastimil Babka <caster@gentoo.org> +rhino-1.7.2-r2.ebuild:
+  Remove the jsr173 dep which is not needed. Bug #313573 thanks to Andrew
+  John Hughes <gnu_andrew@member.fsf.org>.
 
 *rhino-1.7.2-r1 (01 Apr 2010)
 
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 2763ac301fb9..dc818430b360 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -11,6 +11,7 @@ EBUILD rhino-1.5.5-r4.ebuild 1292 RMD160 f91c719533d6f203db05f98beec44301496d619
 EBUILD rhino-1.5.5-r5.ebuild 1296 RMD160 b9d5b12fb8ff637f660a3687e1f5f1230351ba4e SHA1 075191d35dab40fdbdbd08278dc76de80aad273e SHA256 8a46bf64c7766c56a8de395e630195bb0ff6a00b04f18cfa7b42fd4a8a7adf81
 EBUILD rhino-1.6.5.ebuild 1821 RMD160 f5b7122d2666f123cae789faf109f9f49327fcda SHA1 d84d3a3657d03b5f44f22ef5ec3f1c48e033ae97 SHA256 672d80c34ac7fa98fc9a2876ab9aba74a622bbaaa76ab80be9ccd142c9e6a042
 EBUILD rhino-1.7.2-r1.ebuild 1892 RMD160 aa841dc53240b41188313f6e9ace9ea38d0db58a SHA1 ae6392bdb300e2e2a96127d0b76e3b38a49772bf SHA256 24aef8665cb1ba10f9d435f512cfc0e897d36c0118ffc48ba6740a4f390627d1
+EBUILD rhino-1.7.2-r2.ebuild 1845 RMD160 0cbf204b480d9f1ac7ce12649e8033b6cbe255ad SHA1 e89cc6916bcf8569b5883c55ab4fcd6243c4247c SHA256 474343e6aa692a0767bdc5a3bd5fcf81754b0b672480f21956a0032f13b4c3d2
 EBUILD rhino-1.7.2.ebuild 1706 RMD160 bea16810a98b4b8732d823f10200292d8c7ae1da SHA1 04eec2c7b573fffba5ab1917c84016b19e312b7d SHA256 e29c3c3753ec26c401c572f16090055ac0e01d9f4822a259300ebe5d7542d72d
-MISC ChangeLog 8476 RMD160 2df62989ddf0b29115c3173f53ab0a4ad1da71a8 SHA1 c9b389b47b34f2a123cd2bc8ce2e007f684a2162 SHA256 c507e5aabf3b5a7ad072280cab7126052cb7fcf8d6baba9e3fd68a7ff630f0c5
+MISC ChangeLog 8698 RMD160 0cfc890bffc13ef867f015315aa0fe1af5649dfd SHA1 6a926866e17c0477a7635e617a1f590d1db6c4b8 SHA256 f00c3416b0ddaeafd84b67bb6644a33a786d6f7f90e76f20661f0c0bed0bd756
 MISC metadata.xml 353 RMD160 68e8023dada8494a67ae2ddd6b0a89f9cc62c586 SHA1 b78b9bbcefac164e9bcb4888b2fb1bffe0785bac SHA256 ebb538112f2fe159534174fc42c3f2ea3a148f110321e4689e38761ed52d4526
diff --git a/dev-java/rhino/rhino-1.7.2-r2.ebuild b/dev-java/rhino/rhino-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..1208bafa3554
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.2-r2.ebuild,v 1.1 2010/04/06 22:11:51 caster Exp $
+
+EAPI="1"
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java."
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
+	mirror://gentoo/rhino-swing-ex-1.0.zip"
+HOMEPAGE="http://www.mozilla.org/rhino/"
+# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
+LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
+SLOT="1.6"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="=dev-java/xml-xmlbeans-1*"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${S}"
+
+	# don't download src.zip from Sun
+	epatch "${FILESDIR}/rhino-1.6-noget.patch"
+
+	rm -v *.jar || die
+	rm -rf docs/apidocs || die
+
+	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
+	mkdir ${dir} || die
+	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
+
+	mkdir lib/ && cd lib/ || die
+	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
+
+	# Stop downloading of deps
+	cd "${S}"
+	mkdir -p build/tmp-xbean
+	touch build/tmp-xbean/xbean.zip
+	touch lib/jsr173_1.0_api.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
+}