--- /var/portage/dev-java/jaxen/jaxen-1.1.1.ebuild	2012-04-15 22:01:07.000000000 +0300
+++ jaxen-1.1.4.ebuild	2012-10-14 11:31:43.691033798 +0300
@@ -1,19 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.1.ebuild,v 1.9 2012/04/15 18:41:39 vapier Exp $
+# $Header:  $
 
+EAPI=4
 JAVA_PKG_IUSE="doc examples source test"
 
-inherit java-pkg-2 eutils java-ant-2
+inherit java-pkg-2 java-ant-2
 
-MY_P=${P/_beta/-beta-}
 DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
+HOMEPAGE="http://jaxen.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
 LICENSE="jaxen"
 SLOT="1.1"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc source test"
 
 COMMON_DEP="~dev-java/jdom-1.0
@@ -26,30 +26,24 @@
 	test? ( dev-java/ant-junit =dev-java/junit-3* )
 	${COMMON_DEP}"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${P}"
 
-src_unpack() {
-	unpack ${A}
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="dom4j-1,jdom-1.0,xom"
+EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
 
-	cd "${S}"
-	java-ant_ignore-system-classes
+java_prepare() {
+	cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
+}
 
-	mkdir -p "${S}/target/lib"
-	cd "${S}/target/lib"
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from xom
+src_test() {
+	java-pkg-2_src_test
 }
 
 src_install() {
-	java-pkg_newjar target/${MY_P}.jar
+	java-pkg_newjar target/${P}.jar
 
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use examples && java-pkg_doexamples src/java/samples
 	use source && java-pkg_dosrc src/java/main/*
 }
-
-src_test() {
-	java-pkg_jar-from --into target/lib junit
-	ANT_TASKS="ant-junit" eant test -DJunit.present=true
-}