Revision bump to support new Java system. Also addresses bug #137332

(Portage version: 2.1.1_pre1)

5 files changed, 134 insertions, 2 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 58e1e2b1a7c7..64db1d206228 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/hsqldb
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.14 2005/12/27 04:53:12 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.15 2006/07/01 16:40:38 nichoj Exp $
+
+  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
 
 *hsqldb-1.7.3.1-r2 (27 Dec 2005)
 
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1
index ca1745f96ca7..9d363620d762 100644
--- a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1
@@ -1 +1,3 @@
 MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
+RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 hsqldb_1_7_3_1.zip 2841759
+SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
index ca1745f96ca7..9d363620d762 100644
--- a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
@@ -1 +1,3 @@
 MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
+RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 hsqldb_1_7_3_1.zip 2841759
+SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r3 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r3
new file mode 100644
index 000000000000..9d363620d762
--- /dev/null
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r3
@@ -0,0 +1,3 @@
+MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
+RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 hsqldb_1_7_3_1.zip 2841759
+SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
new file mode 100644
index 000000000000..bc778246b29d
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
@@ -0,0 +1,122 @@
+# 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.1 2006/07/01 16:40:38 nichoj Exp $
+
+inherit java-pkg-2 eutils versionator 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.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/servletapi-2.3*"
+DEPEND=">=virtual/jdk-1.4
+	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*"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+
+	java-pkg-2_pkg_setup
+}
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+		rm *.jar
+		java-pkg_jar-from servletapi-2.3
+	cd ${S}
+	sed -i -r \
+		-e "s/etc\/sysconfig/etc\/conf.d/g" \
+			bin/hsqldb
+
+	ant -q -f build/build.xml cleanall || die "failed to clean"
+
+	mkdir conf
+	local HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+	sed -e 's:^JAVA_EXECUTABLE=.*$:JAVA_EXECUTABLE=$(java-config --java):g' \
+		-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
+	cp ${FILESDIR}/server.properties-r1 conf/server.properties
+	cp ${FILESDIR}/sqltool.rc-r1 conf/sqltool.rc
+}
+
+src_compile() {
+	eant -f build/build.xml jar jarclient jarsqltool $(use_doc javadocdev)
+}
+
+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/*
+
+	doinitd ${FILESDIR}/hsqldb
+	doconfd conf/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	insopts -m 0600 -o hsqldb -g hsqldb
+	doins conf/server.properties
+	insopts -m 0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc
+
+	dodir /var/lib/hsqldb/bin
+	keepdir /var/lib/hsqldb
+	exeinto /var/lib/hsqldb/bin
+	doexe bin/hsqldb
+	dosym /etc/hsqldb/server.properties /var/lib/hsqldb/server.properties
+	dosym /etc/hsqldb/sqltool.rc /var/lib/hsqldb/sqltool.rc
+	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
+	chmod o-rwx ${D}/var/lib/hsqldb
+}
+
+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)"
+	einfo
+	einfo "Example:"
+	einfo
+	einfo "/etc/hsqldb/server.properties"
+	einfo "============================="
+	einfo "server.database.1=file:/var/lib/hsqldb/newdb/newdb"
+	einfo "server.dbname.1=newdb"
+	einfo "server.urlid.1=newdb"
+	einfo
+	einfo "/etc/hsqldb/sqltool.rc"
+	einfo "======================"
+	einfo "urlid newdb"
+	einfo "url jdbc:hsqldb:hsql://localhost/newdb"
+	einfo "username sa"
+	einfo "password "
+	ewarn
+	ewarn "Also note that each hsqldb server can serve only up to 10"
+	ewarn "different databases simultaneously (with consecutive {0-9}"
+	ewarn "suffixes in the 'server.properties' file)."
+}