dep fix, cleanup

Package-Manager: portage-2.0.51.22-r1

3 files changed, 25 insertions, 24 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 7e2062e45a8c..cf2e5beac90f 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.12 2005/06/04 16:02:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.13 2005/07/10 17:03:10 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> hsqldb-1.7.3.1-r1.ebuild:
+  dep fix, cleanup
 
 *hsqldb-1.7.3.1-r1 (04 Jun 2005)
 
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 87919887b065..6b6b4af4fadd 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28de7e72e62bcf9a6f37e9e9941f760b ChangeLog 1818
+MD5 a02ad29d9dec0e875727ce6f1c2a2185 ChangeLog 1908
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 586bd3da8a0c8c706e00444cd04f9d7d hsqldb-1.7.3.1-r1.ebuild 2555
+MD5 5767c37089d842c741b7f2a4b2a0df35 hsqldb-1.7.3.1-r1.ebuild 2472
 MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
 MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
 MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCodCp06ebR+OMO78RAoVrAJ9wo5hy4xThfNDf1KYtklNhJn05+ACfafpy
-TvnuYdDf7ryO4ZdKo7hPM1o=
-=W/kj
+iD8DBQFC0VTu/rLF9B432nYRAixqAJ96fFyoXnafPUkWqtCbbmrCR6MwBgCglARr
+116gJrOZx6kmTPBNo5HJ9ls=
+=9T8k
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
index c9435ac29376..3ef05e5020cb 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2005/06/04 16:02:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.2 2005/07/10 17:03:10 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,22 +13,28 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
 IUSE="doc jikes source"
 
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/servletapi-2.3*"
 DEPEND=">=virtual/jdk-1.4
 	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"
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 		rm *.jar
 		java-pkg_jar-from servletapi-2.3
-	cd ..
+	cd ${S}
 	sed -i -r \
 		-e "s/etc\/sysconfig/etc\/conf.d/g" \
 			bin/hsqldb
@@ -37,9 +43,8 @@ src_unpack() {
 
 	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" \
+	sed -e 's/^JAVA_EXECUTABLE=.*$/JAVA_EXECUTABLE=$(which 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" \
@@ -57,7 +62,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar lib/hsql*.jar
+	java-pkg_dojar lib/hsql*.jar
 
 	if use doc; then
 		dodoc doc/*.txt
@@ -79,14 +84,7 @@ src_install() {
 	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
+	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
+	chmod o-rwx ${D}/var/lib/hsqldb
 }