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

Package-Manager: portage-2.1.2.8

7 files changed, 95 insertions, 82 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/Manifest b/dev-java/bsh/Manifest
index 2bfeb91d1a1f..73f0204f5263 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,11 +1,3 @@
-AUX bsh.Console 856 RMD160 58f9a03c0d24ed5193279caa81438c7cc604f468 SHA1 539ca1c93f3d15f0f575a2d4c24b61a02ba09dae SHA256 e2921c95d316acf9f1a91e86c59df0c35d37bcad8b1e3b137f0cc633f1272001
-MD5 e98c8ab811f673d6089a092d3b8a3d97 files/bsh.Console 856
-RMD160 58f9a03c0d24ed5193279caa81438c7cc604f468 files/bsh.Console 856
-SHA256 e2921c95d316acf9f1a91e86c59df0c35d37bcad8b1e3b137f0cc633f1272001 files/bsh.Console 856
-AUX bsh.Interpreter 871 RMD160 a17925094ecb425f8b9149729ae31338c37e8773 SHA1 ec519225ff25e6e84cdf5d7ceaf29c42e409c2df SHA256 9737c780fdf1ffe333f97b331148daa06826ff5601b43fb3f330c91ca96a6aee
-MD5 c0ad0331cfc0855056051a83d34fc35f files/bsh.Interpreter 871
-RMD160 a17925094ecb425f8b9149729ae31338c37e8773 files/bsh.Interpreter 871
-SHA256 9737c780fdf1ffe333f97b331148daa06826ff5601b43fb3f330c91ca96a6aee files/bsh.Interpreter 871
 AUX bsh2-readline.patch 5428 RMD160 b3515cc1115d9276b4d931994add2aea20c7f753 SHA1 a2a582b22d55b551ef904024e413a6ada4fa2486 SHA256 1816ace6e25bcd25940a4dc5213dd24bff9bf0708790a480a12f84a008c1ad47
 MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428
 RMD160 b3515cc1115d9276b4d931994add2aea20c7f753 files/bsh2-readline.patch 5428
@@ -16,14 +8,18 @@ RMD160 f71476f78513c0a01a5c4f4978d7b0cb418be80a files/bsh2.0b4-build.patch 1697
 SHA256 336916f1385303b0c1641a22773407ee128a224067e257f603e6a67999c95b18 files/bsh2.0b4-build.patch 1697
 DIST beanshell-icon.png 29784 RMD160 0953be1f3046c795d36d0a95577c7b0230eb5d03 SHA1 cc8246e7c0f61f130d503a4ce989eef01296dc4f SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9
 DIST bsh-2.0b4-src.jar 1636723 RMD160 710b4658bf05f99c9ca68498ebf75e7d6cc27e27 SHA1 69b36df249654a04e777ab899046c50b8cc844ac SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e
-EBUILD bsh-2.0_beta4-r2.ebuild 1565 RMD160 ad3fe6ae4d999184b766c40e7433cea0e3a8128d SHA1 bc179257dbe9297180f383304c39187755f300d0 SHA256 022935d9388e1d805d236d2464bbc63683c3f279335a30afecee0dfd7c2c2269
-MD5 d968e8b65cf0402fd817b3262bc0668c bsh-2.0_beta4-r2.ebuild 1565
-RMD160 ad3fe6ae4d999184b766c40e7433cea0e3a8128d bsh-2.0_beta4-r2.ebuild 1565
-SHA256 022935d9388e1d805d236d2464bbc63683c3f279335a30afecee0dfd7c2c2269 bsh-2.0_beta4-r2.ebuild 1565
-MISC ChangeLog 5660 RMD160 d4cc6edcd718a59c2bfcf8d228214cfd72923b9c SHA1 c4a7d21c7e62d0e0d9523d276448fe7e4c81c18c SHA256 c02c6a61add2ec6a1cba339dff799ab2d1f80df057d8bb6eb1c4b46d101b5a93
-MD5 b3c24ac3cb4425202cee286961fae436 ChangeLog 5660
-RMD160 d4cc6edcd718a59c2bfcf8d228214cfd72923b9c ChangeLog 5660
-SHA256 c02c6a61add2ec6a1cba339dff799ab2d1f80df057d8bb6eb1c4b46d101b5a93 ChangeLog 5660
+EBUILD bsh-2.0_beta4-r2.ebuild 1503 RMD160 c61cb147cdd877da1dd8db2ebc77da85dd4cdc11 SHA1 b932fc26c1bc1f3f257a14abe3daaac6328372ea SHA256 97a8e750a83125dd63b18381797284b40ac2ae1ec45ecc9307bd644b6cb56e95
+MD5 cc4b01785aaf16031a763a9a699a46c0 bsh-2.0_beta4-r2.ebuild 1503
+RMD160 c61cb147cdd877da1dd8db2ebc77da85dd4cdc11 bsh-2.0_beta4-r2.ebuild 1503
+SHA256 97a8e750a83125dd63b18381797284b40ac2ae1ec45ecc9307bd644b6cb56e95 bsh-2.0_beta4-r2.ebuild 1503
+EBUILD bsh-2.0_beta4-r3.ebuild 1682 RMD160 744e643d45180483a1849c00ef6678531b18ec06 SHA1 0ded7c4a74c2603ca84b83b626d993a723d9caf4 SHA256 f210a791651fa0651e74b9e285786530b219fd63c4656b957f6986bc1990ac8e
+MD5 4350e12fd6f78685e769542a76267374 bsh-2.0_beta4-r3.ebuild 1682
+RMD160 744e643d45180483a1849c00ef6678531b18ec06 bsh-2.0_beta4-r3.ebuild 1682
+SHA256 f210a791651fa0651e74b9e285786530b219fd63c4656b957f6986bc1990ac8e bsh-2.0_beta4-r3.ebuild 1682
+MISC ChangeLog 5910 RMD160 79c2b9333529334593b28a31ad601d2cd0252180 SHA1 b4743a5b10a9f6f318294c0a53a228f2918e9830 SHA256 1a97d65c4643ab941ee0544d7d82a26f98a250ea153e34267d433fd7ec3dece1
+MD5 f567403741e97bd8b277371f1918860c ChangeLog 5910
+RMD160 79c2b9333529334593b28a31ad601d2cd0252180 ChangeLog 5910
+SHA256 1a97d65c4643ab941ee0544d7d82a26f98a250ea153e34267d433fd7ec3dece1 ChangeLog 5910
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -31,3 +27,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 d029ac05f23494a1ec8cda385644f7d9 files/digest-bsh-2.0_beta4-r2 467
 RMD160 a70cc8a98cbd04cc0a23b166168320972e034dba files/digest-bsh-2.0_beta4-r2 467
 SHA256 357f215c90d818f3da802676f4506777cebf2312a167604f99078a508434d6f4 files/digest-bsh-2.0_beta4-r2 467
+MD5 d029ac05f23494a1ec8cda385644f7d9 files/digest-bsh-2.0_beta4-r3 467
+RMD160 a70cc8a98cbd04cc0a23b166168320972e034dba files/digest-bsh-2.0_beta4-r3 467
+SHA256 357f215c90d818f3da802676f4506777cebf2312a167604f99078a508434d6f4 files/digest-bsh-2.0_beta4-r3 467
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