Version bump. Fixes bug #228697.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

4 files changed, 247 insertions, 5 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index d3995e37ab0d..b8d53c77ef7a 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.45 2008/05/30 22:19:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.46 2008/07/04 19:57:16 betelgeuse Exp $
+
+*hsqldb-1.8.0.10 (04 Jul 2008)
+
+  04 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/StringComparator.java, +hsqldb-1.8.0.10.ebuild:
+  Version bump. Fixes bug #228697.
 
   30 May 2008; Petteri Räty <betelgeuse@gentoo.org>
   hsqldb-1.8.0.9-r1.ebuild:
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index cd70a471c15e..86d86db2ad48 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX 35hsqldb 33 RMD160 7f6db20183f2a6ebfe3054f8c3572b7417a4b5e3 SHA1 2f9b09ee3443889c2f1703f57c6ff80b4760aa69 SHA256 bd41e5568084a4856f102863b82f8103b0c9e1ad38423217f75e21d6842e447c
+AUX StringComparator.java 1986 RMD160 c35a39b06d0c1f61e5e3a7f960f6680891d5190b SHA1 360f6e2012436bd871fa2f7e6859564e393f9294 SHA256 9f672518cd27d2da5fb9e0a0f7ffe56a872186cdf188cb5840598ed88b959b95
 AUX bundle-all-tools.patch 873 RMD160 e13225f63d202fda9d3e54b5141b92f88c2c0b99 SHA1 72a5539601cc09d385ec2e867afe9ad38db2eaa8 SHA256 9ed2f92a998045430b8685c846ebfaeb32898828f45255df7a8e09ffab267468
 AUX hsqldb 464 RMD160 9f491a89bc013085205ddcac0cdcc85b26abe431 SHA1 a947e19e7379da582f4193cb6fbdddc884e52333 SHA256 773d18c752b8392fb1b1677789934ea7a531f8cc0276c18917e21c71b717a3a9
 AUX resolve-config-softlinks.patch 846 RMD160 93d6f30829e446f1b5f4fde6f61ab1efdeebd928 SHA1 f1843f12ce59bf866757eff7b385ef1565dea0f2 SHA256 a7de5886aed87fa040e65d265d5418daee38376ba23742fb97119b629b678517
@@ -10,15 +11,17 @@ AUX server.properties-r1 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA
 AUX sqltool.rc 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 AUX sqltool.rc-r1 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 DIST hsqldb_1_7_3_1.zip 2841759 RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 SHA1 3e75e67e04c15706997e6b19040bd0c34aeea310 SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676
+DIST hsqldb_1_8_0_10.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 DIST hsqldb_1_8_0_9.zip 3493449 RMD160 202b3dce4b737f928e57e281f4035df378526ce1 SHA1 fab82a70adedaeb427f8115736bd2c8bb6358556 SHA256 e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec
 EBUILD hsqldb-1.7.3.1-r3.ebuild 3621 RMD160 bbe349a6dc800bada1fd7922d05ab100ed2f9bc2 SHA1 d860336d1e05565fd30a30be2c6a5065d7bca058 SHA256 2eaa77aff2476a4fdbfb858f539b80b03161da39f25c03d4d3aa07b0246e6a2d
+EBUILD hsqldb-1.8.0.10.ebuild 5891 RMD160 05d570b15dfe91a12f4a52a437cfb1e1a5d83a3d SHA1 b0d5b95d9b1400d7a20d981950572b9779637922 SHA256 2b019fbd15e957365f78f95d48aa61061f41551789334eb2992396554e5c5d94
 EBUILD hsqldb-1.8.0.9-r1.ebuild 5487 RMD160 69d897e69d736afc6205bda7b41d9b32faab2e4c SHA1 a057625012dbe2a41dc67f4aa4ab23d73f3d2b6c SHA256 2046910f4016a66e57c99feb5060a312d02b029840c9fdaee542cebfdca15a6e
