fix deps, some cleanups

(Portage version: 2.0.51.22-r1)

5 files changed, 18 insertions, 108 deletions

diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
index a8e7baa9b9df..0e6ddd52e577 100644
--- a/dev-java/bsh/ChangeLog
+++ b/dev-java/bsh/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2005/06/23 09:04:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.27 2005/07/09 16:00:08 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -bsh-2.0_beta2.ebuild,
+  bsh-2.0_beta4.ebuild:
+  fix deps, some cleanups
 
   23 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
   +files/bsh2.0b4-build.patch, bsh-2.0_beta4.ebuild:
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index b26deb2f1caf..f69481c96851 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3e9db06b96be80b9500257a94feb42f8 bsh-2.0_beta1-r1.ebuild 1175
 MD5 8bd71a260abed0bb42193acb1ec2c8df bsh-1.3.0.ebuild 870
-MD5 ac6889173fe71cf9e03c2b6d6473f952 bsh-2.0_beta2.ebuild 2051
-MD5 e450b33e32256c4be5e4f6e13dd0b5f8 ChangeLog 3434
+MD5 21f307c27eb0a29f63e88dcb17582b85 ChangeLog 3557
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 023e06c781de5912b9743f4ee112219e bsh-2.0_beta4.ebuild 2079
+MD5 9b7ca719d1ea3099467543e573a256ec bsh-2.0_beta4.ebuild 2090
 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 b2c7f4d348c2075960cec1811975f5c9 files/bsh2.0b4-build.patch 1697
 MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428
 MD5 0321e1ba45e1f4f328eae0eecf037105 files/digest-bsh-2.0_beta1-r1 120
 MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzlt1/rLF9B432nYRAjuXAJ9u3Wn8C0XDNc5KnMDOm9o+LwbncwCeJcNc
-kQZwMGl0SIBBff/bktqNKas=
-=xsZy
------END PGP SIGNATURE-----
diff --git a/dev-java/bsh/bsh-2.0_beta2.ebuild b/dev-java/bsh/bsh-2.0_beta2.ebuild
deleted file mode 100644
index 9251073b59fa..000000000000
--- a/dev-java/bsh/bsh-2.0_beta2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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_beta2.ebuild,v 1.3 2005/07/08 10:54:24 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.6"
-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/bsh-2.0_beta4.ebuild b/dev-java/bsh/bsh-2.0_beta4.ebuild
index 42acab9ff7af..95dd5fd362ef 100644
--- a/dev-java/bsh/bsh-2.0_beta4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/07/08 10:54:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4.ebuild,v 1.4 2005/07/09 16:00:08 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -9,27 +9,27 @@ 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"
+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 jikes junit readline"
+IUSE="doc jikes readline source"
 
-DEPEND="${RDEPEND}
-		>=dev-java/ant-core-1.6"
 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}
 
 src_unpack() {
 	# Extract the sources
 	cd ${WORKDIR}
-	jar xf ${DISTDIR}/${MY_DIST}
+	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
 
 	# Apply the build patch
 	cd ${S}
@@ -42,19 +42,16 @@ src_unpack() {
 	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
+	local classpath="bsf-2.3,servletapi-2.4"
+	use readline && classpath="${classpath},libreadline-java"
+	classpath="$(java-pkg_getjars ${classpath})"
 }
 
 src_compile() {
 	local classpath="bsf-2.3,servletapi-2.4"
 	use readline && classpath="${classpath},libreadline-java"
-	classpath=`java-config -p ${classpath}`
+	classpath="$(java-pkg_getjars ${classpath})"
 
 	local antflags="jarall"
 	use doc && antflags="${antflags} javadoc"
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta2 b/dev-java/bsh/files/digest-bsh-2.0_beta2
deleted file mode 100644
index eb60e56cfbba..000000000000
--- a/dev-java/bsh/files/digest-bsh-2.0_beta2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f9c938446e5d97b74fd37f3bdbebf84a bsh-2.0b2-src.jar 1044734
-MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784