--- mx4j-2.1.0-r1.ebuild	2006-10-26 05:47:16.000000000 -0500
+++ mx4j-2.1.0-r1.ebuild	2006-10-26 16:20:24.000000000 -0500
@@ -19,15 +19,15 @@
 # Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars
 
 RDEPEND=">=virtual/jre-1.4
-	=www-servers/axis-1*
 	=dev-java/bcel-5.1*
-	~dev-java/burlap-3.0.8
 	>=dev-java/commons-logging-1.0.4
-	~dev-java/hessian-3.0.8
-	=dev-java/servletapi-2.3*
-	>=dev-java/sun-jaf-bin-1.0.2
-	>=dev-java/sun-javamail-bin-1.3.1
-	>=dev-java/jython-2.1"
+	tools? ( =www-servers/axis-1*
+		~dev-java/burlap-3.0.8
+		~dev-java/hessian-3.0.8
+		>=dev-java/jython-2.1
+		=dev-java/servletapi-2.3*
+		>=dev-java/sun-jaf-bin-1.0.2
+		>=dev-java/sun-javamail-bin-1.3.1 )"
 
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
@@ -39,7 +39,7 @@
 SLOT="2.1"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc examples jikes source"
+IUSE="doc examples jikes tools source"
 
 src_unpack(){
 	unpack ${A}
@@ -55,24 +55,25 @@
 	java-pkg_jar-from bcel
 	java-pkg_jar-from commons-logging
 
-	# for tools
-	java-pkg_jar-from axis-1
-	java-pkg_jar-from burlap-3.0
-	java-pkg_jar-from hessian-3.0.8
-	java-pkg_jar-from servletapi-2.3
-
-	# optionals (tools)
-	java-pkg_jar-from jython
-	java-pkg_jar-from sun-jaf-bin
-	java-pkg_jar-from sun-javamail-bin mail.jar
+	if use tools ; then
+		# for tools
+		java-pkg_jar-from axis-1
+		java-pkg_jar-from burlap-3.0
+		java-pkg_jar-from hessian-3.0.8
+		java-pkg_jar-from servletapi-2.3
+
+		# optionals (tools)
+		java-pkg_jar-from jython
+		java-pkg_jar-from sun-jaf-bin
+		java-pkg_jar-from sun-javamail-bin mail.jar
+	fi
 }
 
 src_compile() {
 	cd build/
 
-	# The jsr160 and tools compilation could probably
-	# be made optional by use flags.
-	local antflags="compile.jmx compile.rjmx compile.tools"
+	local antflags="compile.jmx compile.rjmx"
+	use tools && antflags="compile.tools"
 	use doc && antflags="${antflags} javadocs"
 	use examples && antflags="${antflags} compile.examples"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
@@ -81,7 +82,7 @@
 
 src_install() {
 	java-pkg_dojar dist/lib/*.jar
-	java-pkg_dowar dist/lib/*.war
+	use tools && java-pkg_dowar dist/lib/*.war
 
 	dodoc README