Removed java gen 1 ebuild, quoted vars

Package-Manager: portage-2.1.3.15

7 files changed, 22 insertions, 150 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/Manifest b/dev-db/hsqldb/Manifest
index b52ef7adab62..e7679b153e25 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,53 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 2502 RMD160 d4add6143bfb7d836b6c30df8dcd12f4b2a30ae1 SHA1 32cdf9ed4c10980a5f55b7e8a2dbe73a5f01c239 SHA256 068894f69e1a2f00f7938c1c6c29cc2a1512b0d93317c150b089fe99413188b2
-MD5 b3c164dced26f8fd7d00696439b6865f hsqldb-1.7.3.1-r1.ebuild 2502
-RMD160 d4add6143bfb7d836b6c30df8dcd12f4b2a30ae1 hsqldb-1.7.3.1-r1.ebuild 2502
-SHA256 068894f69e1a2f00f7938c1c6c29cc2a1512b0d93317c150b089fe99413188b2 hsqldb-1.7.3.1-r1.ebuild 2502
-EBUILD hsqldb-1.7.3.1-r3.ebuild 3612 RMD160 bb4b00e2208b19e2b4c59838d705eb0626bb6eca SHA1 745fd975628b52ed5936b0117c372a2d4517a378 SHA256 d6fe1d1b8d3a593e295afe84661815127e18fb9348aab56baba3e23479d1983d
-MD5 f449d98ffb13b7debaef9ccade0b7f00 hsqldb-1.7.3.1-r3.ebuild 3612
-RMD160 bb4b00e2208b19e2b4c59838d705eb0626bb6eca hsqldb-1.7.3.1-r3.ebuild 3612
-SHA256 d6fe1d1b8d3a593e295afe84661815127e18fb9348aab56baba3e23479d1983d hsqldb-1.7.3.1-r3.ebuild 3612
-MISC ChangeLog 4021 RMD160 c2462d4a4ae7a5b594234b8a793527c65b193716 SHA1 d0c40f3cbcb09b1e19aa5f1f8593e4fdf9ef5159 SHA256 d61ce1f331035d1f5ce7a281185d5b6e5e4134052ca5eb2e583188f6f7ed903d
-MD5 a7b2c63a605f73ce41664355e0e497ed ChangeLog 4021
-RMD160 c2462d4a4ae7a5b594234b8a793527c65b193716 ChangeLog 4021
-SHA256 d61ce1f331035d1f5ce7a281185d5b6e5e4134052ca5eb2e583188f6f7ed903d ChangeLog 4021
+EBUILD hsqldb-1.7.3.1-r3.ebuild 3621 RMD160 bbe349a6dc800bada1fd7922d05ab100ed2f9bc2 SHA1 d860336d1e05565fd30a30be2c6a5065d7bca058 SHA256 2eaa77aff2476a4fdbfb858f539b80b03161da39f25c03d4d3aa07b0246e6a2d
+MD5 2c0775339b1b841b0cccc086e7da3ba2 hsqldb-1.7.3.1-r3.ebuild 3621
+RMD160 bbe349a6dc800bada1fd7922d05ab100ed2f9bc2 hsqldb-1.7.3.1-r3.ebuild 3621
+SHA256 2eaa77aff2476a4fdbfb858f539b80b03161da39f25c03d4d3aa07b0246e6a2d hsqldb-1.7.3.1-r3.ebuild 3621
+MISC ChangeLog 4217 RMD160 e74eac0b7d3654d51294c47b4054b67ed7fac02a SHA1 dcfac553648ae51d3293b197b8db6f50cc7ded37 SHA256 21a1a01531e660c6be0ec894fcb77ec8836b71cf3b74f5560698ab88a00f2f1c
+MD5 30ca0bb0849ad5686b6ee6b2e6b4d7b4 ChangeLog 4217
+RMD160 e74eac0b7d3654d51294c47b4054b67ed7fac02a ChangeLog 4217
+SHA256 21a1a01531e660c6be0ec894fcb77ec8836b71cf3b74f5560698ab88a00f2f1c ChangeLog 4217
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 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-r3 238
 RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r3 238
 SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r3 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG/V+TCkvF58q80IkRApiIAKCLxpZmn935VKtAW1gCtdFTqnEQ0gCcCPhZ
-V8F0hVBY+LPlBh5UR6IRV2g=
-=EBGB
------END PGP SIGNATURE-----
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() {