--- hsqldb-1.8.1.3.ebuild.orig	2012-09-16 16:07:58.000000000 -0600
+++ hsqldb-1.8.1.3.ebuild	2012-09-16 16:08:49.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.5 2012/07/13 14:19:56 sera Exp $
 
-EAPI=1
+EAPI=4
 JAVA_PKG_IUSE="doc source test"
 inherit eutils user versionator java-pkg-2 java-ant-2
 
@@ -15,7 +15,7 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-solaris ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="java-virtuals/servlet-api:2.3"
@@ -38,15 +38,12 @@
 	java-pkg-2_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	rm -v lib/*.jar || die
 	java-pkg_jar-from --virtual --into lib servlet-api-2.3
 
 	sed -i -r \
-		-e "s#etc/sysconfig#etc/conf.d#g" \
+		-e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
 		bin/hsqldb || die
 
 	java-pkg_filter-compiler jikes
@@ -56,8 +53,8 @@
 	epatch "${FILESDIR}/resolve-config-softlinks.patch"
 
 	mkdir conf
-	sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \
-		-e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \
+	sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${EPREFIX//\//\\/}${HSQLDB_JAR//\//\\/}/g" \
+		-e "s/^SERVER_HOME=.*$/SERVER_HOME=${EPREFIX//\//\\/}\/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 || die
@@ -97,35 +94,35 @@
 	use source && java-pkg_dosrc src/*
 
 	echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
-	doenvd "${T}"/35hsqldb || die
+	doenvd "${T}"/35hsqldb
 
 	# Put init, configuration and authorization files in /etc
-	doinitd "${FILESDIR}/hsqldb" || die
-	doconfd conf/hsqldb || die
+	doinitd "${FILESDIR}/hsqldb"
+	doconfd conf/hsqldb
 	dodir /etc/hsqldb
 	insinto /etc/hsqldb
 	# Change the ownership of server.properties and sqltool.rc
 	# files to hsqldb:hsqldb. (resolves Bug #111963)
-	insopts -m0600 -o hsqldb -g hsqldb
-	doins conf/server.properties || die
-	insopts -m0600 -o hsqldb -g hsqldb
-	doins conf/sqltool.rc || die
+	use prefix || insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/server.properties
+	use prefix || insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc
 
 	# Install init script
 	dodir "${HSQLDB_HOME}/bin"
 	keepdir "${HSQLDB_HOME}"
 	exeinto "${HSQLDB_HOME}/bin"
-	doexe bin/hsqldb || die
+	doexe bin/hsqldb
 
 	# Make sure that files have correct permissions
-	chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}"
-	chmod o-rwx "${D}${HSQLDB_HOME}"
+	use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
+	chmod o-rwx "${ED}${HSQLDB_HOME}"
 
 	# Create symlinks to authorization files in the server home dir
 	# (required by the hqldb init script)
 	insinto "${HSQLDB_HOME}"
-	dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties" || die
-	dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc" || die
+	dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
+	dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
 }
 
 pkg_postinst() {
@@ -137,13 +134,13 @@
 	echo
 	elog "Example:"
 	echo
-	elog "/etc/hsqldb/server.properties"
+	elog "${EPREFIX}/etc/hsqldb/server.properties"
 	elog "============================="
 	elog "server.database.1=file:xdb/xdb"
 	elog "server.dbname.1=xdb"
 	elog "server.urlid.1=xdb"
 	elog
-	elog "/etc/hsqldb/sqltool.rc"
+	elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
 	elog "======================"
 	elog "urlid xdb"
 	elog "url jdbc:hsqldb:hsql://localhost/xdb"
@@ -156,10 +153,10 @@
 	echo
 	ewarn "For data manipulation use:"
 	ewarn
-	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
-	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
-	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
-	ewarn "  --rcFile /var/lib/hsqldb/sqltool.rc <dbname>"
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+	ewarn "  --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
 	echo
 	elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
 	elog "and Using Hsqldb' in the Hsqldb docs at:"