From 06adaadb387fb063466d286b582335f08462e2fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Wed, 19 Oct 2011 00:59:22 +0000 Subject: [PATCH] dev-java/commons-dbcp: removed obsolete ebuild Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- dev-java/commons-dbcp/ChangeLog | 5 +- dev-java/commons-dbcp/Manifest | 3 +- dev-java/commons-dbcp/commons-dbcp-1.4.ebuild | 50 ------------------- 3 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 dev-java/commons-dbcp/commons-dbcp-1.4.ebuild diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index 7eaac2326c59..77e9a0ff50ba 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/commons-dbcp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.55 2011/10/19 00:57:29 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.56 2011/10/19 00:59:22 fordfrog Exp $ + + 19 Oct 2011; Miroslav Å ulc -commons-dbcp-1.4.ebuild: + Removed obsolete ebuild 19 Oct 2011; Miroslav Å ulc commons-dbcp-1.4-r1.ebuild: Fixed compilation of version 1.4 by restricting it to compile with JDK 1.6 diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest index f34d6d93b34e..862bd730ef4c 100644 --- a/dev-java/commons-dbcp/Manifest +++ b/dev-java/commons-dbcp/Manifest @@ -2,6 +2,5 @@ DIST commons-dbcp-1.2.2-src.tar.gz 641291 RMD160 271dcf459e2a4693f193481130bef67 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 1573 RMD160 7ab571b35469c9c6eddc39ab2659972980be6a03 SHA1 6d62555575abf805d24108abaf3d67ee06d9265e SHA256 396abcb248ef307288a0d7981aa55f20df0b43cc4d145375c91d780c244d4d88 -EBUILD commons-dbcp-1.4.ebuild 1504 RMD160 33554a43da57a6c79388a5c24e137720d6d4c008 SHA1 e7f63a39058dada22c5d95f13014ea2620444d80 SHA256 02084d8203e504f148d6313ab167e8588540f31c87ecd08f10af0d5794f49ecf -MISC ChangeLog 7698 RMD160 9ea5cbe428b5ad8c5a6d704a8a308ad29a8a6ad8 SHA1 386c46788cd455ad196f3870c93bdc7b5c20e214 SHA256 8c1e437ef0098bc85f3cbcece12fa867cd38cd30dc2df7298922d63ebe7d0fe4 +MISC ChangeLog 7803 RMD160 0018f0d787bc31970019a0de3b908e6db2a23b7d SHA1 aa4ced1510f6059e8a348722e66545454736f2e3 SHA256 173a4816cb47bff7902877f16ae4b58c0d848d0521b930d269ebb587cd23716f MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4.ebuild deleted file mode 100644 index e31030ca4f00..000000000000 --- a/dev-java/commons-dbcp/commons-dbcp-1.4.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.4.ebuild,v 1.3 2010/12/22 11:47:07 hwoarang 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/jta" -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 jta)" >> build.properties - echo "jta-impl.jar=$(java-pkg_getjars jta)" >> 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/* -} -- 2.26.2