-MISC ChangeLog 6182 RMD160 fded2671b2fd7ecc4f363f9429efa45d0fbcb6cb SHA1 1764e195f387eea1c49966752e143f110a7f88a9 SHA256 c93402d683c02702ff0ded7309bdc4b097a3a6d922cc94038bdc00569efe0834
+MISC ChangeLog 6360 RMD160 dbde607eeff47a10096f8c18b15bf4815c29a486 SHA1 b26f4a8ee4aa2718726fb248e2dffd2de8c47e71 SHA256 7ec524dd9a8c2e8230f53ba46038059a3c1ca1241dfc4cf8b612e1baf57a70f6
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhAfXMACgkQcxLzpIGCsLSTOQCgmqd9xdCVDMc9T36qsXPjxn7U
-1iYAn2VLBW9nJP01mgtmttcFobM/VSG9
-=7Bcm
+iEYEARECAAYFAkhugKUACgkQcxLzpIGCsLQoFQCeK06OltEAJz/myA/J48kv+Cso
+uNwAn0zzsw/bUFQnCUAPuHsTizjvzsp+
+=uoCi
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/files/StringComparator.java b/dev-db/hsqldb/files/StringComparator.java
new file mode 100644
index 000000000000..ae0f7b0fb979
--- /dev/null
+++ b/dev-db/hsqldb/files/StringComparator.java
@@ -0,0 +1,53 @@
+/* Copyright (c) 2001-2008, The HSQL Development Group
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the HSQL Development Group nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+package org.hsqldb.lib;
+
+public class StringComparator implements ObjectComparator {
+
+    public int compare(Object a, Object b) {
+
+        // handle nulls
+        if (a == b) {
+            return 0;
+        }
+
+        if (a == null) {
+            return -1;
+        }
+
+        if (b == null) {
+            return 1;
+        }
+
+        return ((String) a).compareTo((String) b);
+    }
+}
diff --git a/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild b/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild
new file mode 100644
index 000000000000..683b2d9affef
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild,v 1.1 2008/07/04 19:57:16 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source test"
+inherit eutils versionator java-pkg-2 java-ant-2
+
+MY_PV=$(replace_all_version_separators _ )
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="The leading SQL relational database engine written in Java."
+HOMEPAGE="http://hsqldb.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="java6"
+
+CDEPEND="java-virtuals/servlet-api:2.3"
+RDEPEND="java6? ( >=virtual/jre-1.6 )
+	!java6? ( >=virtual/jre-1.4 )
+	${CDEPEND}"
+DEPEND="java6? ( >=virtual/jdk-1.6 )
+	!java6? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+	test? ( dev-java/junit:0 )
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar || die
+	java-pkg_jar-from --virtual --into lib servlet-api-2.3
+
+	sed -i -r \
+		-e "s#etc/sysconfig#etc/conf.d#g" \
+		bin/hsqldb || die
+
+	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
+
+	epatch "${FILESDIR}/resolve-config-softlinks.patch"
+	java-pkg_filter-compiler jikes
+
+	mkdir conf
+	sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \
+		-e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \
+		-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
+		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
+		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
+	cp "${FILESDIR}/server.properties" conf/ || die
+	cp "${FILESDIR}/sqltool.rc" conf/ || die
+
+	# Missing source file - needed for tests
+	# http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131
+	cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
+}
+
+# EANT_BUILD_XML used also in src_unpack
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
+EANT_DOC_TARGET="javadocdev"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	eant -f ${EANT_BUILD_XML} jartest
+	cd testrun/hsqldb || die
+	./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
+	# TODO. These fail. Investigate why.
+	#cd "${S}/testrun/sqltool" || die
+	#CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
+}
+
+src_install() {
+	java-pkg_dojar lib/hsql*.jar
+
+	if use doc; then
+		dodoc doc/*.txt
+		java-pkg_dohtml -r doc/guide
+		java-pkg_dohtml -r doc/src
+	fi
+	use source && java-pkg_dosrc src/*
+
+	# Install env file for CONFIG_PROTECT support
+	doenvd "${FILESDIR}/35hsqldb" || die
+
+	# Put init, configuration and authorization files in /etc
+	doinitd "${FILESDIR}/hsqldb" || die
+	doconfd conf/hsqldb || die
+	dodir /etc/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/server.properties || die
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc || die
+
+	# Install init script
+	dodir "${HSQLDB_HOME}/bin"
+	keepdir "${HSQLDB_HOME}"
+	exeinto "${HSQLDB_HOME}/bin"
+	doexe bin/hsqldb || die
+
+	# Create symlinks to authorization files in the server home dir
+	# (required by the hqldb init script)
+	insinto "${HSQLDB_HOME}"
+	dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties" || die
+	dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc" || die
+
+	# Make sure that files have correct permissions
+	chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}"
+	chmod o-rwx "${D}${HSQLDB_HOME}"
+}
+
+pkg_postinst() {
+	ewarn "If you intend to run Hsqldb in Server mode and you want to create"
+	ewarn "additional databases, remember to put correct information in both"
+	ewarn "'server.properties' and 'sqltool.rc' files."
+	ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+	ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
+	echo
+	elog "Example:"
+	echo
+	elog "/etc/hsqldb/server.properties"
+	elog "============================="
+	elog "server.database.1=file:xdb/xdb"
+	elog "server.dbname.1=xdb"
+	elog "server.urlid.1=xdb"
+	elog
+	elog "/etc/hsqldb/sqltool.rc"
+	elog "======================"
+	elog "urlid xdb"
+	elog "url jdbc:hsqldb:hsql://localhost/xdb"
+	elog "username sa"
+	elog "password "
+	echo
+	elog "Also note that each hsqldb server can serve only up to 10"
+	elog "different databases simultaneously (with consecutive {0-9}"
+	elog "suffixes in the 'server.properties' file)."
+	echo
+	ewarn "For data manipulation use:"
+	ewarn
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+	ewarn "  --rcFile /var/lib/hsqldb/sqltool.rc <dbname>"
+	echo
+	elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+	elog "and Using Hsqldb' in the Hsqldb docs at:"
+	elog "  http://hsqldb.org/web/hsqlDocsFrame.html"
+	elog "If you intend to run it in the Server mode, it is suggested to add the"
+	elog "init script to your start-up scripts, this should be done like this:"
+	elog "  \`rc-update add hsqldb default\`"
+	echo
+
+	# Enable CONFIG_PROTECT for hsqldb
+	env-update
+	elog "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
+	elog "is added to the CONFIG_PROTECT list. In order to immediately activate"
+	elog "these settings please do:"
+	elog "  \`env-update && source /etc/profile\`"
+	elog "Otherwise the settings will become active next time you login"
+	echo
+}