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

(Portage version: 2.1.2.7)

5 files changed, 87 insertions, 3 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/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
+}