8 files changed, 7 insertions, 146 deletions
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index af209b5648f5..402506989492 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.42 2007/04/12 14:43:17 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.43 2007/05/08 13:36:09 caster Exp $
+
+  08 May 2007; Vlastimil Babka <caster@gentoo.org> -files/bsh2-build.patch,
+  -files/beanshell.desktop, -bsh-1.3.0.ebuild, -bsh-2.0_beta1-r1.ebuild,
+  bsh-2.0_beta4-r1.ebuild:
+  Remove unused bsf dep; cleanup old versions.
 
   12 Apr 2007; <welp@gentoo.org> bsh-2.0_beta4-r1.ebuild:
   Stable on amd64 wrt bug 171026
diff --git a/dev-java/bsh/bsh-1.3.0.ebuild b/dev-java/bsh/bsh-1.3.0.ebuild
deleted file mode 100644
index 80b27dd675ef..000000000000
--- a/dev-java/bsh/bsh-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-1.3.0.ebuild,v 1.13 2007/01/05 20:23:36 caster Exp $
-
-inherit java-pkg
-
-At="bsh-1.3.0.jar"
-S=${WORKDIR}
-DESCRIPTION="BeanShell is a small, free, embeddable, Java source interpreter with object scripting language features."
-SRC_URI="http://www.beanshell.org/${At}"
-HOMEPAGE="http://www.beanshell.org/"
-KEYWORDS="x86 amd64 ppc ppc64"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	elog "This ebuild is binary-only (for now)."
-	elog "If you get this to compile from source, please file a bug"
-	elog "and let us know.  http://bugs.gentoo.org/"
-}
-
-src_install() {
-	dobin ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter
-	java-pkg_dojar ${DISTDIR}/${At}
-}
diff --git a/dev-java/bsh/bsh-2.0_beta1-r1.ebuild b/dev-java/bsh/bsh-2.0_beta1-r1.ebuild
deleted file mode 100644
index b7206988ab5e..000000000000
--- a/dev-java/bsh/bsh-2.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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_beta1-r1.ebuild,v 1.9 2007/01/05 20:23:36 caster Exp $
-
-inherit java-pkg
-
-DESCRIPTION="BeanShell is a small, free, embeddable, Java source interpreter with object scripting language features."
-SRC_URI="http://www.beanshell.org/${P/_beta1/b1}.jar mirror://gentoo/beanshell-icon.png"
-HOMEPAGE="http://www.beanshell.org/"
-KEYWORDS="x86 amd64 ppc ppc64"
-LICENSE="LGPL-2.1"
-SLOT="0"
-RDEPEND=">=virtual/jdk-1.2"
-DEPEND=">=virtual/jre-1.2"
-IUSE="kde gnome"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${P/_beta1/b1}.jar ${WORKDIR}/${PN}.jar
-}
-
-src_compile() {
-	elog "This ebuild is binary-only (for now)."
-	elog "If you get this to compile from source, please file a bug"
-	elog "and let us know.  http://bugs.gentoo.org/"
-}
-
-src_install() {
-	dobin ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter
-
-	java-pkg_dojar ${PN}.jar
-	if use gnome || use kde ; then
-		insinto /usr/share/pixmaps
-		doins ${DISTDIR}/beanshell-icon.png
-
-		insinto /usr/share/applications
-		doins ${FILESDIR}/beanshell.desktop
-	fi
-}
diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
index c7d8bf0482be..e11009820be2 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r1.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-r1.ebuild,v 1.11 2007/04/12 14:43:17 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r1.ebuild,v 1.12 2007/05/08 13:36:09 caster Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -17,7 +17,6 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 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}
@@ -39,7 +38,6 @@ src_unpack() {
 	cd "${S}/lib/"
 	rm -v *.jar
 	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from bsf-2.3
 	use readline && java-pkg_jar-from libreadline-java
 }
 
diff --git a/dev-java/bsh/files/beanshell.desktop b/dev-java/bsh/files/beanshell.desktop
deleted file mode 100644
index b6e96af79b1e..000000000000
--- a/dev-java/bsh/files/beanshell.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Exec=bsh.Console
-Terminal=false
-Name=BeanShell Prompt
-GenericName=Java Command Prompt
-Comment=An interactive Java command prompt
-Categories=Application;Development
-Icon=/usr/share/pixmaps/beanshell-icon.png
-\ No newline at end of file
diff --git a/dev-java/bsh/files/bsh2-build.patch b/dev-java/bsh/files/bsh2-build.patch
deleted file mode 100644
index 4ab3112c47cb..000000000000
--- a/dev-java/bsh/files/bsh2-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- BeanShell/build.xml~	2004-01-20 19:12:20.888557245 -0500
-+++ BeanShell/build.xml	2004-01-20 19:13:36.150184282 -0500
-@@ -103,50 +103,7 @@
- 		value="docs/manual/bshcommands-bshdoc.xml"/>
- 
- <!-- Begin Targets -->
--
--	<!-- The javacc targets could be smarter... -->
--	<target name="checkjjt">
--		<uptodate property="jjtree.notRequired" 
--				targetfile="${src-dir}/bsh/bsh.jj"
--		>
--			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
--		</uptodate>
--	</target>
--	<target name="checkjj">
--		<uptodate property="javacc.notRequired" 
--				targetfile="${src-dir}/bsh/Parser.java"
--		>
--			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
--		</uptodate>
--	</target>
--
--	<!-- Create bsh.jj when bsh.jjt changes. -->
--	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
--		<java classname="jjtree"
--			fork="yes"
--			failonerror="yes" >
--			<arg 
--				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
--			<classpath>
--				<fileset refid="lib-fileset"/>
--			</classpath>
--		</java>
--	</target>
--
--	<!-- Create Parser.java when bsh.jj changes. -->
--	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
--		<java classname="javacc"
--			fork="yes"
--			failonerror="yes" >
--			<!-- classpath="${javacc-lib}" -->
--			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
--			<classpath>
--				<fileset refid="lib-fileset"/>
--			</classpath>
--		</java>
--	</target>
--
--	<target name="compile" depends="jjtree,javacc,builddir">
-+	<target name="compile" depends="builddir">
- 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
- 		<!--compiler="${build-compiler}"-->
- 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}"
diff --git a/dev-java/bsh/files/digest-bsh-1.3.0 b/dev-java/bsh/files/digest-bsh-1.3.0
deleted file mode 100644
index f510979a0afb..000000000000
--- a/dev-java/bsh/files/digest-bsh-1.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index ae41e8d56f61..000000000000
--- a/dev-java/bsh/files/digest-bsh-2.0_beta1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-RMD160 28e5222f78d08451798f51d8e578c8e5816700b7 bsh-2.0b1.jar 280683
-SHA256 d92d45d982b302f61dd4b83f0c190e5de2f0effb7a42154e2c5e0a82a6c2e90d bsh-2.0b1.jar 280683