Fix init script, again

Package-Manager: portage-2.1.10.11/cvs/Linux ia64

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 760f901d9f02afa30dc4fd012371a150f957a817..33269574257a8ffa4ac520c3bb2b79d17243306e 100644 (file)
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.169 2011/09/21 08:23:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.170 2011/09/21 14:56:39 armin76 Exp $
+
+  21 Sep 2011; Raúl Porcel <armin76@gentoo.org> files/deluged.init:
+  Fix init script, again
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> deluge-9999.ebuild:
   Migrate to git-2.

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index f450e81e41bf680334b639c99f435b57e4e5aba0..d6402dcbcecd6e0f0516ea8a1e5a015f3b2d702a 100644 (file)
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d
-AUX deluged.init 2070 RMD160 ed1441b11b684c5cb36afe92aae5655b935a62bd SHA1 6267563a9dc41ef51848eb01eb372a5f20349efa SHA256 b832c696b7bff98c7017d65a288f570adc0cb309793808587774528445003e53
+AUX deluged.init 2053 RMD160 bbac1a15daa68a6f47c6a80a203189d7d26fabca SHA1 895d247a428f6417abb7463402b6883ddef3975c SHA256 04cacfadc79e738d8cccc4de6ffe735697c01e17c0e96d9604b7018e68c8a9a3
 DIST deluge-1.3.1.tar.lzma 1869318 RMD160 8500d7bc8d03bedee66d4bb349c2db6e2eae41af SHA1 94813e975b2d9a6cd31e17b112808a148302a438 SHA256 651b42e7ceb5f00e6a280f954ecff1da3a8ae0efc9a1f5e43eda317f499ec95f
 DIST deluge-1.3.2.tar.lzma 2088854 RMD160 0df4184a06e1973158dcc1aad32bf4fdc1a99ca7 SHA1 5ee582db96308333ec8bb60e962636a5d0faea5f SHA256 7420221d861d05357edc338868294b6f600b4ac9783c568e65da389aeea4bf21
 DIST deluge-1.3.3.tar.lzma 2094978 RMD160 d6044714dd242d9758436f5d0194a37f298f5dc0 SHA1 5bf22824cc5181c789429575d5d4a40f2e7d3cc6 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
@@ -10,14 +10,12 @@ EBUILD deluge-1.3.1.ebuild 1785 RMD160 e7cd07893524860f83c52ef4613b410befe403a7
 EBUILD deluge-1.3.2.ebuild 1786 RMD160 06803542ff9301a3dde9c478ef5d8c4a9be717b1 SHA1 7282ba9c699421f7154a9adee2f93f319c66d8da SHA256 890f5f8a2e23f25bcafeb50389841b193d2a8bc8e82d8ff8adb034aab39e0f1c
 EBUILD deluge-1.3.3.ebuild 1805 RMD160 b82db9b9c90251ec241e6cc926a8df7189bebde5 SHA1 dcfade234ad4824a79cce83d250f2431495ec06d SHA256 7b8bf5ee4266b52f8f6c7ab7c67c9150e52d62be314bd4a14264c8aa3c6ad2a5
 EBUILD deluge-9999.ebuild 1798 RMD160 361dbcac0d34167f00aec3ef82f6c11d7338dea3 SHA1 8d81c1751a7e3b3f3ccf079f7202923ac6c103a3 SHA256 99663c9b95339f7a894f47431ad2343986c29f00c7962d45e0c44e17ea805231
-MISC ChangeLog 23567 RMD160 00446a3f904533e53fef26610a8dae36ad6188c6 SHA1 bb261e4fce90f13f7592f3b7c4b01dfd2fbb6a9b SHA256 a5a9b7546a8324457e1f17e9bbd6e6deeb3734e7ee6dd2978bd94298e4b2d19d
+MISC ChangeLog 23663 RMD160 23483681094a267041ae330fc2c10c6f9ff8e2f7 SHA1 764e2391a3fa7a8c06acec848f0394abfe14b2be SHA256 eff680ad78fa980cbac394b0504f8c43d7e31e524822b93e4367a3cf5aa58d6a
 MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk55n4cACgkQfXuS5UK5QB2zQQP+Nj2qDfeftnJYvf+tJLWAiDWB
-Y31Q+9PGv6S0BT6riqY0xOiZB8N9CKVPsDUaffey37w9TpQNoeE3brHE5Akz+IV1
-4SgaHKBZv5jk4K+JBUUAj0UKWyxrYSbkIf7CF0+kzDyeTx9aGYH3JQbXjC67mZjc
-YCETdBoT3R0o4Aj9kJI=
-=SQ64
+iEYEARECAAYFAk55+y0ACgkQuQc30/atMkA8eACgqDmviYsIB4Eb4PxRIUkY1MlB
+MTgAoIr2bCZW+58Y+UxpHGKytdi6l/k0
+=BsbD
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
index 258a3e1262d92b13a5c56b5fe85940fe1ce2c6a1..ce002808560ac00dd5b7ff0e22a1e055854457fd 100644 (file)
--- a/net-p2p/deluge/files/deluged.init
+++ b/net-p2p/deluge/files/deluged.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.9 2011/09/17 18:39:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.10 2011/09/21 14:56:39 armin76 Exp $
 
 depend() {
        need net
@@ -41,7 +41,7 @@ start() {
        ebegin "Starting Deluged"
        start-stop-daemon --start --user "${DELUGED_USER%:*}" \
        --name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-       --exec /usr/bin/deluged --chuid "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+       --exec /usr/bin/deluged -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
        eend $?
 
        
@@ -49,7 +49,7 @@ start() {
                ebegin "Starting Deluge"
                start-stop-daemon --start --background --pidfile \
                /var/run/deluge.pid  --make-pidfile \
-               --exec /usr/bin/deluge --chuid "${DELUGED_USER}" \
+               --exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
                -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
                eend $?
        fi
@@ -57,14 +57,14 @@ start() {
 
 stop() {
        ebegin "Stopping Deluged"
-       start-stop-daemon --stop --user "${DELUGED_USER}" \
+       start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
        --name deluged --pidfile /var/run/deluged.pid
        eend $?
 
 
        if [ "${DELUGEUI_START}" = "true" ] ; then
                ebegin "Stopping Deluge"
-               start-stop-daemon --stop --user "${DELUGED_USER}" \
+               start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
                --name deluge --pidfile /var/run/deluge.pid
                eend $?
        fi