--- gentoo/dev-java/jpf/jpf-1.5.1.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ gentoo/dev-java/jpf/jpf-1.5.1.ebuild	2010-10-19 11:34:33.882692067 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/jpf/jpf-1.5.1.ebuild,v 1.4 2009/04/04 19:14:48 maekke Exp $
 
-EAPI=1
+EAPI=3
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,19 +25,17 @@
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+# doc target is name="-javadoc" and would need a patch, on demand
+EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
 
-	java-ant_rewrite-classpath
+java_prepare() {
 	rm -fv lib/*.jar || die
 	# needs some not yet packaged jxp dep, will add only on demand
 	rm -rfv source-tools/org/java/plugin/tools/{docgen,ant/DocTask.java} || die
+	sed -ie '/jpf-doc/d' source-tools/org/java/plugin/tools/ant/jpf-tasks.properties || die
 }
 
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
-
 src_install() {
 	java-pkg_dojar build/lib/jpf*.jar
 	java-pkg_register-ant-task