--- bsh-2.0_beta4-r1.ebuild	2006-08-06 14:05:36.000000000 -0400
+++ bsh-2.0_beta4-r2.ebuild	2006-08-08 13:30:19.000000000 -0400
@@ -14,11 +14,10 @@
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="doc readline source"
+IUSE="doc readline servletapi source"
 
 RDEPEND=">=virtual/jdk-1.4
-	=dev-java/bsf-2.3*
-	=dev-java/servletapi-2.4*
+	servletapi? ( =dev-java/servletapi-2.3* )
 	readline? ( dev-java/libreadline-java )"
 DEPEND="${RDEPEND}
 	source? ( app-arch/zip )
@@ -30,17 +29,17 @@
 	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
 	cd ${S}
 
-	epatch ${FILESDIR}/bsh${MY_PV}-build.patch
+	rm lib/*.jar
 
-	cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S}
+	epatch ${FILESDIR}/bsh${MY_PV}-build.patch
 
 	use readline && epatch ${FILESDIR}/bsh2-readline.patch
+	use !servletapi && epatch ${FILESDIR}/bsh2-noservletapi.patch
 }
 
 src_compile() {
 	cd "${S}/lib/"
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from bsf-2.3
+	use servletapi && java-pkg_jar-from servletapi-2.3
 	use readline && java-pkg_jar-from libreadline-java
 	cd "${S}"