remove deprecated oknodo option - bug #377763

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

4 files changed, 29 insertions, 25 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 048a50c7dd7b..19b5addda1d0 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.308 2011/05/28 17:42:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.309 2011/08/05 07:05:46 eras Exp $
+
+  05 Aug 2011; Eray Aslan <eras@gentoo.org> files/dovecot-1.2.init,
+  files/dovecot.init-r2:
+  remove deprecated oknodo option - bug #377763
 
   28 May 2011; Eray Aslan <eras@gentoo.org> -dovecot-1.2.16.ebuild,
   -dovecot-2.0.11.ebuild, -dovecot-2.0.12.ebuild, -dovecot-2.0.12-r1.ebuild,
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 88b8cfa0562d..eae4ac4ce991 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dovecot-1.2.init 1720 RMD160 0f641929fd2c58878f6d69e6ba454b9110603031 SHA1 c498c5208f0504f2eadc460d515f563f907d05ef SHA256 9c7ef516324cd5a17c5f28f6af272d8d06106420c747ff5c4da6fa14a3ac316c
+AUX dovecot-1.2.init 1701 RMD160 89cdc58d6ad9ac41f8946fabf3c80e0b9f4b61ea SHA1 9cbf10e9d1997ad3703ee1ae37edbcfad6f16b79 SHA256 44b308537454362b00f8ab87257c4a0d8eb5a183452ca2e3487f74b642fac8e0
 AUX dovecot-2.0.12-sdbox.patch 545 RMD160 92b9d80e3cd1c2f915d4c4fcc751a8267c9cf619 SHA1 6046b2a8076b478deab2003142b31020f875fb5e SHA256 f4f70d4ff9453e5ec3246b3bef27adf101de84ce2d1dcff50577ff79b22d9441
-AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
+AUX dovecot.init-r2 1599 RMD160 25ef78d824139012d9df98d3f7f0da420a84c061 SHA1 c796be3c8d1b97a3abbf5026dedeab6750187b3b SHA256 208dd8f1f29a09aa306ea7f89aedf11468b187141f2c39b7c148e6007c8de4be
 DIST dovecot-1.2-managesieve-0.11.13.tar.gz 405999 RMD160 9deed0637f1b5942a1b4996a343fed1b23301023 SHA1 cd5d2149250072aa8079f9db967cfeffc1b57c53 SHA256 2a9b0d6e048fa9294890ca1bee72fe3f41431aa806d0916bb1b6bbe2a8d2c976
 DIST dovecot-1.2-sieve-0.1.19.tar.gz 1048324 RMD160 49808f393d002567f086168b6a3aae042529ad43 SHA1 9b5a8a1c89bb3af5f70a031a560d9833ff5d4101 SHA256 399335d28fe8d45b85d4d0b994739af941fe1bd77a8b46d6f1d07af7c7c95115
 DIST dovecot-1.2.17-managesieve-0.11.13.diff.gz 6461 RMD160 f03842bc846395b55d99c657123d9d82a3c855f4 SHA1 ace323fcbdb4ecb524068ecede3cc704c7637c93 SHA256 6b3a3b5263adc5d30275201fcc8c8ed0b2a659f85eb5b9be65c8000884343b3e
@@ -12,22 +12,22 @@ DIST dovecot-2.0-pigeonhole-0.2.3.tar.gz 1213027 RMD160 63898d5b71aee933399e9e76
 DIST dovecot-2.0.13.tar.gz 3272542 RMD160 2c0edd03aba7935e6db18af1384a26bf0b5b432e SHA1 31d556bd1659fb10e5edb45bab8951911151bbfb SHA256 2b512263ec05bbd74cde5c697ad12250d9268eba1c8ce4a8144adea69308675d
 EBUILD dovecot-1.2.17.ebuild 8744 RMD160 1c40bc02a47f1bd32bab43c5a37129a53394bbe8 SHA1 5ecf16dbef283f4c0279aba519d129d45e7b2298 SHA256 8f086c275f79bda4f54e2c9b9758c8e636bee12e106748475acac0967238082e
 EBUILD dovecot-2.0.13.ebuild 8930 RMD160 e70175c0076ccc4567fdc917caa936e96a6c388b SHA1 8a0087168f786c3e92a3f9c7d1918236fbc676ac SHA256 32c718db40516dbd2bc1e56cb07f10cb374644b9bf0f76235edaedf70eeb3343
-MISC ChangeLog 48581 RMD160 492be759123ee2233c1221287c2ebae7de92aa93 SHA1 45fc3bb0cd485a35b7f075b0032313296c2a787a SHA256 4181e16ba2bc3923bc0682bd13063927f5683f5900f535a948cd37badae880fa
+MISC ChangeLog 48723 RMD160 90046b441c988ba298183908b4436993289a3ec4 SHA1 a62465fefa817d50ad110643c6939db1c763cc1d SHA256 1993cb2a2edfb8d8cebc1529e150af03b607b1debeb0dcde9ebe7ed14cc765c4
 MISC metadata.xml 703 RMD160 a7a55f21501b09979922b24a931fbf7a5bbf86b1 SHA1 b4c9f2cd2a2fae951e319960ce3aba33d56301cf SHA256 3a897cb8fc88c875563623d2757f7b0ebd08743ba4d4fcbdfe37072d99694c58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN4TQUAAoJEHfx8XVYajsfpQYP/jjw7i8jPIfPMQxAJvjHPZZU
