Fix root-directory issue, see bug #222865.

Package-Manager: portage-2.1.5.4

4 files changed, 18 insertions, 10 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 650638b23cf7..e56013a52c9b 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.76 2008/05/12 09:37:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.77 2008/06/09 21:49:33 nelchael Exp $
+
+*resin-3.1.6-r1 (09 Jun 2008)
+
+  09 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.6/resin.init,
+  -resin-3.1.6.ebuild, +resin-3.1.6-r1.ebuild:
+  Fix root-directory issue, see bug #222865.
 
   12 May 2008; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.6.ebuild:
   Add ~ppc keyword.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index b51d260a8e95..57dfa323d099 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -4,19 +4,19 @@ Hash: SHA1
 AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
 AUX 3.0.25/resin.init 951 RMD160 c6bb819c7bd225a4a5fb570782f15d4cba9bce7e SHA1 123e2b64bc29f1ebbb5cdc65ea98be10c09cf9f8 SHA256 86d043936058453da710957d9da81644eb67f8a4e656160d6624eb9cd974db17
 AUX 3.1.6/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
-AUX 3.1.6/resin.init 854 RMD160 e20186fbd0f49212b22fa59d1c5dbc2dd4b803db SHA1 9e3dde87f4b19776d175b4e17afa8b7a29826259 SHA256 b000efd3457e8ea4e9705fc6fcf1b405c3176376a19d13e576f86453acede1d5
+AUX 3.1.6/resin.init 885 RMD160 f1d4543ffa15db428c0e39cb339b8620ddda65ae SHA1 f3bbde79651d4511628e335fe1ff924a9ecb5c16 SHA256 abdef88060b1b7dd707ca0fac1a48cf57d887df87c44d7045dfeeff5ceac6917
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
-EBUILD resin-3.1.6.ebuild 4109 RMD160 93a37b7cc1bd322cd6c556cd58089c271b1e6653 SHA1 4df25978b29fd3bd052b88409707bf0d1227dfcd SHA256 9c97bb8711f573d537979f3eb32b56c26c67aac6f6e94340e04eb6fe6589683e
-MISC ChangeLog 14894 RMD160 dd5f0bab3ff16cb7390819186c541eededb1a499 SHA1 5704705610e7c8282bc6eefb6135bfd361ee08ce SHA256 b45c6622d1d9aacc67f7e51569141eb8081d0dad3961d8ab6921e86137f83777
+EBUILD resin-3.1.6-r1.ebuild 4183 RMD160 cc260c248f6394cd13400231a421290c17cae50a SHA1 935168798a44dff97b0149343dd1224a40dd27cc SHA256 7be8a0159cb23129c0f065848080e14587e882b5227b5653312653da286c2c77
+MISC ChangeLog 15095 RMD160 44324bb6c56110ac7b84427a084cc000d2ec4cea SHA1 0daa9a7715880508dca7548629b3200a7e92d2c1 SHA256 a9c3dbf47bd8cbf01483ce5e543e5b6330e42a41c77b52bab7064b60c09acc0a
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgoD+EACgkQgo/w9rxVVVFnjACfblgbV92KPOdcEBgi7qjjOHAN
-3NwAoL8TdydJKqxxv3lQEQXvYCTbx3b/
-=6+FI
+iEYEARECAAYFAkhNpXQACgkQgo/w9rxVVVE32gCeLbgvn1QGVNmvBQnBDs7/Ikm6
+uVoAn0cyjr2f2Itk/tUUv8zT1uHlJ8Wj
+=737E
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.1.6/resin.init b/www-servers/resin/files/3.1.6/resin.init
index 846fd9201aeb..3e54973b2835 100644
--- a/www-servers/resin/files/3.1.6/resin.init
+++ b/www-servers/resin/files/3.1.6/resin.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.6/resin.init,v 1.1 2008/05/10 20:17:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.6/resin.init,v 1.2 2008/06/09 21:49:34 nelchael Exp $
 
 depend() {
 	need net
@@ -22,7 +22,7 @@ runResin() {
 	local msg="${1}"
 	shift
 
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.conf -resin-home /usr/lib/resin ${extraArgs} ${@}"
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.conf -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
 
 	ebegin "${msg}"
 	su - resin -c "${cmdline}"
diff --git a/www-servers/resin/resin-3.1.6.ebuild b/www-servers/resin/resin-3.1.6-r1.ebuild
index 73cc4bbf4cf6..22028a754521 100644
--- a/www-servers/resin/resin-3.1.6.ebuild
+++ b/www-servers/resin/resin-3.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6.ebuild,v 1.4 2008/05/12 09:37:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6-r1.ebuild,v 1.1 2008/06/09 21:49:33 nelchael Exp $
 
 EAPI="1"
 
@@ -118,6 +118,8 @@ src_install() {
 	newinitd "${FILESDIR}/${PV}/resin.init" resin
 	newconfd "${FILESDIR}/${PV}/resin.conf" resin
 
+	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin"
+
 	rm -f "${S}/lib/tools.jar"
 	java-pkg_dojar "${S}"/lib/*.jar
 	rm -fr "${D}/${RESIN_HOME}/lib"