new upstream version. fixes bug #78640.

(Portage version: 2.0.51-r12)

4 files changed, 95 insertions, 1 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index e8ad45e59b2b..4876460175ef 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2005/01/18 16:47:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.5 2005/01/19 12:00:40 luckyduck Exp $
+
+*hsqldb-1.7.3.1 (19 Jan 2005)
+
+  19 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +hsqldb-1.7.3.1.ebuild:
+  new upstream version. fixes bug #78640
 
   18 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> hsqldb-1.7.2.4.ebuild:
   minor dependency issue and a typo in pkg_postinst removed. fixes bug #78414.
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 81156122574c..3e525b0e3cf9 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,7 +1,9 @@
+MD5 02efdfd366eb01ab7ff831726b314c9c hsqldb-1.7.3.1.ebuild 2481
 MD5 02efdfd366eb01ab7ff831726b314c9c hsqldb-1.7.2.4.ebuild 2481
 MD5 de215e5f3942aa62fc6b1895920e6d09 ChangeLog 769
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
 MD5 eb7b48e9b818783d80ec3b27816f52d4 files/digest-hsqldb-1.7.2.4 64
+MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1 64
 MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1
new file mode 100644
index 000000000000..ca1745f96ca7
--- /dev/null
+++ b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1
@@ -0,0 +1 @@
+MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild
new file mode 100644
index 000000000000..c1be21453930
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/01/19 12:00:40 luckyduck Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="HSQLDB is the leading SQL relational database engine written in Java."
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.zip"
+HOMEPAGE="http://hsqldb.sourceforge.net"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="jikes doc"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		dev-java/ant-core
+		=dev-java/servletapi-2.3*"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+		rm *.jar
+		java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar
+	cd ..
+	sed -i -r \
+		-e "s/etc\/sysconfig/etc\/conf.d/g" \
+			bin/hsqldb
+	einfo "Cleaning build directory..."
+	ant -q -f build/build.xml cleanall || die "failed too clean"
+
+	einfo "Preparing configuration files..."
+	mkdir conf
+	JAVA_CMD=$(java-config -J)
+	HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+	sed -e "s/^JAVA_EXECUTABLE=.*$/JAVA_EXECUTABLE=${JAVA_CMD//\//\\/}/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 conf
+	cp ${FILESDIR}/sqltool.rc conf
+}
+
+src_compile() {
+	local antflags="-f build/build.xml"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	antflags="${antflags} jar jarclient jarsqltool"
+	use doc && antflags="${antflags} javadocdev"
+	einfo "Starting compilation..."
+	ant -q ${antflags} || die "Compilation failed."
+}
+
+src_install() {
+	dojar lib/hsql*.jar
+	dodoc doc/*.txt
+	use doc && dohtml -r doc/src
+
+	doinitd ${FILESDIR}/hsqldb
+	doconfd conf/hsqldb
+	insinto /etc/hsqldb
+	insopts -m 0600
+	doins conf/server.properties
+	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
+}
+
+pkg_postinst() {
+	if ! enewgroup hsqldb || ! enewuser hsqldb -1 /bin/sh /dev/null hsqldb; then
+		die "Unable to add hsqldb user and hsqldb group."
+	fi
+
+	chown -R hsqldb:hsqldb /var/lib/hsqldb
+	chmod o-rwx /var/lib/hsqldb
+}
+