--- /var/portage/dev-java/nekohtml/nekohtml-1.9.6.ebuild	2012-07-05 23:01:07.000000000 +0300
+++ nekohtml-1.9.16.ebuild	2012-07-31 18:41:16.487478548 +0300
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.6.ebuild,v 1.6 2012/07/05 19:50:21 sera Exp $
 
+EAPI="4"
+
 JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,29 +15,31 @@
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 COMMON_DEP=">=dev-java/xerces-2.7"
 DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3.8* )
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_rewrite-classpath
-	rm -v lib/*.jar *.jar || die
-	java-pkg_jar-from --into lib xerces-2
-}
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="xerces-2"
 
+#do not generate docs, use bundled
 EANT_DOC_TARGET=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
+	find . -iname '*.jar' -delete
+}
+
 src_test() {
-	EANT_GENTOO_CLASSPATH="ant-core,xerces-2" eant test
+	ANT_TASKS="ant-junit" \
+		EANT_GENTOO_CLASSPATH="xerces-2 junit" \
+		eant test
 }
 
 src_install() {