Fix config location, see bug #216832.

Package-Manager: portage-2.1.5_rc2

4 files changed, 16 insertions, 12 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 227b2b704264..69eb7a11f9e7 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2008/03/17 16:33:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.68 2008/04/08 07:55:33 nelchael Exp $
+
+  08 Apr 2008; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.5/resin.init,
+  resin-3.1.5.ebuild:
+  Fix config location, see bug #216832.
 
   17 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/3.1.5/resin.conf, +files/3.1.5/resin.init:
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 3d79856b15c9..b7a0f8360953 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -10,7 +10,7 @@ AUX 3.1.3/resin.init 826 RMD160 73418f1944066173d54ed9225753a8054ee40c2c SHA1 e5
 AUX 3.1.4/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
 AUX 3.1.4/resin.init 826 RMD160 afb6542e7d6746e8f72b6bdd363f818109cec1de SHA1 e283f2b34e9c0fb172a39bfd7852905dcc18c5d0 SHA256 8fb90c29decdb7c83db82cd3368191482c2f4385eb752efa7d54580092c2df5b
 AUX 3.1.5/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
-AUX 3.1.5/resin.init 826 RMD160 dca493044dbab0406e85de1f49f34792c7a92090 SHA1 495f198d16e501ed1ce602f03dc313032c1da3bc SHA256 dac743f68e3ad1f902a334ac4caac006208b044e5228584d980a099b2da446d3
+AUX 3.1.5/resin.init 854 RMD160 4ff1e9fa6789f238bccfa22b2067549b3708061b SHA1 34f4859e39553d743cce442bcbc4d7f30e0903f9 SHA256 63c10fb68712661402460224528bbb1e7e6ea31db8e22412ab3537ce9fb9f8ba
 DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493
@@ -25,13 +25,13 @@ EBUILD resin-3.0.24.ebuild 4014 RMD160 fb70875eb73141ae69661ad84e25c7d641871858
 EBUILD resin-3.0.25.ebuild 4018 RMD160 eae80492fe12c0cbe1117c881bec5dd7bed862d0 SHA1 eb2a3e5f4b689d7d67f7405c058b33d286d01815 SHA256 e123d8dfd6df79c2b8975fb5a645d6b806d473d8fc0543f5e28848aaeaae13e4
 EBUILD resin-3.1.3.ebuild 3809 RMD160 545c42423b07b2fc9b696beaf0e63183fa3209be SHA1 1ba9a915f63b8687f390564517bef14591bc431a SHA256 e97bc400c748db6ef54ccdeb5105829eea3a03a2a3e5b066e3ec28bb73a8f62d
 EBUILD resin-3.1.4.ebuild 3812 RMD160 dfd3633958e6df72b66254fb9c00ac8bf78d56be SHA1 30adc9564118bf79d4307608a8f524091a02f25d SHA256 2346c66b40e4a1f1cef4f002a66c20ee444db67f2e32dd8ff75839bdbdd69530
-EBUILD resin-3.1.5.ebuild 4027 RMD160 529153e8cde9d123e5af0d6dfff5d68c2c671aa1 SHA1 dd90adb031a9cec101288ed025f7a2eb6db65b00 SHA256 5c6cdc11a5f562364f215377637449817ba25b0c578addaf7cd50ef6b022079d
-MISC ChangeLog 13542 RMD160 1d0c1dcd0980dd2920eb82fa744099d5b56747f6 SHA1 537a163552a1d8fde772f38342145253e994dfa1 SHA256 162f64e69b5290243cce51f58de9e3e869f67e90e803a132d11c788b7dd4e39e
+EBUILD resin-3.1.5.ebuild 4040 RMD160 bfeba12b0f1ea2e0c718212e25b447c1e8c53081 SHA1 6f812a9f7a4710b9ac28b2026873efd3bc172383 SHA256 7c2dc557db3142382694c52c6f550c274781c3ddac13921ac447eef111a79ff0
+MISC ChangeLog 13682 RMD160 0b00c78b7528d9f4ea1fb1659d45af68f5eb10f6 SHA1 e15cd924580bcf946d5149a7e3164265bc5a0b8a SHA256 55b18ae14991f96ae8683bec615523dc985b45680b383d555c518bb978f8baa2
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH4Olsgo/w9rxVVVERAjUUAKC2v79j6l98Ltw/NcoUGIhNJc91MgCgivf3
-3koigHpX+8gpILPK81rIjRk=
-=Id5Z
+iEYEARECAAYFAkf7JPwACgkQgo/w9rxVVVE/eACgndBT5hn75qTJUAE3gcVCNnys
+tSIAnRnj8CcUtw1MRUqE7C0dsKT4TvSv
+=eGjt
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.1.5/resin.init b/www-servers/resin/files/3.1.5/resin.init
index 3b6bc745fbbf..c3e45552300e 100644
--- a/www-servers/resin/files/3.1.5/resin.init
+++ b/www-servers/resin/files/3.1.5/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.5/resin.init,v 1.1 2008/03/17 16:34:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.5/resin.init,v 1.2 2008/04/08 07:55: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 ${extraArgs} -resin-home /usr/lib/resin ${@}"
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.conf -resin-home /usr/lib/resin ${extraArgs} ${@}"
 
 	ebegin "${msg}"
 	su - resin -c "${cmdline}"
diff --git a/www-servers/resin/resin-3.1.5.ebuild b/www-servers/resin/resin-3.1.5.ebuild
index 5a5410330391..5e473dbc1834 100644
--- a/www-servers/resin/resin-3.1.5.ebuild
+++ b/www-servers/resin/resin-3.1.5.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.5.ebuild,v 1.1 2008/02/27 22:06:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.5.ebuild,v 1.2 2008/04/08 07:55:33 nelchael Exp $
 
 EAPI="1"
 
@@ -122,7 +122,7 @@ src_install() {
 	java-pkg_dojar "${S}"/lib/*.jar
 	rm -fr "${D}/${RESIN_HOME}/lib"
 	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-	keepdir /usr/share/resin/log
+	dosym /var/log/resin /usr/share/resin/log
 
 	dodir /var/lib/resin/webapps
 	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"