diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2006-11-26 10:55:46 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2006-11-26 10:55:46 +0000 |
| commit | fcdc61fd091b82c30e701008aa30a4ec97cbc449 (patch) | |
| tree | aa3b7cf68833b16fdefd684b04369f9eb286ff5b /dev-db/hsqldb | |
| parent | Updating homepage (diff) | |
| download | gentoo-2-fcdc61fd091b82c30e701008aa30a4ec97cbc449.tar.gz gentoo-2-fcdc61fd091b82c30e701008aa30a4ec97cbc449.tar.bz2 gentoo-2-fcdc61fd091b82c30e701008aa30a4ec97cbc449.zip | |
Fixed to compile with system VM set to something else than dev-java/sun-jdk.
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'dev-db/hsqldb')
| -rw-r--r-- | dev-db/hsqldb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog index 12540fe4f065..d806b0e18b8a 100644 --- a/dev-db/hsqldb/ChangeLog +++ b/dev-db/hsqldb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/hsqldb # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.19 2006/10/06 01:19:36 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.20 2006/11/26 10:55:46 betelgeuse Exp $ + + 26 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> + hsqldb-1.7.3.1-r3.ebuild: + Fixed to compile with system VM set to something else than dev-java/sun-jdk. 06 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> hsqldb-1.7.3.1-r3.ebuild: diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild index 7e0d5a1dd022..fff518829bfe 100644 --- a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild +++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.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-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.3 2006/10/06 01:19:36 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.4 2006/11/26 10:55:46 betelgeuse Exp $ inherit java-pkg-2 eutils versionator java-ant-2 @@ -16,16 +16,18 @@ SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc" IUSE="doc source" -RDEPEND=">=virtual/jre-1.4 - =dev-java/servletapi-2.3*" -DEPEND=">=virtual/jdk-1.4 +CDEP="=dev-java/servletapi-2.3*" + +# doesn't like Java 1.6 due to JDBC changes +RDEPEND=" + || ( =virtual/jre-1.4* =virtual/jre-1.5* ) + ${CDEP}" +DEPEND=" + || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) app-arch/unzip dev-java/ant-core source? ( app-arch/zip ) - ${RDEPEND}" - -# doesn't like Java 1.6 due to JDBC changes -JAVA_PKG_NV_DEPEND="=dev-java/sun-jdk-1.4* =dev-java/sun-jdk-1.5*" + ${CDEP}" S="${WORKDIR}/${PN}" |