Revision bump to support new Java system.

(Portage version: 2.1.1_pre1)

6 files changed, 83 insertions, 4 deletions

diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 1fdfa1775dc8..9e103e2871c1 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/bsh
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.28 2005/09/11 11:45:27 axxo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.29 2006/07/04 19:26:05 nichoj Exp $
+
+*bsh-2.0_beta4-r1 (04 Jul 2006)
+
+  04 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +bsh-2.0_beta4-r1.ebuild:
+  Revision bump to support new Java system.
 
   11 Sep 2005; Thomas Matthijs <axxo@gentoo.org> bsh-2.0_beta4.ebuild:
   fix icon
diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..f20a1ab145d1
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r1.ebuild,v 1.1 2006/07/04 19:26:05 nichoj Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_PV=${PV/_beta/b}
+MY_DIST=${PN}-${MY_PV}-src.jar
+
+DESCRIPTION="BeanShell: A small embeddable Java source interpreter"
+HOMEPAGE="http://www.beanshell.org"
+SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc readline source"
+
+RDEPEND=">=virtual/jdk-1.4
+	=dev-java/bsf-2.3*
+	=dev-java/servletapi-2.4*
+	readline? ( dev-java/libreadline-java )"
+DEPEND="${RDEPEND}
+	source? ( app-arch/zip )
+	>=dev-java/ant-core-1.6"
+
+S=${WORKDIR}/BeanShell-${MY_PV}
+
+ant_src_unpack() {
+	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
+	cd ${S}
+
+	epatch ${FILESDIR}/bsh${MY_PV}-build.patch
+
+	cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S}
+
+	use readline && epatch ${FILESDIR}/bsh2-readline.patch
+}
+
+src_compile() {
+	local classpath="bsf-2.3,servletapi-2.4"
+	use readline && classpath="${classpath},libreadline-java"
+
+	eant -lib $(java-pkg_getjars ${classpath}) $(use_doc) jarall
+}
+
+src_install() {
+	java-pkg_newjar ${S}/dist/${P/_beta/b}.jar
+
+	use source && java-pkg_dosrc src/bsh
+
+	java-pkg_dolauncher bsh-console --main bsh.Console
+	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
+
+	use doc && java-pkg_dohtml -r ${S}/javadoc/*
+
+	newicon ${DISTDIR}/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
diff --git a/dev-java/bsh/files/digest-bsh-1.3.0 b/dev-java/bsh/files/digest-bsh-1.3.0
index 7fafbf12c581..f510979a0afb 100644
--- a/dev-java/bsh/files/digest-bsh-1.3.0
+++ b/dev-java/bsh/files/digest-bsh-1.3.0
@@ -1 +1,3 @@
 MD5 62f7c5a502a38d0ad2756a07a04c83a4 bsh-1.3.0.jar 242154
+RMD160 a566b467d552fe530ac5ac7e424702069d920a51 bsh-1.3.0.jar 242154
+SHA256 9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8 bsh-1.3.0.jar 242154
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta1-r1 b/dev-java/bsh/files/digest-bsh-2.0_beta1-r1
index a1e936552815..cc0912b7e21e 100644
--- a/dev-java/bsh/files/digest-bsh-2.0_beta1-r1
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta1-r1
@@ -1,2 +1,4 @@
-MD5 ad5832b1def4c34cd1c959b502c7bc86 bsh-2.0b1.jar 280683
 MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784
+RMD160 0953be1f3046c795d36d0a95577c7b0230eb5d03 beanshell-icon.png 29784
+SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 beanshell-icon.png 29784
+MD5 ad5832b1def4c34cd1c959b502c7bc86 bsh-2.0b1.jar 280683
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta4 b/dev-java/bsh/files/digest-bsh-2.0_beta4
index 4e631a50837a..c4de698ae3cf 100644
--- a/dev-java/bsh/files/digest-bsh-2.0_beta4
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta4
@@ -1,2 +1,6 @@
-MD5 49c9cc9872f26d562bffb1e5ec8aa377 bsh-2.0b4-src.jar 1636723
 MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784
+RMD160 0953be1f3046c795d36d0a95577c7b0230eb5d03 beanshell-icon.png 29784
+SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 beanshell-icon.png 29784
+MD5 49c9cc9872f26d562bffb1e5ec8aa377 bsh-2.0b4-src.jar 1636723
+RMD160 710b4658bf05f99c9ca68498ebf75e7d6cc27e27 bsh-2.0b4-src.jar 1636723
+SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e bsh-2.0b4-src.jar 1636723
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta4-r1 b/dev-java/bsh/files/digest-bsh-2.0_beta4-r1
new file mode 100644
index 000000000000..c4de698ae3cf
--- /dev/null
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta4-r1
@@ -0,0 +1,6 @@
+MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784
+RMD160 0953be1f3046c795d36d0a95577c7b0230eb5d03 beanshell-icon.png 29784
+SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 beanshell-icon.png 29784
+MD5 49c9cc9872f26d562bffb1e5ec8aa377 bsh-2.0b4-src.jar 1636723
+RMD160 710b4658bf05f99c9ca68498ebf75e7d6cc27e27 bsh-2.0b4-src.jar 1636723
+SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e bsh-2.0b4-src.jar 1636723