diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-08-07 00:32:55 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-07 00:32:55 +0000 |
| commit | 1a17d96fda03442982b4bedf9c6f9b799f164207 (patch) | |
| tree | f922ac01bacc4029fcfec58bd78dbf0995092494 /dev-java | |
| parent | Marking amd64, sparc stable (diff) | |
| download | gentoo-2-1a17d96fda03442982b4bedf9c6f9b799f164207.tar.gz gentoo-2-1a17d96fda03442982b4bedf9c6f9b799f164207.tar.bz2 gentoo-2-1a17d96fda03442982b4bedf9c6f9b799f164207.zip | |
Updated depenedencies, so that Java 1.6 won\'t be used at build time, because it causes build errors.
(Portage version: 2.1.1_pre3-r5)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-dbcp/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index cfe25e0f868b..a51f4c1a871c 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-dbcp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.23 2006/07/22 22:36:41 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.24 2006/08/07 00:32:55 nichoj Exp $ + + 07 Aug 2006; Joshua Nichols <nichoj@gentoo.org> + commons-dbcp-1.2.1-r1.ebuild: + Updated depenedencies, so that Java 1.6 won't be used at build time, because + it causes build errors. *commons-dbcp-1.2.1-r1 (22 Jul 2006) diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild index 5140ab4f05c5..ceb7d5cc0375 100644 --- a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild +++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild @@ -1,18 +1,25 @@ # Copyright 1999-2006 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.1-r1.ebuild,v 1.1 2006/07/22 22:36:41 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.2 2006/08/07 00:32:55 nichoj Exp $ inherit java-pkg-2 java-ant-2 DESCRIPTION="Jakarta component providing database connection pooling API" HOMEPAGE="http://jakarta.apache.org/commons/dbcp/" SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz" -RDEPEND=">=virtual/jre-1.3 +COMMON_DEP=" >=dev-java/commons-collections-2.0 >=dev-java/commons-pool-1.1" -DEPEND=">=virtual/jdk-1.3 +RDEPEND=">=virtual/jre-1.3 + ${COMMON_DEP}" +# FIXME doesn't like API changes with Java 1.6 +DEPEND="|| ( + =virtual/jdk-1.3* + =virtual/jdk-1.4* + =virtual/jdk-1.5* + ) >=dev-java/ant-core-1.4 - ${RDEPEND} + ${COMMON_DEP} source? ( app-arch/zip )" LICENSE="Apache-1.1" SLOT="0" |