Merged changes with gcj-overlay, bug #145769.

Package-Manager: portage-2.1.2_pre2

5 files changed, 81 insertions, 5 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 90a577d186c9..44181304431b 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.39 2006/09/10 23:57:31 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.40 2006/10/04 03:31:37 nichoj Exp $
+
+*rhino-1.5.5-r4 (04 Oct 2006)
+
+  04 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/public-NativeScript.patch, +rhino-1.5.5-r4.ebuild:
+  Merged changes with gcj-overlay, bug #145769.
 
   11 Sep 2006; Joshua Nichols <nichoj@gentoo.org> rhino-1.5.5-r3.ebuild:
   Added ~ia64 keywords.
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index e9b146072c29..48f25d51f41f 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -10,6 +10,10 @@ AUX jsscript 131 RMD160 cc052b0742907d626c3dadc2b2502d6f66394ad0 SHA1 652f8b3f3d
 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
+SHA256 fa6d35f81e4090f38e12eed585c73c64765723064588ac4501ce47743a178422 files/public-NativeScript.patch 456
 AUX rhino-1.6-gentoo.patch 4761 RMD160 fdc3e62b096dbe1192521e8b050839ddebf49df9 SHA1 ae5a2ac7f6b608ca7c03244cc341a036c901e63a SHA256 a1a4ee1cd2e2e4b0761c559b0b68c34a49aa351978ec1221dbac19b13f2a153e
 MD5 1efa33d52544cf9e08d6538fd15936c2 files/rhino-1.6-gentoo.patch 4761
 RMD160 fdc3e62b096dbe1192521e8b050839ddebf49df9 files/rhino-1.6-gentoo.patch 4761
@@ -29,6 +33,10 @@ EBUILD rhino-1.5.5-r3.ebuild 1358 RMD160 8880a7a18221c1d25b05d7fd2f1ab074975ac22
 MD5 992c306afb033c84455e5fcbd72c8d14 rhino-1.5.5-r3.ebuild 1358
 RMD160 8880a7a18221c1d25b05d7fd2f1ab074975ac227 rhino-1.5.5-r3.ebuild 1358
 SHA256 9871583f73288c1b6d722c957cd6e4b41f52cb0f525a3781064096178831c869 rhino-1.5.5-r3.ebuild 1358
+EBUILD rhino-1.5.5-r4.ebuild 1404 RMD160 965e462187bbe6f29d7c495577379240425c3496 SHA1 b574d61146e13b329e5f70a74cad4938b0747007 SHA256 14b4de67721378d802ba801f7b0a51c6daaa142d09cc16cc7360ef5355918ff3
+MD5 727ae4d041542e239a1bf5c106189e21 rhino-1.5.5-r4.ebuild 1404
+RMD160 965e462187bbe6f29d7c495577379240425c3496 rhino-1.5.5-r4.ebuild 1404
+SHA256 14b4de67721378d802ba801f7b0a51c6daaa142d09cc16cc7360ef5355918ff3 rhino-1.5.5-r4.ebuild 1404
 EBUILD rhino-1.6.1-r1.ebuild 1502 RMD160 67f806fafe1bd4893317bfcdeb4025fb5601995c SHA1 21890f2c944c63b8d38201b8d0c7f64a5069438b SHA256 dd90a2974d9048d674e5b17eb9652a2c8fd7635900a80fe6ecaa2b6e4e2dab67
 MD5 269e1cdae8100cb542bf58898ac4e044 rhino-1.6.1-r1.ebuild 1502
 RMD160 67f806fafe1bd4893317bfcdeb4025fb5601995c rhino-1.6.1-r1.ebuild 1502
@@ -41,10 +49,10 @@ EBUILD rhino-1.6.1-r3.ebuild 1362 RMD160 0d8d4e84c0a967e602f2433c4ebd0222600fc7d
 MD5 85c95917d8e046af0b7a0a94b51a6aa2 rhino-1.6.1-r3.ebuild 1362
 RMD160 0d8d4e84c0a967e602f2433c4ebd0222600fc7d0 rhino-1.6.1-r3.ebuild 1362
 SHA256 35066cd0c3b6076e48fede7a6b3ece1e37cce39d01a46f1522843bb5d5054b78 rhino-1.6.1-r3.ebuild 1362
-MISC ChangeLog 5057 RMD160 2ed7f8b196ef25ddeea6b5091f7592296219dae5 SHA1 89a98212dba7bf79fb91074092482e14c0c2ac5a SHA256 53edd1b7d8619c9ba4cf62d8a7e1946dd290d4f00691b409e70a80baab64e7a2
-MD5 11422e56c00a60e006f264d70780243a ChangeLog 5057
-RMD160 2ed7f8b196ef25ddeea6b5091f7592296219dae5 ChangeLog 5057
-SHA256 53edd1b7d8619c9ba4cf62d8a7e1946dd290d4f00691b409e70a80baab64e7a2 ChangeLog 5057
+MISC ChangeLog 5247 RMD160 00c0aa56efc2c0305016f6380eb9e0f07503da55 SHA1 8a0fb3667522cccc2aed80260ba38390dc9371b6 SHA256 10a842603a80ec1b69070b125f97771707087c65f5365c4049757d617be96358
+MD5 a77479fd74cd5e6726959433be806ebc ChangeLog 5247
+RMD160 00c0aa56efc2c0305016f6380eb9e0f07503da55 ChangeLog 5247
+SHA256 10a842603a80ec1b69070b125f97771707087c65f5365c4049757d617be96358 ChangeLog 5247
 MISC metadata.xml 350 RMD160 a9d78137a7a27bfe6e5972bad36be52b4f5bbbbd SHA1 9715b952c35b52321cbdd1185a42bc4f47f34780 SHA256 99be7320ab28fea03c64ed9eed1d068e09a3b9cdbd61e2014cacf9450417a01a
 MD5 4622606981d4aa0930c917b65cf2f202 metadata.xml 350
 RMD160 a9d78137a7a27bfe6e5972bad36be52b4f5bbbbd metadata.xml 350
