Provide correct init.d script.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 64 insertions, 9 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 7e2db3f33552..d3737d1ed4de 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.100 2010/12/12 14:04:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.101 2010/12/12 15:54:00 nelchael Exp $
+
+  12 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> +files/4.0.13/resin.conf,
+  +files/4.0.13/resin.init:
+  Provide correct init.d script.
 
 *resin-4.0.13 (12 Dec 2010)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 1aeb5f49e4fa..48e3a7e5fa47 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -3,6 +3,8 @@ Hash: SHA1
 
 AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5
+AUX 4.0.13/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
+AUX 4.0.13/resin.init 883 RMD160 0ebd18579f1eb9b73c2b264ccc000856af6cf50d SHA1 284857ff4efc7b4c1f038528f8fdb60bda120504 SHA256 696263e6cc3213e8a06a52ddb92eb3c1b10155daa09589221a1f010d08d13a8d
 AUX 4.0.5/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 4.0.5/resin.init 884 RMD160 060b7bd06e16a5d6f36909dd24e09fced55c2bc0 SHA1 fc7ed3336edeb17fcd35a7781e0127687df16217 SHA256 9c274a3a23d5ebc09056977a5776b29acc77e1a9822e7bb09f6ac51eba887c3a
 AUX 4.0.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
@@ -24,16 +26,16 @@ EBUILD resin-4.0.13.ebuild 4976 RMD160 4e678140e4e62b7bdb46a2f46cc0842fb5b11523
 EBUILD resin-4.0.5.ebuild 4164 RMD160 97bda6a104c780f4f692a969a52af3e054515ff0 SHA1 d8067c23549d6bb5166948fb45319410633d79a5 SHA256 6c2e9b8a738a7639a896d89d9a1c5b4f77e60ab568222ad0624d21ed1c083897
 EBUILD resin-4.0.6.ebuild 4819 RMD160 ba575be76825f7c35eb94e57c824a99a453db8d1 SHA1 eb030fc07ce8d93b0367e8efddbfda5526d89b7f SHA256 3b9d3fe101c66ec96accb9a92f3fc32ca01f6888780ee303594e65fe7b9c0e0a
 EBUILD resin-4.0.9.ebuild 4975 RMD160 8cb37adc8f083a094b68a81e8ab08d5e61e147b7 SHA1 4900e120ff8720f15ca4499b8726a5ff6f25ce23 SHA256 db01f1fe09cdae4c23fc7a01d0c0bc08c0288dfd1f446c7d86df23d63fa93513
-MISC ChangeLog 18928 RMD160 d1d4b0ebba1dd06e2c03b4f5e445db393dc28269 SHA1 9b8aeefce25ade024a5bb915133cfe904a97cf84 SHA256 764fb7c003c903b074c94e565333a1d1410ebd89fb33c2dc9bf0a71a20ab26b9
+MISC ChangeLog 19070 RMD160 aaf6d1469bda9c4b91ccb7114438bfd2e4a69fa6 SHA1 2aedb478d8a74e06c00744692c22c75110444063 SHA256 ebfafc7194a67ea33880a5a2b5f299b46e41e28cfc351f65ae477c69ef380e9c
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNBNZYAAoJEBZyv1r2qA5GiywH/iYbdafmj45EfIHkpgpPWzXp
-OUuClcFoGnHbngHkdZteLHbKdSSHcqoBb2gHqJNcnrq4S441itgyIoarbII36fJ/
-EUsmQmAIw1ahf45jiP/txVEcOnrFy9UsZFzmBmDYI+b4df97xqLt05hZ6lsKQZYz
-aFBDXltS/2EvM5mo8kieKLAfldQe+PojWuB8EPkUV/EnmmL0UVZqMmiy/GyRkTek
-M6pwLSEtq29IToCyAN5DXJiCjkCOluk6QwGEsVXIRJj2Ebx6JXDYp+nzhNbT8JC4
-sQmb63wqlD8/H05kyTfo1K/9farL6vJnakg2bU7pCiykdrDUw8hfVqQPh8ySJL4=
-=6Evm
+iQEcBAEBAgAGBQJNBPAeAAoJEBZyv1r2qA5G02cH/2YPG9r/DHZIw6ylOc5r7WDQ
+YLDrt0N8eGGupkRKZIkBEvOIRjY4XkWcin0+f2+OIjj39PaiWXwmaPjsw6H7v6w8
+ngrHKCZXjwxERH/N5gjd9gr+KdaqPQTlYxrMo+rj1IKY9a1ZVFQQk0J8Xb+akQo2
+uj6d8AggrhXVkIm5X4BLai11LSFL6YkxGM35odTshcqiGsOU0sKc3oGgVctOfN+Q
+bKUxlymuageuUNIcgM1ItakCFBDEnChQ0RkmmNoMKs2HQYgLq93r9qSJnqWqMBde
+KNDutP3xsrYp3L+suotV3lOBOZhZ217m1hEkggEHtdDjIPbShYF7UxBgxpvqtBQ=
+=OLpu
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/4.0.13/resin.conf b/www-servers/resin/files/4.0.13/resin.conf
new file mode 100644
index 000000000000..b205f671a22d
--- /dev/null
+++ b/www-servers/resin/files/4.0.13/resin.conf
@@ -0,0 +1,12 @@
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+
+# You can override this value with whatever JDK you want.
+# For a list of valid values for GENTOO_VM see output of
+#   java-config -L
+#GENTOO_VM=sun-jdk-1.5
+
+# Verbose starting and stopping? (yes/no, defaults to no)
+#VERBOSE="yes"
diff --git a/www-servers/resin/files/4.0.13/resin.init b/www-servers/resin/files/4.0.13/resin.init
new file mode 100644
index 000000000000..106367785453
--- /dev/null
+++ b/www-servers/resin/files/4.0.13/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.13/resin.init,v 1.1 2010/12/12 15:54:00 nelchael Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+runResin() {
+	JAVA_HOME=$(java-config -O)
+	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
+	export JAVA_HOME
+
+	local extraArgs=
+	if [ "${VERBOSE}" = "yes" ]; then
+		extraArgs="-verbose"
+	fi
+
+	local msg="${1}"
+	shift
+
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
+
+	ebegin "${msg}"
+	su - resin -c "${cmdline}"
+	eend $?
+}
+
+start()	{
+	runResin "Starting Resin" "start"
+}
+
+stop()	{
+	runResin "Stopping Resin" "shutdown"
+}