diff options
-rw-r--r-- | dev-java/commons-dbcp/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild | 50 | ||||
-rw-r--r-- | dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild | 50 |
3 files changed, 6 insertions, 102 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index 854e6452522b..2e49e95ddd67 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,10 @@ # 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.63 2012/06/07 21:24:10 ranger Exp $ +# 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 $ + + 03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> + -commons-dbcp-1.2.2-r1.ebuild, -commons-dbcp-1.4-r1.ebuild: + Remove old 07 Jun 2012; Brent Baude <ranger@gentoo.org> commons-dbcp-1.4-r2.ebuild: Marking commons-dbcp-1.4-r2 ppc for bug 348594 diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild deleted file mode 100644 index f487a14f8613..000000000000 --- a/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 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.2.2-r1.ebuild,v 1.6 2010/11/14 00:40:34 caster Exp $ - -EAPI=2 -JAVA_PKG_IUSE="doc source test" -JAVA_PKG_WANT_BOOTCLASSPATH="1.5" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Jakarta component providing database connection pooling API" -HOMEPAGE="http://commons.apache.org/dbcp/" -SRC_URI="http://archive.apache.org/dist/commons/dbcp/source/${P}-src.tar.gz" -COMMON_DEP=">=dev-java/commons-pool-1.3" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - test? ( - dev-java/junit:0 - www-servers/tomcat:6 - dev-java/xerces:2 - ) - ${COMMON_DEP}" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -S="${WORKDIR}/${P}-src" - -java_prepare() { - echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties - rm -v *.jar || die - java-ant_rewrite-bootclasspath 1.5 -} - -EANT_BUILD_TARGET="build-jar" - -src_test() { - eant test -Djunit.jar="$(java-pkg_getjars junit)" \ - -Dnaming-java.jar="$(java-pkg_getjar tomcat-6 catalina.jar)" \ - -Dxerces.jar="$(java-pkg_getjars xerces-2)" -} - -src_install() { - java-pkg_dojar dist/${PN}*.jar || die "Unable to install" - dodoc README.txt RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild deleted file mode 100644 index dd0e6cda15ba..000000000000 --- a/dev-java/commons-dbcp/commons-dbcp-1.4-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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-r1.ebuild,v 1.5 2012/03/12 15:07:40 ranger Exp $ - -EAPI=2 -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" -COMMON_DEP=">=dev-java/commons-pool-1.3 - dev-java/glassfish-transaction-api:0" -RDEPEND=">=virtual/jre-1.6 - ${COMMON_DEP}" -DEPEND="virtual/jdk:1.6 - test? ( - dev-java/junit:0 - www-servers/tomcat:6 - dev-java/xerces:2 - ) - ${COMMON_DEP}" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -S="${WORKDIR}/${P}-src" - -java_prepare() { - echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties - echo "jta-spec.jar=$(java-pkg_getjars glassfish-transaction-api)" >> build.properties - echo "jta-impl.jar=$(java-pkg_getjars glassfish-transaction-api)" >> build.properties -} - -EANT_BUILD_TARGET="build-jar" - -src_test() { - eant test -Djunit.jar="$(java-pkg_getjars junit)" \ - -Dnaming-java.jar="$(java-pkg_getjar tomcat-6 catalina.jar)" \ - -Dxerces.jar="$(java-pkg_getjars xerces-2)" -} - -src_install() { - java-pkg_dojar dist/${PN}*.jar || die "Unable to install" - dodoc README.txt RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} |