4 files changed, 92 insertions, 6 deletions
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 1f72d376e2a8..f051704f1e6d 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.24 2005/04/08 14:52:10 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.25 2005/06/22 17:22:37 axxo Exp $
+
+*bsh-2.0_beta4 (22 Jun 2005)
+
+  22 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +bsh-2.0_beta4.ebuild:
+  version bump
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> bsh-2.0_beta1-r1.ebuild:
   Stable on ppc64
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index fde8fd192d8d..4dbdcf30a853 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,13 +1,15 @@
-MD5 b0484e577fde4ebd8f953dd84ce04392 ChangeLog 3175
-MD5 8bd71a260abed0bb42193acb1ec2c8df bsh-1.3.0.ebuild 870
 MD5 3e9db06b96be80b9500257a94feb42f8 bsh-2.0_beta1-r1.ebuild 1175
+MD5 8bd71a260abed0bb42193acb1ec2c8df bsh-1.3.0.ebuild 870
 MD5 550ad7ad9811ed65d58f9c04f25e64bf bsh-2.0_beta2.ebuild 2057
+MD5 b0484e577fde4ebd8f953dd84ce04392 ChangeLog 3175
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266
+MD5 550ad7ad9811ed65d58f9c04f25e64bf bsh-2.0_beta4.ebuild 2057
+MD5 5ec33004601026e3f5206a441853b1ed files/digest-bsh-1.3.0 58
 MD5 e98c8ab811f673d6089a092d3b8a3d97 files/bsh.Console 856
 MD5 c0ad0331cfc0855056051a83d34fc35f files/bsh.Interpreter 871
 MD5 af516cc82d6597c5f6f49ad83916647e files/bsh2-build.patch 1704
+MD5 b2666166806a0cf58b311a9a77511fdb files/digest-bsh-2.0_beta2 125
+MD5 ce8a7b633b68257eda454f9739f56801 files/digest-bsh-2.0_beta4 125
 MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428
-MD5 5ec33004601026e3f5206a441853b1ed files/digest-bsh-1.3.0 58
 MD5 0321e1ba45e1f4f328eae0eecf037105 files/digest-bsh-2.0_beta1-r1 120
-MD5 b2666166806a0cf58b311a9a77511fdb files/digest-bsh-2.0_beta2 125
+MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266
diff --git a/dev-java/bsh/bsh-2.0_beta4.ebuild b/dev-java/bsh/bsh-2.0_beta4.ebuild
new file mode 100644
index 000000000000..873a0904d0dc
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/06/22 17:22:37 axxo Exp $
+
+inherit java-pkg eutils
+
+MY_DIST=${P/_beta/b}-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 gnome jikes junit kde readline"
+
+DEPEND="${RDEPEND}
+		>=dev-java/ant-core-1.5.4"
+RDEPEND=">=virtual/jdk-1.4
+	=dev-java/bsf-2.3*
+	=dev-java/servletapi-2.4*
+	readline? ( dev-java/libreadline-java )"
+
+S=${WORKDIR}/BeanShell
+
+src_unpack() {
+	# Extract the sources
+	cd ${WORKDIR}
+	jar xf ${DISTDIR}/${MY_DIST}
+
+	# Apply the build patch
+	cd ${S}
+	epatch ${FILESDIR}/bsh2-build.patch
+
+	# Copy the needed files
+	cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S}
+
+	# Patch with readline if required
+	if use readline ; then
+		# Apply the patch
+		epatch ${FILESDIR}/bsh2-readline.patch
+
+		# Update the classpath
+		local ADD_CLASSPATH="`java-config -p libreadline-java`"
+		sed -e "s:__ADD_CLASSPATH__:${ADD_CLASSPATH}:" \
+		    -i ${S}/bsh.Console \
+			-i ${S}/bsh.Interpreter
+	fi
+}
+
+src_compile() {
+	local classpath="bsf-2.3,servletapi-2.4"
+	use readline && classpath="${classpath},libreadline-java"
+	classpath=`java-config -p ${classpath}`
+
+	local antflags="jarall"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant -lib ${classpath} ${antflags} || die "Compile Failed!"
+}
+
+src_install() {
+	mv ${S}/dist/${P/_beta/b}.jar ${S}/dist/${PN}.jar
+	java-pkg_dojar ${S}/dist/${PN}.jar
+
+	newbin ${S}/bsh.Console bsh-console
+	newbin ${S}/bsh.Interpreter bsh-interpreter
+
+	use doc && java-pkg_dohtml -r ${S}/javadoc/*
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins ${DISTDIR}/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta4 b/dev-java/bsh/files/digest-bsh-2.0_beta4
new file mode 100644
index 000000000000..4e631a50837a
--- /dev/null
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta4
@@ -0,0 +1,2 @@
+MD5 49c9cc9872f26d562bffb1e5ec8aa377 bsh-2.0b4-src.jar 1636723
+MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784