dev-db/hsqldb: fixed bug #384161

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 2b244e048cc77622dd9542b316058496ede7688b..49525c4f8d1dff0da450e2195be56fc92ad479d4 100644 (file)
--- 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/Manifest b/dev-db/hsqldb/Manifest
index 5c85a061ebde6900918941dd7549d24d8c17cd77..cf0eb57df53666b55d6931839aa5991f8b73ee0e 100644 (file)
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -6,6 +6,6 @@ AUX resolve-config-softlinks.patch 846 RMD160 93d6f30829e446f1b5f4fde6f61ab1efde
 AUX server.properties 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA1 bd7a3cd95e451c6bf11b28609819450cf396221c SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd
 AUX sqltool.rc 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 DIST hsqldb_1_8_1_2.zip 3516460 RMD160 da834ca11e34c8acca6539c54283018b070615e5 SHA1 b550a41d2376869dc156d93bcf16d46d657e540c SHA256 828776b24364781ae4443d4d64f60eb2a80ab5179637b8415ec91590f82d7bcb
-EBUILD hsqldb-1.8.1.2-r1.ebuild 5834 RMD160 a7f2345a21dfb01a08c83334bc98de1bacd4c5ef SHA1 633ec08bd857aefdd63ae09b82571932db21b974 SHA256 ab2bcafc251cc91efce1cc9fd1498c88433f75b3f791c18d4c3894e3350ad7e6
-MISC ChangeLog 8337 RMD160 03aa7b39d45ed7d390372f62575e4934bb3528aa SHA1 622d2c23258f33d89fa227d6c6eb78548800ab1f SHA256 16d95018a252ca62b3bacdc1ff5a8113a40e626380ad0d208d73bfc62b3a1904
+EBUILD hsqldb-1.8.1.2-r1.ebuild 5834 RMD160 a6a08eb80f5353b810a47f2ddd394549e55401ba SHA1 6c7aaa695532957039b5efaf99d9a696e6158418 SHA256 41994a0fbc8c67020435deaf501c0435a71700a991d9aa3593a68aab18a63179
+MISC ChangeLog 8507 RMD160 3dc068db182faff92568a436d41dedb076396bc3 SHA1 e1d1711dd287afe86d8b45512502f18fb6317fc8 SHA256 803134213875eebe43011a06712d59d1a5b65e1c063d720afcb9032301356a83
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

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 12f0eb0076ebc02c6d112d860f8036d7ee95c65d..c47f242bece6ae166281825b5231a6c2922698ab 100644 (file)
--- 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}"