@@ -58,6 +66,9 @@ SHA256 110c6e2cf99fc58008ca4da2046f1ec02ff30da660d29d8523121a0e0cd03946 files/di
 MD5 38a1e64d30308d01a40d7b624c43ae38 files/digest-rhino-1.5.5-r3 470
 RMD160 6d35f030bb39be863019982fb24be9ab8d3c0415 files/digest-rhino-1.5.5-r3 470
 SHA256 110c6e2cf99fc58008ca4da2046f1ec02ff30da660d29d8523121a0e0cd03946 files/digest-rhino-1.5.5-r3 470
+MD5 38a1e64d30308d01a40d7b624c43ae38 files/digest-rhino-1.5.5-r4 470
+RMD160 6d35f030bb39be863019982fb24be9ab8d3c0415 files/digest-rhino-1.5.5-r4 470
+SHA256 110c6e2cf99fc58008ca4da2046f1ec02ff30da660d29d8523121a0e0cd03946 files/digest-rhino-1.5.5-r4 470
 MD5 5c0f53e6b8effc4a421d36a5a1b9e279 files/digest-rhino-1.6.1-r1 470
 RMD160 28e8d8b578d3f787e422e596c6074b19597ff30d files/digest-rhino-1.6.1-r1 470
 SHA256 bca77f5a296498a7b5a2cf608077e6b5d72f5387c055e201d7179c5e8d72fb98 files/digest-rhino-1.6.1-r1 470
diff --git a/dev-java/rhino/files/digest-rhino-1.5.5-r4 b/dev-java/rhino/files/digest-rhino-1.5.5-r4
new file mode 100644
index 000000000000..1078c97e48b6
--- /dev/null
+++ b/dev-java/rhino/files/digest-rhino-1.5.5-r4
@@ -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 af27c07d75bd1697883691318e6da70d rhino1_5R5.zip 1522154
+RMD160 82941b005a097cf4aa15808c7da24ce7f83f412a rhino1_5R5.zip 1522154
+SHA256 d4c3c6a5724852f8e775047085fec36dbe91a9083c88dd13c4e29968acaa5526 rhino1_5R5.zip 1522154
diff --git a/dev-java/rhino/files/public-NativeScript.patch b/dev-java/rhino/files/public-NativeScript.patch
new file mode 100644
index 000000000000..026bcedb0e55
--- /dev/null
+++ b/dev-java/rhino/files/public-NativeScript.patch
@@ -0,0 +1,11 @@
+--- rhino1_5R5/src/org/mozilla/javascript/NativeScript.java.orig	2006-05-31 14:01:06.000000000 +0200
++++ rhino1_5R5/src/org/mozilla/javascript/NativeScript.java	2006-05-31 14:03:37.000000000 +0200
+@@ -55,7 +55,7 @@
+  * @author Norris Boyd

+  */

+ 

+-class NativeScript extends NativeFunction implements Script

++public class NativeScript extends NativeFunction implements Script

+ {

+ 

+     static void init(Context cx, Scriptable scope, boolean sealed)

diff --git a/dev-java/rhino/rhino-1.5.5-r4.ebuild b/dev-java/rhino/rhino-1.5.5-r4.ebuild
new file mode 100644
index 000000000000..5e20f4ecd351
--- /dev/null
+++ b/dev-java/rhino/rhino-1.5.5-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r4.ebuild,v 1.1 2006/10/04 03:31:37 nichoj Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="rhino1_5R5"
+DESCRIPTION="Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically embedded into Java applications to provide scripting to end users"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip http://dev.gentoo.org/~karltk/projects/java/distfiles/rhino-swing-ex-1.0.zip"
+HOMEPAGE="http://www.mozilla.org/rhino/"
+LICENSE="NPL-1.1"
+SLOT="1.5"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc source"
+S="${WORKDIR}/${MY_P}"
+DEPEND="dev-java/ant-core
+	>=virtual/jdk-1.3
+	app-arch/unzip
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd ${S}
+	mkdir build/
+	epatch ${FILESDIR}/${PV}_jdk15.patch
+	epatch ${FILESDIR}/00_dont-fetch-swing-ex.patch
+	epatch ${FILESDIR}/public-NativeScript.patch
+	cp ${DISTDIR}/rhino-swing-ex-1.0.zip build/swingExSrc.zip || die "unpack error"
+}
+
+src_compile() {
+	eant jar
+}
+
+src_install() {
+	java-pkg_dolauncher jsscript-${SLOT} \
+		--main org.mozilla.javascript.tools.shell.Main
+	java-pkg_dojar build/*/js.jar
+	use source && java-pkg_dosrc {src,toolsrc}/org
+	use doc && java-pkg_dohtml -r docs/*
+}