-IF9bY57aXiF75SRhZ1E2fuPfEHQPaQGzrjtnOy9oUHObt3T3HWdyYmZjfbo712yx
-C9Jp7TXzEPxMq5i9EyOZgN0GfPd6QU93V7wTZNP2bwrf0/bIBHzqfF7sV8Qvw55Q
-/hPQp2r3YCuITq9dHGKxVDxZ/dngrpE2RluN+3F2kaPXUIjuwkSPZ837HTtXLaAW
-goxT8FfTxiSYZnSTGbUp1xJAFEsn48MKVHvccDcGUTdnGNqX3XG3iEmOtjCCbNXR
-rzYW5/3RXE18HIGMNm0/CYhVJ5w6qhlZ2zh8LtVf1P/NppA758sVVPm4nM1Oj2OY
-appukqisXXfiZm4hW7+1oYoPKHNBu7f29AVBYskmveH9OOi3tB+HN7E/a2PVjFkS
-xttb/jjwyQqDeG+XmezNSj207isKRul+zT0gFEb7z2oCcC2a8b0V+F1ET7dPB4v8
-1CctIqmEMhKx7TpWbjO9ARd9cYTSv5s/SwhLyqU4V2W+3CZ8e++JZJGuwsoyzvCa
-z+3HHFd33UaEUmT7rMz04ba6K6F/M5ItdjNtW13uWztTiu7AfpiAqSBLwfqRErPF
-zqZmoZ3wL/JSplgbmna4GoIBjDHCYGmpEPJkYNJh2EVubtCBM2dkg1DIBT2cxJt6
-JmwUhd1DgrylrvkmO4pp
-=Fsqw
+iQIcBAEBCAAGBQJOO5ZbAAoJEHfx8XVYajsfhhgP/AuLqHxUdwUmPCaUrt5KvCfD
+QLijXEUeBh2Gf7E3Lu6H9MSReJcUMF98B8sVLtI4tFU1ZHqk/ZHJxjrnOf8cMmKk
+pHWpAi+q/QzIWJuFpQMF6/Xk7AmuYSY6dWdOSdlOj39KvfEudJq4h4Sj/lErE/yH
+Qu40Lk9I5QmhpWGDDmmuT4ezKGVQhZd4p8EZ309ZvAVIORSZIhwDla6oBf804akJ
+Py0FChNP1oZpddh9FJtMU39GAXZONsFEZ2Xwve9NwFJQXXwUIK8/SzULqFZxGMip
+7owspPQ2y7Go2X9d9rCexCHNftCobfg74gKW3MJnI4bbBcY2vcg9VjQYEu0r37hv
+G7k+7dIMGJsfF4PrMbDPlfY19NlwytN7CowbxHFTwStVXhPd6S/yRFK0mynvWIH2
+OudLvC9nhXaX+N3eh7cIJ9BTGd/ECXTSv/JZpbrM+WDsrbWlO/czJ6u4xC0GgBE4
+Ui1DUW/uWLwy8A/VlRkQbmonfwvE7rFBhKCFYdCxi/G+vOK2uzcTWVUK9rcVcHqA
+tvCUP14Turabel0QWKM8FQIYf4Xuh/pXAkSKLycrCThQG6NThz9RKfOaW6Mm5hth
+erc4cmr3ORNoIC/OPuGp6KxDekh8TBRe4bDBnY+Le4HtWXU9uZOiM972bL4Oru+a
+k6w7x8vo9/eEMSi4oLxM
+=8kjQ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/files/dovecot-1.2.init b/net-mail/dovecot/files/dovecot-1.2.init
index 13f5472dab32..b9dd67247b95 100644
--- a/net-mail/dovecot/files/dovecot-1.2.init
+++ b/net-mail/dovecot/files/dovecot-1.2.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot-1.2.init,v 1.1 2010/06/20 10:29:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot-1.2.init,v 1.2 2011/08/05 07:05:46 eras Exp $
 
 opts="${opts} reload"
 
@@ -55,7 +55,7 @@ stop() {
 reload() {
 	checkconfig || return 1
 	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
-	start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}" --signal HUP
+	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
 	eend $?
 }
diff --git a/net-mail/dovecot/files/dovecot.init-r2 b/net-mail/dovecot/files/dovecot.init-r2
index 458f4296e674..21447fe93e52 100644
--- a/net-mail/dovecot/files/dovecot.init-r2
+++ b/net-mail/dovecot/files/dovecot.init-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.3 2010/05/19 13:26:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.4 2011/08/05 07:05:46 eras Exp $
 
 opts="${opts} reload"
 
@@ -52,7 +52,7 @@ stop() {
 reload() {
 	checkconfig || return 1
 	ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
-	start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
-		--pidfile "${DOVECOT_PIDFILE}" --signal HUP
+	start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \
+		--pidfile "${DOVECOT_PIDFILE}"
 	eend $?
 }