Revbump to add proper optional BSF support via USE flag. Cleanup.

(Portage version: 2.1.2.8)

6 files changed, 80 insertions, 66 deletions

diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index 6f087bcd8790..e26df15224f4 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/bsh
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.44 2007/05/18 17:57:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.45 2007/05/27 22:29:56 caster Exp $
+
+*bsh-2.0_beta4-r3 (27 May 2007)
+
+  27 May 2007; Vlastimil Babka <caster@gentoo.org> -files/bsh.Console,
+  -files/bsh.Interpreter, bsh-2.0_beta4-r2.ebuild, +bsh-2.0_beta4-r3.ebuild:
+  Revbump to add proper optional BSF support via USE flag. Cleanup.
 
 *bsh-2.0_beta4-r2 (18 May 2007)
 
diff --git a/dev-java/bsh/bsh-2.0_beta4-r2.ebuild b/dev-java/bsh/bsh-2.0_beta4-r2.ebuild
index ed50c6a3ea10..087f41d3ec5a 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r2.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/05/18 17:57:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r2.ebuild,v 1.2 2007/05/27 22:29:56 caster Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -31,8 +31,6 @@ src_unpack() {
 
 	epatch ${FILESDIR}/bsh${MY_PV}-build.patch
 
-	cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S}
-
 	use readline && epatch ${FILESDIR}/bsh2-readline.patch
 
 	cd "${S}/lib/"
diff --git a/dev-java/bsh/bsh-2.0_beta4-r3.ebuild b/dev-java/bsh/bsh-2.0_beta4-r3.ebuild
new file mode 100644
index 000000000000..7e6c02b0c70d
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta4-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/05/27 22:29:56 caster Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+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="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="bsf readline"
+# some tests fail but ant doesn't fail
+RESTRICT="test"
+
+RDEPEND=">=virtual/jdk-1.4
+	=dev-java/servletapi-2.4*
+	readline? ( dev-java/libreadline-java )"
+DEPEND="${RDEPEND}
+	bsf? ( >=dev-java/bsf-2.3 )"
+
+S=${WORKDIR}/BeanShell-${MY_PV}
+
+src_unpack() {
+	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
+	cd "${S}"
+
+	epatch "${FILESDIR}/bsh${MY_PV}-build.patch"
+
+	use readline && epatch "${FILESDIR}/bsh2-readline.patch"
+
+	cd lib
+	rm -v *.jar || die
+	java-pkg_jar-from servletapi-2.4
+	use readline && java-pkg_jar-from libreadline-java
+	use bsf && java-pkg_jar-from --build-only bsf-2.3
+}
+
+src_compile() {
+	eant $(use bsf && echo -Dexclude-bsf=) jarall $(use_doc)
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P/_beta/b}.jar
+
+	java-pkg_dolauncher bsh-console --main bsh.Console
+	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/bsh
+
+	newicon ${DISTDIR}/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
diff --git a/dev-java/bsh/files/bsh.Console b/dev-java/bsh/files/bsh.Console
deleted file mode 100644
index fe7f938e96a8..000000000000
--- a/dev-java/bsh/files/bsh.Console
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# bsh.Console Launch Script
-# Author: Dylan Carlson
-# May 2003
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/files/bsh.Console,v 1.3 2005/03/10 17:45:40 luckyduck Exp $
-
-JAVA_HOME=`/usr/bin/java-config --jdk-home`
-if [ -z "${JAVA_HOME}" ] ; then
-	JAVA_HOME=`/usr/bin/java-config --jre-home`
-fi
-CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=bsh,bsf-2.3,servletapi-2.4,libreadline-java`"
-
-if [ ! -f ${JAVA_HOME}/bin/java ] ; then
-	echo " "
-	echo "I tried using the following Java Runtime:"
-	echo "${JAVA_HOME}/bin/java" 
-	echo " "
-	echo "Java Runtime missing.  Please run java-config(1) and ensure"
-	echo "your environment is configured properly."
-	exit 1
-else
-	echo " "
-	echo "Using Java Runtime:"
-	echo "${JAVA_HOME}/bin/java" 
-	echo " "
-	echo "Using CLASSPATH:"
-	echo "${CLASSPATH}"
-	echo " "
-fi
-
-${JAVA_HOME}/bin/java bsh.Console
diff --git a/dev-java/bsh/files/bsh.Interpreter b/dev-java/bsh/files/bsh.Interpreter
deleted file mode 100644
index ae80eeb5b9cc..000000000000
--- a/dev-java/bsh/files/bsh.Interpreter
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# bsh.Interpreter Launch Script
-# Author: Dylan Carlson
-# May 2003
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/files/bsh.Interpreter,v 1.3 2005/03/10 17:45:40 luckyduck Exp $
-
-JAVA_HOME=`/usr/bin/java-config --jdk-home`
-if [ -z "${JAVA_HOME}" ] ; then
-	JAVA_HOME=`/usr/bin/java-config --jre-home`
-fi
-CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=bsh,bsf-2.3,servletapi-2.4,libreadline-java`"
-
-if [ ! -f ${JAVA_HOME}/bin/java ] ; then
-	echo " "
-	echo "I tried using the following Java Runtime:"
-	echo "${JAVA_HOME}/bin/java" 
-	echo " "
-	echo "Java Runtime missing.  Please run java-config(1) and ensure"
-	echo "your environment is configured properly."
-	exit 1
-else
-	echo " "
-	echo "Using Java Runtime:"
-	echo "${JAVA_HOME}/bin/java" 
-	echo " "
-	echo "Using CLASSPATH:"
-	echo "${CLASSPATH}"
-	echo " "
-fi
-
-${JAVA_HOME}/bin/java bsh.Interpreter $*
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta4-r3 b/dev-java/bsh/files/digest-bsh-2.0_beta4-r3
new file mode 100644
index 000000000000..c4de698ae3cf
--- /dev/null
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta4-r3
@@ -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