Removed java gen 1 ebuild, quoted vars

(Portage version: 2.1.3.15)

6 files changed, 14 insertions, 117 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 8fb39eec3673..7bd1649db730 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.28 2007/09/28 20:09:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.29 2007/10/24 03:23:03 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/server.properties, -files/sqltool.rc, -hsqldb-1.7.3.1-r1.ebuild,
+  hsqldb-1.7.3.1-r3.ebuild:
+  Removed java gen 1 ebuild, quoted vars
 
   28 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   hsqldb-1.7.3.1-r3.ebuild:
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
deleted file mode 100644
index 9d363620d762..000000000000
--- a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/server.properties b/dev-db/hsqldb/files/server.properties
deleted file mode 100644
index 1ee5a88e2d42..000000000000
--- a/dev-db/hsqldb/files/server.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Hsqldb Server cfg file.
-# See the Advanced Topics chapter of the Hsqldb User Guide.
-
-server.database.0=file:/var/lib/hsql/db1
-server.urlid.0=localhost
diff --git a/dev-db/hsqldb/files/sqltool.rc b/dev-db/hsqldb/files/sqltool.rc
deleted file mode 100644
index a65d6b4a5992..000000000000
--- a/dev-db/hsqldb/files/sqltool.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id sqltool.rc,v 1.11 2004/07/18 21:34:35 unsaved Exp $
-
-# This is a sample SqlTool configuration file, a.k.a. rc file.
-
-# This is for a hsqldb Server running with default settings on your local
-# computer (and for which you have not changed the password for "sa").
-urlid localhost
-url jdbc:hsqldb:hsql://localhost
-username sa
-password 
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
deleted file mode 100644
index 1be237b9e441..000000000000
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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-r1.ebuild,v 1.7 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="HSQLDB is the leading SQL relational database engine written in Java."
-HOMEPAGE="http://hsqldb.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc64 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
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	java-pkg_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 ${S}
-	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
-	HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
-	sed -e 's:^JAVA_EXECUTABLE=.*$:JAVA_EXECUTABLE=$(which java 2>/dev/null):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="jar jarclient jarsqltool"
-	use doc && antflags="${antflags} javadocdev"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant -f build/build.xml ${antflags} || die "Compilation failed."
-}
-
-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
-	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
-	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
-	chmod o-rwx ${D}/var/lib/hsqldb
-}
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
index 4b1be2e6cfab..6d77baf57db0 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.11 2007/09/28 20:09:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.12 2007/10/24 03:23:03 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -38,10 +38,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
+	cd "${S}"/lib
 		rm *.jar
 		java-pkg_jar-from servletapi-2.3
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "s:/etc/sysconfig:/etc/conf.d:" \
 		-e "s:/usr/local/etc/hsqldb.cfg:/etc/conf.d/hsqldb:" \
@@ -57,8 +57,8 @@ src_unpack() {
 		-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
+	cp "${FILESDIR}"/server.properties-r1 conf/server.properties
+	cp "${FILESDIR}"/sqltool.rc-r1 conf/sqltool.rc
 }
 
 src_compile() {
@@ -75,7 +75,7 @@ src_install() {
 	fi
 	use source && java-pkg_dosrc src/*
 
-	doinitd ${FILESDIR}/hsqldb
+	doinitd "${FILESDIR}"/hsqldb
 	doconfd conf/hsqldb
 	insinto /etc/hsqldb
 	# Change the ownership of server.properties and sqltool.rc
@@ -91,8 +91,8 @@ 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
-	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
-	chmod o-rwx ${D}/var/lib/hsqldb
+	chown -R hsqldb:hsqldb "${D}"/var/lib/hsqldb
+	chmod o-rwx "${D}"/var/lib/hsqldb
 }
 
 pkg_postinst() {