added prefix support (bug #435274)

Package-Manager: portage-2.2.0_alpha140/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

3 files changed, 39 insertions, 35 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index f40c6639b5e6..6b31f573112c 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.69 2012/09/29 17:45:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.70 2012/10/17 08:19:33 ottxor Exp $
+
+  17 Oct 2012; Christoph Junghans <ottxor@gentoo.org> hsqldb-1.8.1.3.ebuild:
+  added prefix support (bug #435274)
 
   29 Sep 2012; Fabian Groffen <grobian@gentoo.org> hsqldb-1.8.1.3.ebuild:
   Marked ~x64-macos
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 68bc29270bf8..c985fba22d20 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -10,13 +10,17 @@ AUX sqltool.rc 619 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196c
 DIST hsqldb_1_8_1_2.zip 3516460 SHA256 828776b24364781ae4443d4d64f60eb2a80ab5179637b8415ec91590f82d7bcb SHA512 60b75dfb7e2a464449af94c14424639ebc1de89c062315e94e88f657728e554af5987e9cf5b3d14a002ef5807983adca9e2c897c27560f6126d7ec55649a2d26 WHIRLPOOL 15a3976773950ea7be97f8072db09248657fa5612a6a1187e0f1b06f85da416dd3b9199dcaa1e1f6fad05be3b198b0158062ac52ac7cefce7044fec642f62856
 DIST hsqldb_1_8_1_3.zip 3170550 SHA256 c3669bbebcb5c722b273f20c316af744d4e263bc90cc20fd1e6296dff7cc3d07 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442 WHIRLPOOL ae025d408ee78683133a7bcb1ea6cc130844abc837abe408fe0ea4cf885e082080cb926fabb47ecc59a0f64463e2f969ce51a9e5acc802bdc4e7ba9a62f9756d
 EBUILD hsqldb-1.8.1.2-r1.ebuild 5491 SHA256 591d459a12991ea09750d284e4e8b09b5834a4003a200da284b27eba05b0b266 SHA512 3c97e96c37454fbfb97546e5baf0b1b3d74f92f8df8319b38dfc42190b8ba233579f43aa38386f4fdf1352ad08c2956b260e1eb14a70a9bdd023a32354ab6a55 WHIRLPOOL 8c3b5e8ab380c619f3fbd44f9af161c04fc7a1ca8ef2dc0620fb4ebb1aa9c96e166cf08321005440fd9d1f9c00bbff93dbb2307144f70421d9b28f7a3e70eb79
-EBUILD hsqldb-1.8.1.3.ebuild 5512 SHA256 81d320fab346ef862edade34e4c6578e8dc0a5b78fe7aeb24e5af5937aaa7ab5 SHA512 f27b2fbba69b5fbeef5c23f462dae2c2e3d0f2fff687230830752c9efbe5f21b1fa012e05e88dcdc5df8d0510a2b3149e24cefa7493c0a993cd153fa41316a4c WHIRLPOOL 89dc7d7aec9b3315979a23cdcb25c1aeabb5d9c552c2f281ec4919afee69a25c240cec43772bd64aa0bffc0f5d4f10f33a907ca9c2224ca3e0ae1c90f2e13dd3
-MISC ChangeLog 9451 SHA256 03ce32b8d0a62af6180be1abc06f8ef161ba0964f92e385574bd34a8f4a31eb5 SHA512 d84e9b75633f3343797e2d95193f6ee36faa596275f5586afe5b367308e381c5cb8dcb72f032463a481bf2e66153a4849b7cccbb15b51d5627ffc70b4c5a3235 WHIRLPOOL d314d08f77da2072ee0a606797d9b54f206458aa3d818714552752960f89e77f731705aea82ab97d482b23dca1ae4c166dfb078de6591f626879a0b600f52d25
+EBUILD hsqldb-1.8.1.3.ebuild 5659 SHA256 f406a3272760320805d025b04be2b963653b98e71fea1d5db120fa3072a78462 SHA512 5beff81dfcc555ad899c7d5194588f3d15d6e8301530584f9085b9b46b2636f353ed0c768289beb1ad26d78ba865d857adb1d653d0b31323ace5c562209cff0a WHIRLPOOL 64b439312817da9da369d4eefe31d03d44dc13323acd7b90619f1c21d5af5bfc28d0a6d4e897de4677c34f6cc1d895ad335df5af743bc731590437d329b2b094
+MISC ChangeLog 9565 SHA256 3d18e6a4923fa667abe59056133f624bc211f62eab56dbb7bc271696a583bbe9 SHA512 539ba1bdc103c067026213d134b3207bcc887d8c2bcd2aa96caeb42c1c868878cf2603f1af4fb58b7a822566d64edc262eb3430b538e773a0347f7d9c2673791 WHIRLPOOL 92667a765aab78e78685cdb8dce5bad2662c3536893f8fd6065e0765efedd33bbacf4827559aea18518dd072f754c3f1ad94191e36fdfdb3ea933d8e1461108f
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBnM6UACgkQX3X2B8XHTokpSwCeMZ9E2FvTxZ+qk1j43skds8rO
-l/8An1okcr1YW/nlgC8/ZewMqh6eWyZY
-=WNju
+iQEcBAEBCAAGBQJQfmoWAAoJEOeBhlrCAAWGenEH/jwrXhURAbO9rtXeAXNXvznt
+0p29AgJwalh5uJqlI959zfxhQNxyni/dO936+TF7Nv+gkBgXRKjO4syzxawRvNio
+VdvBWzgsj0KYdW9VVlcrti/qSlnZefQH1BwQSB2jGzJy9DJOZqJs9HoyOeiBlZIn
+w5Brh0aPvruV1yyGmXHc9a0mXZcUdUZwRjE/jtPEkhu7JtcJ8fJfaNOU1vynSnUW
+I5Sy1p/8tpM/nywuiPbptkxk6GYEMRofTIWXhC4EXnmFZAdBfmKu6scTPEjKr4RK
+TVR35KeiajeT4lrm/2mApvdOWXJiA7C24pWGFBG0ivaOPL3A0d5cNDpMh3h1X6U=
+=oQMs
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
index fd439fa52b82..472895714d70 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # 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.6 2012/09/29 17:45:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.7 2012/10/17 08:19:33 ottxor 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 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos ~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 @@ pkg_setup() {
 	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 @@ src_unpack() {
 	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 @@ src_install() {
 	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 @@ pkg_postinst() {
 	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 @@ pkg_postinst() {
 	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:"