Version bump, various bugfixes and new dual MPL/GPL license. Adds examples use flag.

Package-Manager: portage-2.1.2.7

6 files changed, 103 insertions, 11 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 6e24f8a964ea..43d1aa347473 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.51 2007/04/15 20:15:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.52 2007/05/09 01:22:13 caster Exp $
+
+*rhino-1.6.5 (09 May 2007)
+
+  09 May 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/rhino-1.6-noget.patch, -files/jsscript, +rhino-1.6.5.ebuild:
+  Version bump, various bugfixes and new dual MPL/GPL license. Adds examples
+  use flag.
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> rhino-1.6.1-r3.ebuild:
   Stable on ppc64
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 67c6b04cd315..c6c5eac82024 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -6,10 +6,6 @@ AUX 1.5.5_jdk15.patch 1217 RMD160 49cd8abaa45dbb2901fd0835d13cbc7c50096e2a SHA1
 MD5 5ab916fbf55d8587da8547b2d264a383 files/1.5.5_jdk15.patch 1217
 RMD160 49cd8abaa45dbb2901fd0835d13cbc7c50096e2a files/1.5.5_jdk15.patch 1217
 SHA256 6c89bf649d91626f82b9cc103a34a9afd19f747aba4d6fc0c29edf51542a2b6b files/1.5.5_jdk15.patch 1217
-AUX jsscript 131 RMD160 cc052b0742907d626c3dadc2b2502d6f66394ad0 SHA1 652f8b3f3df789875b2a08f2cbfeee6bac9aef41 SHA256 407b8b2683deb948198b569bec9513201648b95657df75657f198c892145fa45
-MD5 b62e19aa798647a3e963b0b3be774776 files/jsscript 131
-RMD160 cc052b0742907d626c3dadc2b2502d6f66394ad0 files/jsscript 131
-SHA256 407b8b2683deb948198b569bec9513201648b95657df75657f198c892145fa45 files/jsscript 131
 AUX public-NativeScript.patch 456 RMD160 dc678a3f03fe078b77da6b7062079b0a2c851b5f SHA1 ce519a7d297b4bd754b889a43b8ffec669bb4ef2 SHA256 fa6d35f81e4090f38e12eed585c73c64765723064588ac4501ce47743a178422
 MD5 e06a32a7cf2d7f2daa02ac97a51cb4ef files/public-NativeScript.patch 456
 RMD160 dc678a3f03fe078b77da6b7062079b0a2c851b5f files/public-NativeScript.patch 456
@@ -18,9 +14,14 @@ AUX rhino-1.6-gentoo.patch 4761 RMD160 fdc3e62b096dbe1192521e8b050839ddebf49df9
 MD5 1efa33d52544cf9e08d6538fd15936c2 files/rhino-1.6-gentoo.patch 4761
 RMD160 fdc3e62b096dbe1192521e8b050839ddebf49df9 files/rhino-1.6-gentoo.patch 4761
 SHA256 a1a4ee1cd2e2e4b0761c559b0b68c34a49aa351978ec1221dbac19b13f2a153e files/rhino-1.6-gentoo.patch 4761
+AUX rhino-1.6-noget.patch 601 RMD160 95b374ef42a765c28dfdbaef74616da66136076c SHA1 2f9a6122834331624c16af38a9b37ce1e8619538 SHA256 2311dbd14a77dda04a6f12bed9cd973a2ba24e6fe8a0d847d49999d396319171
+MD5 6677d4ba3670a25373e3e4f5d570964f files/rhino-1.6-noget.patch 601
+RMD160 95b374ef42a765c28dfdbaef74616da66136076c files/rhino-1.6-noget.patch 601
+SHA256 2311dbd14a77dda04a6f12bed9cd973a2ba24e6fe8a0d847d49999d396319171 files/rhino-1.6-noget.patch 601
 DIST rhino-swing-ex-1.0.zip 19708 RMD160 b38f4c2d01efa779aee96246a010bbe76cf75f80 SHA1 fafdb6b3b75dd0208e27e94e4d86967e205ac542 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d
 DIST rhino1_5R5.zip 1522154 RMD160 82941b005a097cf4aa15808c7da24ce7f83f412a SHA1 8d6c7c9e18fca1f11a8db53995ed9f4bd81457d2 SHA256 d4c3c6a5724852f8e775047085fec36dbe91a9083c88dd13c4e29968acaa5526
 DIST rhino1_6R1.zip 1745003 RMD160 9394d6b3c1f9aade6e1032f0ac3f6373e2aeaa71 SHA1 fe1f0b23ed66148a5fa78c516f828a3169659001 SHA256 2540a8b3fc5ae5a44453e0c82505591ba8178f97f3ff246c33f0ea0979f668bb
