--- commons-dbcp-1.4-r2.ebuild	2012-06-07 23:31:06.000000000 +0200
+++ commons-dbcp-2.0.ebuild	2014-03-07 23:53:24.917157041 +0100
@@ -8,48 +8,52 @@
 
 inherit java-pkg-2 java-ant-2
 
+MY_PN="${PN}2"
+MY_PV="${PV%_*}"
+MY_P="${MY_PN}-${MY_PV}-src"
+
 DESCRIPTION="Jakarta component providing database connection pooling API"
 HOMEPAGE="http://commons.apache.org/dbcp/"
-SRC_URI="mirror://apache/commons/dbcp/source/${P}-src.tar.gz"
+SRC_URI="mirror://apache/commons/dbcp/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
-COMMON_DEP="
-	dev-java/commons-pool:0
+COMMON_DEP=">=dev-java/commons-logging-1.1.3
+	>=dev-java/commons-pool-2.2
 	java-virtuals/transaction-api:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.7"
 DEPEND="${COMMON_DEP}
-	virtual/jdk:1.6
+	virtual/jdk:1.7
 	test? ( dev-java/ant-junit:0 )"
 
-S="${WORKDIR}/${P}-src"
+S="${WORKDIR}/${MY_P}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
 
 EANT_BUILD_TARGET="build-jar"
-EANT_GENTOO_CLASSPATH="commons-pool,transaction-api"
+EANT_GENTOO_CLASSPATH="commons-logging,commons-pool,transaction-api"
 
 src_test() {
 	# depend on not packaged geronimo #348853
-	rm -v src/test/org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java || die
-	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSource.java || die
-	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java || die
+	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java || die
+	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java || die
+	rm -v src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java || die
 
 	# fails :(
-	rm -v src/test/org/apache/commons/dbcp/TestJndi.java || die
+	rm -v src/test/java/org/apache/commons/dbcp2/TestJndi.java || die
 
 	java-pkg-2_src_test
 }
 
 src_install() {
-	java-pkg_dojar dist/${PN}*.jar
+	java-pkg_newjar dist/${MY_PN}-${MY_PV}-SNAPSHOT.jar ${PN}.jar
 	dodoc README.txt RELEASE-NOTES.txt
 
 	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
+	use source && java-pkg_dosrc src/main/java/*
 }