--- /usr/portage/www-servers/tomcat/tomcat-5.0.28-r4.ebuild	2005-08-26 16:09:55.000000000 +0200
+++ tomcat-5.0.28-r4.ebuild	2005-09-11 23:53:06.000000000 +0200
@@ -24,7 +24,7 @@
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-modeler-1.1
 	>=dev-java/commons-pool-1.2
-	~dev-java/jaxen-1.0
+	dev-java/jaxen
 	>=dev-java/junit-3.8.1
 	dev-java/jmx
 	>=dev-java/log4j-1.2.8
@@ -54,6 +54,7 @@
 	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 :-)
@@ -78,7 +79,7 @@
 	java-pkg_jar-from servletapi-2.4
 
 	mkdir -p ../../server/lib && cd ../../server/lib
-	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
+	java-pkg_jar-from commons-beanutils commons-beanutils.jar
 	java-pkg_jar-from commons-digester
 	java-pkg_jar-from commons-fileupload
 	java-pkg_jar-from commons-modeler
@@ -86,9 +87,14 @@
 }
 
 src_compile(){
-	local antflags="-Dbase.path=${T}"
+	local antflags="-Dbase.path=${T}" jaxen_jar
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
+	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
+
 	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
 	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
 	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
@@ -104,10 +110,10 @@
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
 	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils 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=$(java-pkg_getjar jaxen jaxen-full.jar)"
+	antflags="${antflags} -Djaxen.jar=${jaxen_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)"
@@ -115,6 +121,7 @@
 	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
 	antflags="${antflags} -Dstruts.home=/usr/share/struts"
 
+	einfo "ant ${antflags}"
 	ant ${antflags} || die "compile failed"
 
 }