monsieurp 15/03/20 15:34:23 Modified: commons-dbcp-1.4-r2.ebuild ChangeLog Added: commons-dbcp-2.1.ebuild Log: 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: [email protected] (Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.6 dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild?r1=1.5&r2=1.6 Index: commons-dbcp-1.4-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- commons-dbcp-1.4-r2.ebuild 7 Jun 2012 21:24:10 -0000 1.5 +++ commons-dbcp-1.4-r2.ebuild 20 Mar 2015 15:34:23 -0000 1.6 @@ -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 1.65 dev-java/commons-dbcp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/ChangeLog?rev=1.65&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/ChangeLog?rev=1.65&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/ChangeLog?r1=1.64&r2=1.65 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 3 Aug 2014 10:34:29 -0000 1.64 +++ ChangeLog 20 Mar 2015 15:34:23 -0000 1.65 @@ -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 <[email protected]> +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 <[email protected]> -commons-dbcp-1.2.2-r1.ebuild, -commons-dbcp-1.4-r1.ebuild: 1.1 dev-java/commons-dbcp/commons-dbcp-2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild?rev=1.1&content-type=text/plain Index: commons-dbcp-2.1.ebuild =================================================================== # 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/* }
