--- tomcat-5.0.28-r7.ebuild	2005-09-22 12:15:10.000000000 +0200
+++ tomcat-5.0.28-r7.ebuild.bak	2005-09-22 12:11:14.000000000 +0200
@@ -56,7 +56,6 @@
 	epatch ${FILESDIR}/${PV}/build.xml-02.patch
 	epatch ${FILESDIR}/${PV}/gentoo.diff
 	epatch ${FILESDIR}/${PV}/scripts.patch
-	epatch ${FILESDIR}/${PV}/java5.patch
 	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
 
 	# avoid packed jars :-)
@@ -89,13 +88,7 @@
 }
 
 src_compile(){
-
-	jaxen_jar=$(java-pkg_getjar jaxen-1.1 jaxen.jar 2>/dev/null)
-	if [ -z "${jaxen_jar}" ]; then
-		jaxen_jar=$(java-pkg_getjar jaxen jaxen-full.jar)
-	fi
-
-	local antflags="-Dbase.path=${T}" ${jaxen_jar}
+	local antflags="-Dbase.path=${T}"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
 	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
@@ -116,7 +109,7 @@
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
-	antflags="${antflags} -Djaxen.jar=${jaxen_jar}"
+	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
 	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)"
 	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)"
 	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
@@ -124,7 +117,6 @@
 	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
 	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
 
-	einfo "ant ${antflags}"
 	ant ${antflags} || die "compile failed"
 
 }