move reload to extra_started_commands

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

4 files changed, 23 insertions, 14 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 5132c0cc4f41..5fa421fc489d 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.211 2011/11/29 18:21:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.212 2011/12/04 10:03:10 swegener Exp $
+
+  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/exim.rc6,
+  files/exim.rc7:
+  drop --oknodo from start-stop-daemon
+
+  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/exim.rc6,
+  files/exim.rc7:
+  move reload to extra_started_commands
 
   29 Nov 2011; Fabian Groffen <grobian@gentoo.org>
   +files/exim-4.77-as-needed-ldflags.patch, exim-4.77.ebuild:
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 34d7d3458e5f..38250968c491 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -15,8 +15,8 @@ AUX exim-4.77-as-needed-ldflags.patch 5954 RMD160 10348033ae0d928378fefc0c2728ff
 AUX exim-4.77-makefile-freebsd.patch 1124 RMD160 af135dc3ffab9c288f7d7e55c74a17a6acce633c SHA1 598624573159431bd70485fb3d394eddd6cf3a1d SHA256 50108e7f26ca2acb594d3d9a57c25ad041f32ada729b604da7378e9376b3ac7c
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 AUX exim.logrotate 193 RMD160 af18b62c88fd86b421abe487a232f26bf5287dd5 SHA1 c12f3b44de8a51dd41c4dbf2179a2b0f9d4cbaf4 SHA256 41930f48d934dea0ad14a868c591fe1c47a5f6403d66f8a2d5f4092cd13f8b5c
-AUX exim.rc6 731 RMD160 07036a18cf072edb4a44b2ecdee21274542d1740 SHA1 bc92933d66befc68906bf9a5b83091c606323c1e SHA256 7c13ad60d4c6c9a29071aff8b68e81a6dd513b018cf0774e446c1afc3dcdc3c4
-AUX exim.rc7 771 RMD160 9a3abdcc733852e4b5ab1dd7fecee6c29524a14d SHA1 e6a32137a18ff1a3e2eb1f2f155c048c98aeb9e9 SHA256 c22353d0eb66c69fbf6dd4e7571ae4d6611cb88a01c8376d7260dd97f029ae25
+AUX exim.rc6 719 RMD160 633adab3bae7ec5a3a30aae547119aabd01e1f40 SHA1 cd875de79b630dc6fba9ab08458e2e22e35a7d05 SHA256 7b721c30652b09587e133357dfb3bf2173b71607ce6aa203b510868ca1dc218b
+AUX exim.rc7 784 RMD160 e028166a4d8893ab36b8334ab62e6cd02943e610 SHA1 ee950048074f7820d18ebac6fbe91c179413e37e SHA256 67845e3b1ce91d9436095abe03f837e5e6745a4b9fae5ec8e80b364f92a8e05a
 DIST exim-4.76.tar.bz2 1605832 RMD160 b619e6e6674584c97ae0503911e95e1016407c34 SHA1 b0df27b0407eef2d79e130597916cde18f2bbe30 SHA256 4625b0fb916835ae60a73311a8956267fa1248e888f584c337a5b7df20174e95
 DIST exim-4.77.tar.bz2 1576148 RMD160 b70ced4c6323ccc167db68f3a7d30163287b2240 SHA1 0aad2cf08d03ad9e809d86521eac8f3f31398a1d SHA256 0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475
 DIST exim-html-4.77.tar.bz2 416407 RMD160 f758f2953fc077c78229b28c7750ba04e673f085 SHA1 bccf154854ed855aa031018a84f34c260fe00723 SHA256 05823ebe0c0554215d928bee1a856bb2011e993f170edadbad57f0fb21dd9c76
@@ -25,12 +25,12 @@ DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b
 EBUILD exim-4.76-r1.ebuild 10419 RMD160 08693ae53cf2ecf1c4da7801a4af6001da5c5bc4 SHA1 45b7fc34c2c1598e18f67285aa7d1fabfed2fbbe SHA256 0892ec6c900826a34df31a675a80b42f3e2316dac1c09b154982fa541ee622cb
 EBUILD exim-4.76.ebuild 10316 RMD160 930cdf30324c6ad0d95d7dfa5017a2ef516b3a60 SHA1 67fe0632a088ba539c40baf0c0d6d0a143c1fb69 SHA256 733501c20911916e0bf6ec584921d7a6c23de8b29a5b149400636a9ef233b773
 EBUILD exim-4.77.ebuild 10640 RMD160 613a4f0d0e51e0e7077b3770f42bc732e3e882ef SHA1 e2011375b6d43ffdfe3fa47b0875019bc4cf3981 SHA256 c45439e25c8a5cf6805e150ea8fd01c96f7ad3bcaac05bc96f789e0d62142280
-MISC ChangeLog 42813 RMD160 25c071e7fb11f8e5e010971a56f5ab8733648240 SHA1 e4b29e449069995b52f239b266688a744ffa7b34 SHA256 484422e29e750e534fe9d6680ab22f0d8f51e7f968b69958c109a3178de78f80
+MISC ChangeLog 43063 RMD160 e8dd8ecd184a3adfbe98cfc80f2b66f8985217d5 SHA1 497613b24fb5a36be99e4f130b4c782036079aa4 SHA256 621d564cb43440bf0c7fd6051f447919938246551cf8d0675551c41f1eb75e32
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7VIqQACgkQX3X2B8XHTomN+ACdHs8wZ1mYnNrEtPm7rV33r/BR
-74oAn2e7MLQkzCyIeq/p0gM0NMGh2ae2
-=nOdM
+iEYEARECAAYFAk7bRWMACgkQI1lqEGTUzyTznwCgsw/fGIyCE6sUqb6KEvaf66hU
+mnwAniv+IFvPMFpAxNnhYZmXB5Z3soqE
+=fBkY
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/files/exim.rc6 b/mail-mta/exim/files/exim.rc6
index 3c0ed055e6c6..585d16b1f363 100644
--- a/mail-mta/exim/files/exim.rc6
+++ b/mail-mta/exim/files/exim.rc6
@@ -1,8 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc6,v 1.8 2010/01/16 10:46:47 grobian Exp $
-opts="${opts} reload"
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc6,v 1.9 2011/12/04 10:03:10 swegener Exp $
+
+extra_started_commands="reload"
 
 depend() {
 	need logger
@@ -24,6 +25,6 @@ stop() {
 
 reload() {
 	ebegin "Reloading exim"
-	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile /var/run/exim.pid --name exim
+	start-stop-daemon --signal HUP --pidfile /var/run/exim.pid --name exim
 	eend $?
 }
diff --git a/mail-mta/exim/files/exim.rc7 b/mail-mta/exim/files/exim.rc7
index fcd46d4785de..52349a618869 100644
--- a/mail-mta/exim/files/exim.rc7
+++ b/mail-mta/exim/files/exim.rc7
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.2 2011/08/16 16:51:36 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.3 2011/12/04 10:03:10 swegener Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	need logger