diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-07-12 22:18:59 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-07-12 22:18:59 +0000 |
| commit | 35a3da383376647421736adf3db081c1ca5f1d62 (patch) | |
| tree | ca2b864f7e4ef8f961ee75edc1bf1347d4392f49 /dev-db/hsqldb | |
| parent | Version bump. Dropped old version. (diff) | |
| download | gentoo-2-35a3da383376647421736adf3db081c1ca5f1d62.tar.gz gentoo-2-35a3da383376647421736adf3db081c1ca5f1d62.tar.bz2 gentoo-2-35a3da383376647421736adf3db081c1ca5f1d62.zip | |
Prefer virtual/jdk:1.5 over 1.4 and use JAVA_PKG_IUSE.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'dev-db/hsqldb')
| -rw-r--r-- | dev-db/hsqldb/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog index 425364873083..da22f2b41f0a 100644 --- a/dev-db/hsqldb/ChangeLog +++ b/dev-db/hsqldb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/hsqldb # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.23 2007/03/13 17:07:13 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.24 2007/07/12 22:18:59 betelgeuse Exp $ + + 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> + hsqldb-1.7.3.1-r3.ebuild: + Prefer virtual/jdk:1.5 over 1.4 and use JAVA_PKG_IUSE. 13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> -hsqldb-1.7.3.1-r2.ebuild: @@ -35,6 +39,8 @@ hsqldb-1.7.3.1-r3.ebuild: ant_src_unpack -> src_unpack +*hsqldb-1.7.3.1-r3 (01 Jul 2006) + 01 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +hsqldb-1.7.3.1-r3.ebuild: Revision bump to support new Java system. Also addresses bug #137332 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 58a2fafd5f6a..2d8f74050d54 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,8 @@ # Copyright 1999-2007 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.6 2007/01/09 15:34:06 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.7 2007/07/12 22:18:59 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 eutils versionator java-ant-2 @@ -14,19 +16,15 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc source" 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* ) +RDEPEND=">=virtual/jre-1.4 ${CDEP}" DEPEND=" - || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) + || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) app-arch/unzip - dev-java/ant-core - source? ( app-arch/zip ) ${CDEP}" S="${WORKDIR}/${PN}" |