diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-08-07 00:11:55 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-07 00:11:55 +0000 |
| commit | 26bbac36f7265ed9cbe9c2c465900dca3d58fc04 (patch) | |
| tree | c75ae4b25b7ad9ea781bdcdbb107811257cca981 /dev-java/jaxme | |
| parent | Version bumped (diff) | |
| download | gentoo-2-26bbac36f7265ed9cbe9c2c465900dca3d58fc04.tar.gz gentoo-2-26bbac36f7265ed9cbe9c2c465900dca3d58fc04.tar.bz2 gentoo-2-26bbac36f7265ed9cbe9c2c465900dca3d58fc04.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/jaxme')
| -rw-r--r-- | dev-java/jaxme/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jaxme/jaxme-0.3.1-r2.ebuild | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog index aeba21b52d9e..249698a4af76 100644 --- a/dev-java/jaxme/ChangeLog +++ b/dev-java/jaxme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jaxme # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.10 2006/07/28 11:12:20 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.11 2006/08/07 00:11:55 nichoj Exp $ + + 07 Aug 2006; Joshua Nichols <nichoj@gentoo.org> jaxme-0.3.1-r2.ebuild: + Updated depenedencies, so that Java 1.6 won't be used at build time, because + it causes build errors. *jaxme-0.3.1-r2 (28 Jul 2006) diff --git a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild index 6423202996dc..9c5aa5e49461 100644 --- a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild +++ b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.1 2006/07/28 11:12:20 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.2 2006/08/07 00:11:55 nichoj Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -15,15 +15,21 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc source" -RDEPEND=">=virtual/jre-1.4 +COMMON_DEP=" dev-db/hsqldb >=dev-java/xerces-2.6 dev-java/junit >=dev-java/log4j-1.2.8 dev-java/xmldb" -DEPEND=">=virtual/jdk-1.4 +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +# FIXME doesn't like to compile with Java 1.6 +DEPEND="|| ( + =virtual/jdk-1.4* + =virtual/jdk-1.5* + ) dev-java/ant-core - ${RDEPEND}" + ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" |