Version bump to v2.1. Drop ~ppc and ~ppc64 arch (no jdk-1.7 nor commons-pool

for these archs yet). Add SLOT. Fix bug 496110.

Signed-off-by: monsieurp@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index 2e49e95ddd673ae64476f2cd13ee56d839af43d5..257c6ead4a681f80b17f7d9ef6c6675993e982b6 100644 (file)
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-dbcp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.64 2014/08/03 10:34:29 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.65 2015/03/20 15:34:23 monsieurp Exp $
+
+*commons-dbcp-2.1 (20 Mar 2015)
+
+  20 Mar 2015; Patrice Clement <monsieurp@gentoo.org> +commons-dbcp-2.1.ebuild,
+  commons-dbcp-1.4-r2.ebuild:
+  Version bump to v2.1. Drop ~ppc and ~ppc64 arch (no jdk-1.7 nor commons-pool
+  for these archs yet). Add SLOT. Fix bug 496110.
 
   03 Aug 2014; Ralph Sennhauser <sera@gentoo.org>
   -commons-dbcp-1.2.2-r1.ebuild, -commons-dbcp-1.4-r1.ebuild:

diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 86fa350551ca93cf8d35233451c79b60943e3826..48f25be34f4b1b69dda9f3136f39e94944505a5a 100644 (file)
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST commons-dbcp-1.4-src.tar.gz 932507 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283 SHA512 70f32ea36bae46290dc376e6040539562de98906810bd4e1985667c336e6215dc5536278000fee5d9f200cc4b97ea0a6cff74a871e962b61203741814a9c5e7b WHIRLPOOL c917bd417d95e7fc2448c87d949f440ad829ea794b943e707a23154fafaf9eeccaa2900ae7ccb27cf03c56d7e0727177e56c47f157ee85ab1be7c67d18702b26
-EBUILD commons-dbcp-1.4-r2.ebuild 1563 SHA256 87e576bd48aa101991660976843d9493abe6246228b392725568f28f8e5bc16c SHA512 1b7d8be43159033d2a1713f75b76a139a7e4cc477aff0dba084ce1be87d6d86929f958a0dcc2bda09cfe6051e1fd1c64e7c32a4051c8501af5c1f2df15b479e5 WHIRLPOOL baa4dc41c6b7baef3a4c578bc591b42502f7b01377e2938ebea46f45cfd3b16d9904e4c6f1fc750154611b086172a25f08e4cf1c73f4ff4327c9d8cd59c8b0a2
-MISC ChangeLog 9031 SHA256 f584f38a0423f497fdf35e9e251bc086979fde505415301c5942c46e89688682 SHA512 9589e2cd0806ee1e971e5515431bbfcd83efe8cf98e0cc6ea633a7949be3a30fb5bd37c8540c01e93834a3258fcbf63a7cb08e10e4fd84fbd191ff70c78244ee WHIRLPOOL 6002a78bee55a5491bbc75805a92e8d752c0c1bbeb722a063672756f2595f18b3d11a45e694ee4a2066c577b052b1fcd6a60735d10a84cbd1ee70e5f5d15afab
+DIST commons-dbcp2-2.1-src.tar.gz 580017 SHA256 e1a75021dc3a5314cfa0a0c65bf0bf3d8f95a289b833cf5e391149cf29367708 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d WHIRLPOOL d4efd240eae5d891c98ad3a2fa76756fabdfa93bc17ec9d4e0b046f6dcb8e61579acfb899f338131472960aaddf25457d3a82ca00486242097319e9f7617462a
+EBUILD commons-dbcp-1.4-r2.ebuild 1566 SHA256 51d389a8c47a6cbfb92d2a11cd8956fc6c48c7e150546ec711e9196ed97b9089 SHA512 8d0bdf4c5f2656e4fda268a5258c6ac2b7df742118ccbe111507ef8586717e763d4b264a2c5605e75ac69aa3ac6c5f40cd49e03bc68b77e94cd0a67cfeef5c1b WHIRLPOOL c935ab0c8659f6e5ea888cbe4e97dc8b13120afd714c1ed5d7fb0083a374820d88008805aaf7c219ff0a354c832ff40b4e364b1862f13a7cfed585b010cdef77
+EBUILD commons-dbcp-2.1.ebuild 2366 SHA256 3366c58b4d9977328a0bd72db0c21b9b2b11610dfb01954cf5cb5748aa2c4458 SHA512 32bba9d43fbf2d0bfacacd1444c01b50786e7cf930ec2041171e4e3bd41e5e91515f1816cb25a0f9cf7964f472666c5ab52c1fab8328dfb7e7bb6fb28bc41c9a WHIRLPOOL 43df3cf6acdbd758e28ffb6e70f9638395125f471efb48d31e350d19e3d8a9f66b97c28f5e108829b79fd7ab0a5c025e4bb4e3a5b7f14d8e69eaeead01eca846
+MISC ChangeLog 9309 SHA256 7363e135efd7594672baa36623aec21258e9670be3860e645d0e1f04cf3af3f5 SHA512 cba3577ffa893d50556ed90be1e0607e5c7aefc57a70c019bc0c699fb3c8384a6131cd8dc6d921ebb648c35a1e06fdab8477b352c965ea0d0e42e5f30ade6dd7 WHIRLPOOL 725c837074c9df7e990d9f2cb8a3a9094d2a705c0ad684b1eef5768197c8b4e6fae29d853f8b10027878f4e6c8d720dce953bd8407857c22699d34d04594e92f
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJT3hA+AAoJELjwI6Q8XPdahPAH/RrMLrwrqJrRyIIYtsXDZHAK
-MH62bMQFxQycp06Ql90+vpN5tZbwlQKZI4wBntrdpsjomTauw+/ba/DKBndyxhOm
-UiJtgHt2CWOvMrUnaasy7/Y2lNzrkXQitKE9NwlC9b6mSdIj1AT8TL89WMMTd7Sw
-/adOyX4oagCo/Txh4Tq9VgfpKFKzZ0CEf/aOh9A+oDdDNHK6ocM4er5XwMjS4Jt/
-S5rSVfofd8JNf+BYsBB4G65YAEBknr9ruxwwVM7aRCwku8mQmNo7yuLoUuYsS/kq
-WQ0EYDlhvSUJ2Nz9XYFrWMR3drXVyddwssCVric/cX4cnzNAN8y3RVreJ7+iHug=
-=wPGM
------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
index bf9dd41b39a22121795e96e5988527e1e86f1248..e674f1a6f75993d11e065cc2c10144330ac21f44 100644 (file)
--- a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.5 2012/06/07 21:24:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild,v 1.6 2015/03/20 15:34:23 monsieurp Exp $
 
 EAPI=4
 

diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
new file mode 100644 (file)
index 0000000..2604eb3
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.1 2015/03/20 15:34:23 monsieurp Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+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/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~x86 ~amd64 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+CDEPEND=">=dev-java/commons-logging-1.1.1
+       dev-java/commons-pool:2
+       java-virtuals/transaction-api:0
+       dev-java/junit:4"
+DEPEND="${CDEPEND}
+       virtual/jdk:1.7
+       test? ( dev-java/ant-junit:0 )"
+RDEPEND="
+       virtual/jdk:1.7
+       ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-pool-2,transaction-api,junit-4"
+EANT_BUILD_TARGET="build-jar"
+
+src_test() {
+       local TESTS_TO_DELETE=()
+
+       function test_to_del() {
+               local TEST_FILE=$1
+               TESTS_TO_DELETE+=(${TEST_FILE})
+       }
+
+       function rm_tests() {
+               for TEST_FILE in ${TESTS_TO_DELETE[@]}; do
+                       ebegin "Removing test file ${TEST_FILE}"
+                       rm "${TEST_FILE}" || die
+                       eend $?
+               done
+       }
+
+       # These tests depend on a geronimo,
+       # which is not packaged yet for Gentoo unfortunately. 
+       # See bug #348853.
+
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
+       test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestTransactionContext.java
+
+       # This one fails.
+       test_to_del src/test/java/org/apache/commons/dbcp2/TestJndi.java
+
+       rm_tests
+
+       java-pkg-2_src_test
+}
+
+src_install() {
+       java-pkg_newjar dist/${MY_PN}-${MY_PV}.jar ${PN}.jar
+       dodoc README.txt RELEASE-NOTES.txt
+
+       use doc && java-pkg_dojavadoc dist/docs/api
+       use source && java-pkg_dosrc src/main/java/*
+}