summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2011-10-19 01:58:38 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2011-10-19 01:58:38 +0000
commit03e26d1c71215c7a8c57dea7506e80ede31dab03 (patch)
treefbac8ef744b4e2f52c48018f7a93f9b171fdbbb4 /dev-db/hsqldb
parentdev-java/antlr: fixed bug #385797 (diff)
downloadgentoo-2-03e26d1c71215c7a8c57dea7506e80ede31dab03.tar.gz
gentoo-2-03e26d1c71215c7a8c57dea7506e80ede31dab03.tar.bz2
gentoo-2-03e26d1c71215c7a8c57dea7506e80ede31dab03.zip
dev-db/hsqldb: fixed bug #384161
(Portage version: 2.1.10.29/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/hsqldb')
-rw-r--r--dev-db/hsqldb/ChangeLog8
-rw-r--r--dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 2b244e048cc7..49525c4f8d1d 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/hsqldb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.62 2010/10/17 12:23:18 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.63 2011/10/19 01:58:38 fordfrog Exp $
+
+ 19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> hsqldb-1.8.1.2-r1.ebuild:
+ Not compatible with JDBC 4.1 so restricting compilation to JDK 6 (fixes bug
+ #384161)
17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -hsqldb-1.8.0.10.ebuild,
-files/bundle-all-tools.patch:
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
index 12f0eb0076eb..c47f242bece6 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.5 2010/10/14 16:52:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.6 2011/10/19 01:58:38 fordfrog Exp $
EAPI=1
JAVA_PKG_IUSE="doc source test"
@@ -21,7 +21,7 @@ IUSE=""
CDEPEND="java-virtuals/servlet-api:2.3"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND="virtual/jdk:1.6
test? ( dev-java/junit:0 )
app-arch/unzip
${CDEPEND}"