--- commons-pool-1.6.ebuild	2013-08-12 20:00:41.000000000 +0200
+++ commons-pool-2.1_pre20131226.ebuild	2013-12-27 01:16:09.755081057 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.6.ebuild,v 1.1 2013/08/12 18:00:41 tomwij Exp $
+# $Header: $
 
 EAPI="5"
 
@@ -8,33 +8,44 @@
 
 inherit eutils java-pkg-2 java-ant-2
 
+MY_PN="${PN}2"
+MY_PV="${PV%_*}"
+MY_P="${MY_PN}-${MY_PV}"
+
 DESCRIPTION="Provides general purpose object pooling API"
 HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
+SRC_URI="mirror://apache/commons/pool/source/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+COMMON_DEP="dev-java/cglib:3
+	dev-java/asm:4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
 	test? (
 		dev-java/ant-junit
 		dev-java/junit:0
 	)"
 
-S="${WORKDIR}/${P}-src"
+S="${WORKDIR}/${MY_PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
 
 EANT_BUILD_TARGET="build-jar"
+EANT_GENTOO_CLASSPATH="cglib-3,asm-4"
 
 src_test() {
 	ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
 }
 
 src_install() {
-	java-pkg_newjar dist/${P}-SNAPSHOT.jar
+	java-pkg_newjar dist/${MY_P}-SNAPSHOT.jar
 	dodoc README.txt RELEASE-NOTES.txt
 
 	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
+	use source && java-pkg_dosrc src/main/java/org
 }