Fixed slot problem in jsscript. Also fixed collison between 1.5 and 1.6 over

(Portage version: 2.1_pre3-r1)

8 files changed, 131 insertions, 24 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 795b04e57ab6..0bb6e876af44 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/rhino
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.32 2005/08/22 19:03:30 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.33 2006/01/15 18:50:54 nichoj Exp $
+
+*rhino-1.6.1-r2 (15 Jan 2006)
+*rhino-1.5.5-r2 (15 Jan 2006)
+
+  15 Jan 2006; Joshua Nichols <nichoj@gentoo.org> files/jsscript,
+  +rhino-1.5.5-r2.ebuild, rhino-1.6.1-r1.ebuild, +rhino-1.6.1-r2.ebuild:
+  Fixed slot problem in jsscript (bug #118863). Also fixed collison between 
+  1.5 and 1.6 over /usr/bin/jsscript.
 
   22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> rhino-1.6.1-r1.ebuild:
   Stable on sparc
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 399fcf4a6284..ef447beb9ca8 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b917f41dd459a26bfd57f6123ee48614 rhino-1.6.1-r1.ebuild 1435
-MD5 4622606981d4aa0930c917b65cf2f202 metadata.xml 350
-MD5 ffada4f238f8cbf3ee67e1bd469e9f7b rhino-1.5.5-r1.ebuild 1411
-MD5 079da13baee4ccd6aff47a73723f5436 ChangeLog 4088
-MD5 1efa33d52544cf9e08d6538fd15936c2 files/rhino-1.6-gentoo.patch 4761
-MD5 c663f3b82777d7ee2506dc0a03955198 files/jsscript 123
-MD5 bba5a68c73328abd7ba67bcf3e828452 files/digest-rhino-1.6.1-r1 126
+MD5 9f7c9d7a16fbf1e277fa9c42b7ad024f ChangeLog 4336
 MD5 0a5ef83b30538dd468f24d14be07769f files/00_dont-fetch-swing-ex.patch 604
-MD5 6d48e39fc85ff462180102a36f8fc589 files/digest-rhino-1.5.5-r1 126
 MD5 5ab916fbf55d8587da8547b2d264a383 files/1.5.5_jdk15.patch 1217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDCiGgKRy60XGEcJIRApsZAJwI73FIcUbW4ZvWWGpjqSm/wYNXxACbBvSV
-0zDpDe2LOzqpRpVvj+d1dvk=
-=5cCZ
------END PGP SIGNATURE-----
+MD5 6d48e39fc85ff462180102a36f8fc589 files/digest-rhino-1.5.5-r1 126
+MD5 6d48e39fc85ff462180102a36f8fc589 files/digest-rhino-1.5.5-r2 126
+MD5 bba5a68c73328abd7ba67bcf3e828452 files/digest-rhino-1.6.1-r1 126
+MD5 f3a738648094cfa4a28969b09671c3e2 files/digest-rhino-1.6.1-r2 126
+MD5 b62e19aa798647a3e963b0b3be774776 files/jsscript 131
+MD5 1efa33d52544cf9e08d6538fd15936c2 files/rhino-1.6-gentoo.patch 4761
+MD5 4622606981d4aa0930c917b65cf2f202 metadata.xml 350
+MD5 ffada4f238f8cbf3ee67e1bd469e9f7b rhino-1.5.5-r1.ebuild 1411
+MD5 4ef9f6b4f7a43d49a3daf4eb63825af3 rhino-1.5.5-r2.ebuild 1498
+MD5 bb5fffa1fbad2a2b3de4f21b9e124970 rhino-1.6.1-r1.ebuild 1504
+MD5 ab0a06cc6300e28f0dc5bdee1631b611 rhino-1.6.1-r2.ebuild 1522
diff --git a/dev-java/rhino/files/digest-rhino-1.5.5-r2 b/dev-java/rhino/files/digest-rhino-1.5.5-r2
new file mode 100644
index 000000000000..bd31613bb165
--- /dev/null
+++ b/dev-java/rhino/files/digest-rhino-1.5.5-r2
@@ -0,0 +1,2 @@
+MD5 af27c07d75bd1697883691318e6da70d rhino1_5R5.zip 1522154
+MD5 ab016c8f81812bb930fc0f7a69e053c5 rhino-swing-ex-1.0.zip 19708
diff --git a/dev-java/rhino/files/digest-rhino-1.6.1-r2 b/dev-java/rhino/files/digest-rhino-1.6.1-r2
new file mode 100644
index 000000000000..993cd855c615
--- /dev/null
+++ b/dev-java/rhino/files/digest-rhino-1.6.1-r2
@@ -0,0 +1,2 @@
+MD5 ab016c8f81812bb930fc0f7a69e053c5 rhino-swing-ex-1.0.zip 19708
+MD5 a110bd2c661a5b935dda4d3bd430348d rhino1_6R1.zip 1745003
diff --git a/dev-java/rhino/files/jsscript b/dev-java/rhino/files/jsscript
index 31d1760e869e..aaf2cb5837c6 100644
--- a/dev-java/rhino/files/jsscript
+++ b/dev-java/rhino/files/jsscript
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec $(java-config --java) -classpath $(java-config --classpath=rhino) org.mozilla.javascript.tools.shell.Main $@
\ No newline at end of file
+exec $(java-config --java) -classpath $(java-config --classpath=rhino-@SLOT@) org.mozilla.javascript.tools.shell.Main $@
diff --git a/dev-java/rhino/rhino-1.5.5-r2.ebuild b/dev-java/rhino/rhino-1.5.5-r2.ebuild
new file mode 100644
index 000000000000..4ef4d6a868ac
--- /dev/null
+++ b/dev-java/rhino/rhino-1.5.5-r2.ebuild
@@ -0,0 +1,47 @@
+# 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-r2.ebuild,v 1.1 2006/01/15 18:50:54 nichoj Exp $
+
+inherit eutils java-pkg
+
+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="x86 ppc amd64 sparc ppc64"
+IUSE="jikes doc source"
+S="${WORKDIR}/${MY_P}"
+DEPEND="dev-java/ant-core
+	>=virtual/jdk-1.3
+	app-arch/unzip
+	source? ( app-arch/zip )
+	jikes? ( dev-java/jikes )"
+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
+	cp ${DISTDIR}/rhino-swing-ex-1.0.zip build/swingExSrc.zip || die "unpack error"
+
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation error"
+
+	cp ${FILESDIR}/jsscript ${T}
+	sed -i -e "s/@SLOT@/${SLOT}/" ${T}/jsscript
+}
+
+src_install() {
+	newbin ${T}/jsscript jsscript-${SLOT}
+	java-pkg_dojar build/*/js.jar
+	use source && java-pkg_dosrc {src,toolsrc}/org
+	use doc && java-pkg_dohtml -r docs/*
+}
diff --git a/dev-java/rhino/rhino-1.6.1-r1.ebuild b/dev-java/rhino/rhino-1.6.1-r1.ebuild
index 6d7626e9908e..9392943e96a2 100644
--- a/dev-java/rhino/rhino-1.6.1-r1.ebuild
+++ b/dev-java/rhino/rhino-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.6.1-r1.ebuild,v 1.5 2005/08/22 19:03:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.1-r1.ebuild,v 1.6 2006/01/15 18:50:54 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -38,10 +38,13 @@ src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compilation error"
+
+	cp ${FILESDIR}/jsscript ${T}
+	sed -i -e "s/@SLOT@/${SLOT}/" ${T}/jsscript
 }
 
 src_install() {
-	dobin ${FILESDIR}/jsscript
+	dobin ${T}/jsscript
 	java-pkg_dojar build/*/js.jar
 	use source && java-pkg_dosrc {src,toolsrc}/org
 	use doc && java-pkg_dohtml -r docs/*
diff --git a/dev-java/rhino/rhino-1.6.1-r2.ebuild b/dev-java/rhino/rhino-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..3f5e21f37a22
--- /dev/null
+++ b/dev-java/rhino/rhino-1.6.1-r2.ebuild
@@ -0,0 +1,51 @@
+# 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.6.1-r2.ebuild,v 1.1 2006/01/15 18:50:54 nichoj Exp $
+
+inherit java-pkg eutils
+
+MY_P="rhino1_6R1"
+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.6"
+KEYWORDS="~amd64 x86 sparc"
+IUSE="jikes doc source"
+S="${WORKDIR}/${MY_P}"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/xml-xmlbeans-20041217"
+DEPEND="dev-java/ant-core
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	source? ( app-arch/zip )
+	jikes? ( dev-java/jikes )
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd ${S}
+
+	epatch ${FILESDIR}/rhino-1.6-gentoo.patch
+
+	cp ${DISTDIR}/rhino-swing-ex-1.0.zip swingExSrc.zip
+
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation error"
+
+	cp ${FILESDIR}/jsscript ${T}
+	sed -i -e "s/@SLOT@/${SLOT}/" ${T}/jsscript
+}
+
+src_install() {
+	newbin ${T}/jsscript jsscript-${SLOT}
+	java-pkg_dojar build/*/js.jar
+	use source && java-pkg_dosrc {src,toolsrc}/org
+	use doc && java-pkg_dohtml -r docs/*
+}