Replaced deprecated opts variable in init script (bug #384453)

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 0f778ef27385efd0478d7c9724daacf3b10785c9..dae7bea548ed5a66124bfdb102e79e820b6dc1bc 100644 (file)
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.248 2011/09/17 18:02:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.249 2011/10/23 18:22:51 polynomial-c Exp $
+
+  23 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> files/mldonkey.initd:
+  non-maintainer commit: Replaced deprecated opts variable in init script (bug
+  #384453).
 
 *mldonkey-3.1.0 (17 Sep 2011)
 

diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 08d6d8730babf276c05e25affafe4a9acd889022..982bdc447e1db424c22df216f5b839195b029895 100644 (file)
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 2.9.5-execstacks.patch 1542 RMD160 cfada9b8a9f88f813e2946448a8199617f4dbe61 SHA1 4eab04e17f6884e56a43344e863d345a4d591c6e SHA256 b93ee5199c1ecc943abad4de69079280a2292ab437e155384eb0e06a76c44544
 AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1 28000a260fe9b7c216112ba877f55835a09aabd7 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e
-AUX mldonkey.initd 3515 RMD160 212c5d9311cb21467ccbc105a399aff0186a064b SHA1 1d5403a3ce204c4030d1a9ab8592596543d6f8c8 SHA256 1d57558067a84122b45bfec6539bae5abdaf36cf5e9fda38ade80495b8b1349f
+AUX mldonkey.initd 3157 RMD160 e54342a77d5449e509bc0ec3b28421ea12076187 SHA1 0cf0ae41b1588bfa051047fce80256e3c7f3275d SHA256 fa7584dbaf187715ebeca005ab60a2d379c97e8fc2b87862194f5ffb5f802869
 DIST mldonkey-3.0.5.tar.bz2 2780580 RMD160 242e5ff14e592f06f89a4066bb821ad3229ec6b3 SHA1 1cd1b1ad9f7b49d7171ab300a38c9539a53901a5 SHA256 de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
 DIST mldonkey-3.0.7.tar.bz2 2799555 RMD160 37adfaf8012772c2df8f588169501f0515ae1d75 SHA1 5d703f4a35650a8e8512acf44730653faebf843c SHA256 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4
 DIST mldonkey-3.1.0.tar.bz2 2820081 RMD160 69c2bf1937bb2a782166a3b08d87e4537ec03eea SHA1 9479c61ab067b01c76cbc11e41477f00a17f5d41 SHA256 fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
 EBUILD mldonkey-3.0.5.ebuild 4339 RMD160 2a5f717a192d3cd024db653ec0fc816928d37b30 SHA1 b4f6ea7924d4819804e40802a8784a22d33cb5c0 SHA256 82f5ef564b782884d79b682f36b6cc6537e7e4194b2af312bfd8bf5cfcfb738d
 EBUILD mldonkey-3.0.7.ebuild 4405 RMD160 25cfe56610f2d2c98f68ff88f4c4e3e703f2e28a SHA1 7d3439d755787e84f841e3c2679a10dd1eb54ad1 SHA256 5cbe7abd5ae4fed1b0f80c7da8e78adb0c70385235ad575f2f83b9fcea495ae7
 EBUILD mldonkey-3.1.0.ebuild 4412 RMD160 66bbfe1fb110d5f7c1dd82c8fb7bbcc242f4463d SHA1 a428cd0e086ddbadf5b5f022f1b8904239641de7 SHA256 a2743154eb5aea1dba6cb98dcd66e64f776c1371139ffa5fc823cee1cdd55528
-MISC ChangeLog 35921 RMD160 feeff00ed3c9e782b1f326545ef84905dc9c0407 SHA1 4b77ee8f42a1b9c4363733a4b92c271781dd1f19 SHA256 8581a2d73edddcc15c5c4828980761e88812a2bf8fec56957056fd6d13cb0117
+MISC ChangeLog 36094 RMD160 c88a3d6b54e833017c30fa607e0a78f6a66548b9 SHA1 4eab994268d2d5f5ca9c3062c99fbb0913516ba7 SHA256 36dbe6b5e32e61a04f83674512bb84eb3dfdbcd2f5817244d6f828fa9116af70
 MISC metadata.xml 564 RMD160 3824893627f0886df31af808d0e3787aef125ebc SHA1 c9d05ddf0fe5e5b32e24ab6d6178bd19137fa3cc SHA256 06a76f0d96cc3e02c4b139a71b27860ce5b7dfff39e4aadcb2fb1d633028d2c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk504LQACgkQuQc30/atMkAsiACfbwIyURGKV7/wjgoVlQ9yuvTI
-T0IAoKJNrzkik9jV0NB2xz6Tur5sFjH9
-=XfZV
+iQIcBAEBCgAGBQJOpFuAAAoJEPiazRVxLXTFH9YP/RcNLZp18Vr4BYi4Gk63Rfe3
+BSeOZeEOI+eHff1zT3DSg/iBITutoKhAYq+O1rYFEGDi0RXHpIpkQqq7oqiasfYZ
+KC7FzI81BCk6aL34uGjv8SG+BYHsSPXUf4C2n8bJDtQ2y6DUdhaXQJlyzCuDX5Ho
+m4QR2ovcRx2kYPerEhEjLkm6QHTD+6iAYqMoJnTl4nNaXyGaphonsLtRKLnVi5WK
+CcTfhWQ84n845+nKyfVjkbARrN0nWINFl+PtL/En338LeZS+3nPRhBjx7YefqfZh
+ZNCLcBM4zAnvzmqUjW+bldY85PFlpydrLZCyhBuhnD9coBJZEH8xKk3UZN+mxddN
+cCVDScG0sOxtV0jhgrUtiNnMWx7ZjSo074VFcM3n0EpwzhGK3XdgPbKPryPBcynk
+PNncUtVIj3koKDdYQc1+rZ+0ku1OJr1YNxNiBymL4BgAi/gSOl1BAWltpKxn05TB
+U8ioCHqwthBpGlHL51tVhihB/m1lIoVgWShRQrFJRA3h7v2+8nh73sNGs6xjtfc7
+hH0A0L2+f897K62GJMiTOvQ89cuBZNJ1zTh6dxXSf+6ds5INh6QHaCvcYxN+LOu2
+BebuLi2s0JOW/H/J4MG2mJ0V8dbKO/YBcItxWthdlXthUu97WQ+6os0Ds2bQePL8
+I2KD6M4gzNRgk9CQqAsp
+=55lG
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 79ba3eeb499e792b6e995a6693749e3f19b0817b..7a007dededf02e2b9a7cc0183cfb1c05913238de 100644 (file)
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 
-opts="reload slow fast info"
+extra_started_commands="reload slow fast info"
 
 MLDONKEY_BINARY=${MLDONKEY_BINARY:-/usr/bin/mlnet}
 MLDONKEY_TIMEOUT=${TIMEOUT:-10}
@@ -79,11 +79,6 @@ restart() {
 }
 
 reload() {
-       if ! service_started "${SVCNAME}"; then
-               eerror "${SVCNAME} is not started"
-               return 1
-       fi
-
        ebegin "Reloading ${SVCNAME}"
        start-stop-daemon --stop --signal HUP --oknodo \
                --exec "${MLDONKEY_BINARY}" --pidfile /var/run/"${SVCNAME}".pid
@@ -91,11 +86,6 @@ reload() {
 }
 
 slow() {
-       if ! service_started "${SVCNAME}"; then
-               eerror "${SVCNAME} is not started"
-               return 1
-       fi
-
        ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
        setup_uri
        wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
@@ -106,11 +96,6 @@ slow() {
 }
 
 fast() {
-       if ! service_started "${SVCNAME}"; then
-               eerror "${SVCNAME} is not started"
-               return 1
-       fi
-
        ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
 
        setup_uri
@@ -123,11 +108,6 @@ fast() {
 
 
 info() {
-       if ! service_started "${SVCNAME}"; then
-               eerror "${SVCNAME} is not started"
-               return 1
-       fi
-
        setup_uri
        local result=$(wget --timeout="${MLDONKEY_TIMEOUT}" \
                -O - "${BASE}"/submit?q=vo 2>/dev/null | \