+DIST rhino1_6R5.zip 1822832 RMD160 6ee94c10b3608f5f1626e132b3afda6ada79b608 SHA1 ea184746d7f5fb39c5bcb2bfa64c45a84f00665b SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f
 EBUILD rhino-1.5.5-r4.ebuild 1292 RMD160 f91c719533d6f203db05f98beec44301496d6198 SHA1 f22652257433af37e2a328f9ff82aa4155e08ee2 SHA256 7f7e55d0866639a5967e94f18e40c0350d6a843c108b915c6afbc52008f557f6
 MD5 3dcd396e346280bbacff877159f4ce76 rhino-1.5.5-r4.ebuild 1292
 RMD160 f91c719533d6f203db05f98beec44301496d6198 rhino-1.5.5-r4.ebuild 1292
@@ -29,10 +30,14 @@ EBUILD rhino-1.6.1-r3.ebuild 1345 RMD160 1bbe214848ce1022111ee855019d658abf6079b
 MD5 07af15d40c2fe91dd982d2ccd1f67a2b rhino-1.6.1-r3.ebuild 1345
 RMD160 1bbe214848ce1022111ee855019d658abf6079b0 rhino-1.6.1-r3.ebuild 1345
 SHA256 dd05c5c2807b9b4b41f2ff00fa7c3424105b745e390ea847557b63d3680bac01 rhino-1.6.1-r3.ebuild 1345
-MISC ChangeLog 6824 RMD160 37579792b8e0a17be24a1c4c3970a5685f7c32b8 SHA1 3f0ea92ad03d2c96fde75094da1aedce8d0814c6 SHA256 781c404e46bd6e6ad74974a4b6c9c6d457a48dd417ab2c1df1c1254a801931e1
-MD5 c28c48c2429a7243867e0dcf310b3989 ChangeLog 6824
-RMD160 37579792b8e0a17be24a1c4c3970a5685f7c32b8 ChangeLog 6824
-SHA256 781c404e46bd6e6ad74974a4b6c9c6d457a48dd417ab2c1df1c1254a801931e1 ChangeLog 6824
+EBUILD rhino-1.6.5.ebuild 1779 RMD160 6a7c1168f6242632c2d3a61ec39e641a7e9ff67d SHA1 e917deb4ca7c0e9c5759731343192a682dd51a86 SHA256 dcc744b75ee0319ebba22059a79dc6023910679a737600372f457c7c3bf28f23
+MD5 44d0c4b42bc55e8d18565a72771cbfac rhino-1.6.5.ebuild 1779
+RMD160 6a7c1168f6242632c2d3a61ec39e641a7e9ff67d rhino-1.6.5.ebuild 1779
+SHA256 dcc744b75ee0319ebba22059a79dc6023910679a737600372f457c7c3bf28f23 rhino-1.6.5.ebuild 1779
+MISC ChangeLog 7062 RMD160 9c254d0ae327fec4980cec2c7a2ce33931cd4309 SHA1 3435f80c576afc3a69537b6d3fa583d6739ece8a SHA256 dc4d90975359c8ad7e3e2d88c25d53c4edd8b7c690e0864132f9c54aa108697e
+MD5 3240efb628a8715c1459417ee78533cc ChangeLog 7062
+RMD160 9c254d0ae327fec4980cec2c7a2ce33931cd4309 ChangeLog 7062
+SHA256 dc4d90975359c8ad7e3e2d88c25d53c4edd8b7c690e0864132f9c54aa108697e ChangeLog 7062
 MISC metadata.xml 353 RMD160 68e8023dada8494a67ae2ddd6b0a89f9cc62c586 SHA1 b78b9bbcefac164e9bcb4888b2fb1bffe0785bac SHA256 ebb538112f2fe159534174fc42c3f2ea3a148f110321e4689e38761ed52d4526
 MD5 cd072c1815d476a2caab32526dfde7e0 metadata.xml 353
 RMD160 68e8023dada8494a67ae2ddd6b0a89f9cc62c586 metadata.xml 353
