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

Package-Manager: portage-2.1.1_pre1

6 files changed, 176 insertions, 15 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/Manifest b/dev-db/hsqldb/Manifest
index 3b4b128a2f42..7af7f898e244 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,21 +1,50 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 12bd9ba9570f550754d836702c3a07fb ChangeLog 2170
-MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64
-MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r2 64
+AUX hsqldb 461 RMD160 243068472de473fbef068ffc328d50f3de1f8d0b SHA1 187a7e3ec9386c70bd5ed9282dcef71644f6ba13 SHA256 6d0bc448f54fee5beadef10e3ddd5750f495abc46e2be4825963dabbddc5151a
 MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
+RMD160 243068472de473fbef068ffc328d50f3de1f8d0b files/hsqldb 461
+SHA256 6d0bc448f54fee5beadef10e3ddd5750f495abc46e2be4825963dabbddc5151a files/hsqldb 461
+AUX server.properties 153 RMD160 177c15c932a5843e057ae06bc4b718b6e657baa4 SHA1 05de2238f40bcd8b5a4d6054dad1bba5b519d923 SHA256 10b5eae835669b7762b11c7b8ce0ec803cd7ca23db36717e5ff3b6af1fe0148e
 MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
+RMD160 177c15c932a5843e057ae06bc4b718b6e657baa4 files/server.properties 153
+SHA256 10b5eae835669b7762b11c7b8ce0ec803cd7ca23db36717e5ff3b6af1fe0148e files/server.properties 153
+AUX server.properties-r1 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA1 bd7a3cd95e451c6bf11b28609819450cf396221c SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd
 MD5 0a8db7a417272c532f28a9e001fd32dd files/server.properties-r1 686
+RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd files/server.properties-r1 686
+SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd files/server.properties-r1 686
+AUX sqltool.rc 339 RMD160 28a0126b319e592ceb92ca64ef1dbba5b5db603c SHA1 6d9ecb6749d26b55b772e7a1a5da923a7f567207 SHA256 781f02525e436dc6452774e37acd502ecd593310ce75525daa6d57329d8f55af
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
+RMD160 28a0126b319e592ceb92ca64ef1dbba5b5db603c files/sqltool.rc 339
+SHA256 781f02525e436dc6452774e37acd502ecd593310ce75525daa6d57329d8f55af files/sqltool.rc 339
+AUX sqltool.rc-r1 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 MD5 094dd08ec8e3d3e273b2fab5b32008a7 files/sqltool.rc-r1 619
+RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 files/sqltool.rc-r1 619
+SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637 files/sqltool.rc-r1 619
+DIST hsqldb_1_7_3_1.zip 2841759 RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 SHA1 3e75e67e04c15706997e6b19040bd0c34aeea310 SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676
+EBUILD hsqldb-1.7.3.1-r1.ebuild 2484 RMD160 698be9448a130d85b6c0bc89968a99068578678e SHA1 44af97b4351771d6171d758335149da939510c28 SHA256 e3770ca68c737c5449302e4cedb3b1903cff0454707e46eef396e02df719a618
 MD5 fdaba688267d398e70b0468d0b9fe3bb hsqldb-1.7.3.1-r1.ebuild 2484
+RMD160 698be9448a130d85b6c0bc89968a99068578678e hsqldb-1.7.3.1-r1.ebuild 2484
+SHA256 e3770ca68c737c5449302e4cedb3b1903cff0454707e46eef396e02df719a618 hsqldb-1.7.3.1-r1.ebuild 2484
+EBUILD hsqldb-1.7.3.1-r2.ebuild 3807 RMD160 1292f6e3a75a92d8d6ea31e4bc1f555569ffb9f1 SHA1 4c5207feb0c9c3a9dd44f739e183e5db75164190 SHA256 eb1adee3e4c6b4930798892a8cfcd4f33d91a945660c6beb2255a64414c87eee
 MD5 c082ccea6fa17d84f1c45b00ea7a9c44 hsqldb-1.7.3.1-r2.ebuild 3807
+RMD160 1292f6e3a75a92d8d6ea31e4bc1f555569ffb9f1 hsqldb-1.7.3.1-r2.ebuild 3807
+SHA256 eb1adee3e4c6b4930798892a8cfcd4f33d91a945660c6beb2255a64414c87eee hsqldb-1.7.3.1-r2.ebuild 3807
+EBUILD hsqldb-1.7.3.1-r3.ebuild 3625 RMD160 49a19a0e273414d4876c70dc167f20acea9d156d SHA1 2cd0f412ecc74118d0034281a6cd44839388a593 SHA256 759e4ebd6b58673a338aabf42dce335c2d1f41117932a7d266b034554dc8b3de
+MD5 95b9463b3a69e8df6c12b7d2604a78c2 hsqldb-1.7.3.1-r3.ebuild 3625
+RMD160 49a19a0e273414d4876c70dc167f20acea9d156d hsqldb-1.7.3.1-r3.ebuild 3625
+SHA256 759e4ebd6b58673a338aabf42dce335c2d1f41117932a7d266b034554dc8b3de hsqldb-1.7.3.1-r3.ebuild 3625
+MISC ChangeLog 2319 RMD160 69825e3819899afcef2725567d8f43e6ccd064db SHA1 105e94673c1682047d6b6c38e2cf2553cca15636 SHA256 d1b389b0a6de4ce0485bcd72db57fda2c6a53b979171ae65f1a7a19ab9139d51
+MD5 1f8033c4bc774ff92c9112bab20b0291 ChangeLog 2319
+RMD160 69825e3819899afcef2725567d8f43e6ccd064db ChangeLog 2319
+SHA256 d1b389b0a6de4ce0485bcd72db57fda2c6a53b979171ae65f1a7a19ab9139d51 ChangeLog 2319
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDsMhbndWRXhKOboURAqArAJ9RPc54Gbss9IivkbgbFfaK7y8RcQCg3WwP
-Sjya2lU/44Glik/2CRGRBr4=
-=7LjM
------END PGP SIGNATURE-----
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r1 238
+RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r1 238
+SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r1 238
+MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r2 238
+RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r2 238
+SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r2 238
+MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r3 238
+RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r3 238
+SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r3 238
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)."
+}