--- /usr/portage/dev-java/commons-pool/commons-pool-1.2-r1.ebuild	2005-12-24 23:35:27.000000000 +0200
+++ commons-pool-1.3.ebuild	2006-07-05 19:57:09.000000000 +0300
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.2-r1.ebuild,v 1.2 2005/12/24 21:25:53 axxo Exp $
 
-inherit java-pkg eutils
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Jakarta-Commons component providing general purpose object pooling API"
 HOMEPAGE="http://jakarta.apache.org/commons/pool/"
@@ -17,9 +17,11 @@ DEPEND=">=virtual/jdk-1.3
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="jikes junit doc"
+IUSE="junit doc"
 
-src_unpack() {
+S="${WORKDIR}/${P}-src"
+
+ant_src_unpack() {
 	unpack ${A}
 	cd ${S}
 
@@ -29,16 +31,15 @@ src_unpack() {
 
 src_compile() {
 	local antflags="build-jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	# TODO move unit tests to src_test
 	use junit && antflags="${antflags} test"
 	use doc && antflags="${antflags} javadoc"
 
-	ant ${antflags} || die "Compilation Failed"
+	eant ${antflags}
 }
 
 src_install() {
-	java-pkg_dojar dist/${PN}.jar
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
 	dodoc README.txt
 	dohtml STATUS.html PROPOSAL.html