@@ -43,3 +48,6 @@ SHA256 110c6e2cf99fc58008ca4da2046f1ec02ff30da660d29d8523121a0e0cd03946 files/di
 MD5 5c0f53e6b8effc4a421d36a5a1b9e279 files/digest-rhino-1.6.1-r3 470
 RMD160 28e8d8b578d3f787e422e596c6074b19597ff30d files/digest-rhino-1.6.1-r3 470
 SHA256 bca77f5a296498a7b5a2cf608077e6b5d72f5387c055e201d7179c5e8d72fb98 files/digest-rhino-1.6.1-r3 470
+MD5 b9547581a3ca0ba4c30caced0d3c926e files/digest-rhino-1.6.5 470
+RMD160 14d041039bb95123f0de195015ba87a22d48dc48 files/digest-rhino-1.6.5 470
+SHA256 126a806cd9fd5ec375452fc30171b3e3e03954ce8c87c2388cf3eeb042dab668 files/digest-rhino-1.6.5 470
diff --git a/dev-java/rhino/files/digest-rhino-1.6.5 b/dev-java/rhino/files/digest-rhino-1.6.5
new file mode 100644
index 000000000000..f5a951d63d18
--- /dev/null
+++ b/dev-java/rhino/files/digest-rhino-1.6.5
@@ -0,0 +1,6 @@
+MD5 ab016c8f81812bb930fc0f7a69e053c5 rhino-swing-ex-1.0.zip 19708
+RMD160 b38f4c2d01efa779aee96246a010bbe76cf75f80 rhino-swing-ex-1.0.zip 19708
+SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d rhino-swing-ex-1.0.zip 19708
+MD5 c93b6d0bb8ba83c3760efeb30525728a rhino1_6R5.zip 1822832
+RMD160 6ee94c10b3608f5f1626e132b3afda6ada79b608 rhino1_6R5.zip 1822832
+SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f rhino1_6R5.zip 1822832
diff --git a/dev-java/rhino/files/jsscript b/dev-java/rhino/files/jsscript
deleted file mode 100644
index aaf2cb5837c6..000000000000
--- a/dev-java/rhino/files/jsscript
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec $(java-config --java) -classpath $(java-config --classpath=rhino-@SLOT@) org.mozilla.javascript.tools.shell.Main $@
diff --git a/dev-java/rhino/files/rhino-1.6-noget.patch b/dev-java/rhino/files/rhino-1.6-noget.patch
new file mode 100644
index 000000000000..235091428392
--- /dev/null
+++ b/dev-java/rhino/files/rhino-1.6-noget.patch
@@ -0,0 +1,12 @@
+diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+index 7ed0236..5f7db6e 100644
+--- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
++++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+@@ -47,7 +47,6 @@
+          the files we don't need, and change the package
+     -->
+     <mkdir dir="downloaded"/>
+-    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
+     <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
+       <patternset>
+           <include name="AbstractCellEditor.java"/>
diff --git a/dev-java/rhino/rhino-1.6.5.ebuild b/dev-java/rhino/rhino-1.6.5.ebuild
new file mode 100644
index 000000000000..dabf094d8b11
--- /dev/null
+++ b/dev-java/rhino/rhino-1.6.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.5.ebuild,v 1.1 2007/05/09 01:22:13 caster Exp $
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND=">=dev-java/xml-xmlbeans-20041217"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	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
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_P}/js.jar
+
+	java-pkg_dolauncher jsscript-${SLOT} \
+		--main org.mozilla.javascript.tools.shell.Main
+
+	if use doc; then
+		local dir="build/${MY_P}/docs"
+		mv "${dir}"/{apidocs,api} || die
+		java-pkg_dohtml -r "${dir}"/*
+		dosym /usr/share/doc/${PF}/html/{api,apidocs} || die
+	fi
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
+}