stable on amd64, x86 and ppc

Package-Manager: portage-2.0.51.21

5 files changed, 32 insertions, 113 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 5e9617c332dc..7c41e25b4a43 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2005/03/23 14:48:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.9 2005/05/04 20:20:37 luckyduck Exp $
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -hsqldb-1.7.2.4.ebuild,
+  hsqldb-1.7.3.1.ebuild:
+  stable on amd64, x86 and ppc
 
   23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> hsqldb-1.7.3.1.ebuild:
   Keyworded ~sparc wrt #84992
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 9b38927551fd..60b5db5e0318 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d48e9f164441b3f78c6d3c25a362a5dd ChangeLog 1260
-MD5 a9935465c8e90ffa4f47759f2253b2db hsqldb-1.7.2.4.ebuild 2509
-MD5 75de5b65df73321be294195310c3db27 hsqldb-1.7.3.1.ebuild 2523
+MD5 5ab5571ca99da4bd4452db20e8b193b5 hsqldb-1.7.3.1.ebuild 2585
+MD5 5fa5a0a097453cc1551d81fbe7dd553e ChangeLog 1394
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 eb7b48e9b818783d80ec3b27816f52d4 files/digest-hsqldb-1.7.2.4 64
+MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
 MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1 64
 MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
-MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCT6p5MXMsRNMHhmARAhgCAJ4pLkVYnGPZu9PpElbjBzuvTKP4bgCfW1WA
-13WklkNe/Y6qa63YKLbaZrA=
-=ixpe
+iD8DBQFCeS6s06ebR+OMO78RAiD5AJ42dXjkgRQlMLLvfySjNOhcK/K5BACZAZA1
+b6FfrfGE/jDgknf3TYI72Mo=
+=VIBU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.2.4 b/dev-db/hsqldb/files/digest-hsqldb-1.7.2.4
deleted file mode 100644
index 32d48d5ae908..000000000000
--- a/dev-db/hsqldb/files/digest-hsqldb-1.7.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c10305768241738a240759c1d090322 hsqldb_1_7_2_4.zip 2833859
diff --git a/dev-db/hsqldb/hsqldb-1.7.2.4.ebuild b/dev-db/hsqldb/hsqldb-1.7.2.4.ebuild
deleted file mode 100644
index b8bb0c6ccfb9..000000000000
--- a/dev-db/hsqldb/hsqldb-1.7.2.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.2.4.ebuild,v 1.5 2005/01/20 15:37:31 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*
-		jikes? ( dev-java/jikes )"
-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
-}
-
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild
index 7fb3b8d34d4b..2efc931b90c7 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild
@@ -1,21 +1,24 @@
 # 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.5 2005/04/03 08:33:59 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1.ebuild,v 1.6 2005/05/04 20:20:37 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"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.zip"
+
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc"
-IUSE="jikes doc"
+KEYWORDS="x86 amd64 ~ppc64 ~sparc ppc"
+IUSE="doc jikes source"
+
 DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		dev-java/ant-core
-		=dev-java/servletapi-2.3*
-		jikes? ( dev-java/jikes )"
+	app-arch/unzip
+	dev-java/ant-core
+	=dev-java/servletapi-2.3*
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${PN}
@@ -47,18 +50,21 @@ src_unpack() {
 }
 
 src_compile() {
-	local antflags="-f build/build.xml"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	antflags="${antflags} jar jarclient jarsqltool"
+	local antflags="jar jarclient jarsqltool"
 	use doc && antflags="${antflags} javadocdev"
-	einfo "Starting compilation..."
-	ant -q ${antflags} || die "Compilation failed."
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant -f build/build.xml ${antflags} || die "Compilation failed."
 }
 
 src_install() {
 	dojar lib/hsql*.jar
-	dodoc doc/*.txt
-	use doc && dohtml -r doc/src
+
+	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
@@ -67,7 +73,6 @@ src_install() {
 	doins conf/server.properties
 	doins conf/sqltool.rc
 
-
 	dodir /var/lib/hsqldb/bin
 	keepdir /var/lib/hsqldb
 	exeinto /var/lib/hsqldb/bin