Revbump, add missing deps, drop unused deps, fixes #205245.

Fix generating javadocs.
EAPI bump and make better use of eclasses.
Disable test depending on unpackaged geronimo. #348853
Disble one failing test as this version is already stable on some archs.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 81 insertions, 2 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index f4d6ea617600..42ad2d3bc664 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.58 2012/03/12 15:07:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.59 2012/05/25 10:03:55 sera Exp $
+
+*commons-dbcp-1.4-r2 (25 May 2012)
+
+  25 May 2012; Ralph Sennhauser <sera@gentoo.org> +commons-dbcp-1.4-r2.ebuild:
+  Revbump, add missing deps, drop unused deps, fixes #205245.
+  Fix generating javadocs.
+  EAPI bump and make better use of eclasses.
+  Disable test depending on unpackaged geronimo. #348853
+  Disble one failing test as this version is already stable on some archs.
 
   12 Mar 2012; Brent Baude <ranger@gentoo.org> commons-dbcp-1.4-r1.ebuild:
   Marking commons-dbcp-1.4-r1 ppc64 for bug 348594
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index af39236c62e8..eae6fdbe448e 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-dbcp-1.2.2-src.tar.gz 641291 RMD160 271dcf459e2a4693f193481130bef67ac42e26ab SHA1 34ce36c8bb2f0e125e668066ae938bf9391e88b9 SHA256 62ba04a48f14cfe7d3aa415fb3a57547955a63a6f422ac79ca1da08f3660edd9
 DIST commons-dbcp-1.4-src.tar.gz 932507 RMD160 0e057beab5c97eddb0587683502ae46f8fb395da SHA1 48702486eaba6ec40fb65e912c8f597d80654f54 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
 EBUILD commons-dbcp-1.2.2-r1.ebuild 1465 RMD160 2843c85e9596f2fa699692d82fb97522d75aadc6 SHA1 0b761020f0b801348f721ba5bd1d3faea3fa376e SHA256 733c10dd31332d5c73375484151881f2d01b478c1b525048df0d09f07f8f89a6
 EBUILD commons-dbcp-1.4-r1.ebuild 1569 RMD160 7481ad42701cfd8b0c0c5f0e7e1b28c50d6f4032 SHA1 078e9553397f8a64161a98e839b0ca1ac59f1e2c SHA256 8b4680b18b0323ed43bf3adce2e2d2b80825114fe6a8306261e39ec677e5d6e4
-MISC ChangeLog 8053 RMD160 4c372bc99b4be8fa7df15e3066a6bee952449bd8 SHA1 91d93bf4ca945a42f31ea34e87245cba53350e6f SHA256 fcc691294215fb8b0e03f921791c417a66f9218cebf9dc6d8dbf0e1dfac1fccd
+EBUILD commons-dbcp-1.4-r2.ebuild 1565 RMD160 878193bd4c3e75557c6320917b01322a1caa0af5 SHA1 92fe9ecba3f1b5314e4a7ffb7262f20a317b31fa SHA256 af0d1b4bbd61905d0aae6b85e956879c5d0fee0cbaf7501a60b6f9998003206a
+MISC ChangeLog 8433 RMD160 bc8668a5799fb7805234d374011e85b4ac08af53 SHA1 493020f258c3ba7005d1c19ec622fc7d919070bc SHA256 a867de7d7241a920f4207f503a292e47c4e98b921871cae6152fa092333f3db2
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPv1kZAAoJEIUJ+svaV163o6gH/1SKhEsEbLaQKPpWpvbiLg1e
+b4hrpJjZKTiP0SvsagV/MPEcaf9FRv0yKzPjx4VM4p80K5PK76QuHn/ArTz6h0Vh
+6Xme80MhEvViRVndEKwARNAnXypslzIQE9izLU3Vd9HVBlz4QWDLG8QLBXBsPZxW
+Cz9pDEF+fI5YoqWrTMN1a4Jt9l2KExgW1Ai0hyNa4WFhzlHUFfDoNkf/eDudXeJu
+KjMWNxDgi5eBGiDvd2Nk2BvOhreJSrjcEjbuyd0B5V+luwQ8k5K+lSASrYjrqJ81
+7iuKRb7MCFtFVoV/XJRZN1elvLFO2ywYKPir9YfwFdiP3TaN7wBcGuISt+MPmXA=
+=h6hQ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
new file mode 100644
index 000000000000..efb3d73c0140
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild,v 1.1 2012/05/25 10:03:55 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+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
+	java-virtuals/transaction-api:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_TARGET="build-jar"
+EANT_GENTOO_CLASSPATH="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
+
+	# fails :(
+	rm -v src/test/org/apache/commons/dbcp/TestJndi.java || die
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}*.jar
+	dodoc README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}