Moved reload option from extra_commands to extra_started_commands

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

3 files changed, 23 insertions, 9 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 9704fa09653d..b649054b9855 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.201 2011/09/05 17:02:51 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.202 2011/09/14 23:00:38 polynomial-c Exp $
+
+  14 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> files/3.3.1-spamd.init:
+  non-maintainer commit: Moved reload option from extra_commands to
+  extra_started_commands as it is only useful when spamd has been started.
 
   05 Sep 2011; Torsten Veller <tove@gentoo.org> files/3.3.1-spamd.init:
   opts => extra_commands for init script (#381841 by Nik Warburton)
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 2bd41a401a2c..69fa9a4fcee8 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3.0.0-spamd.conf 1527 RMD160 8075268aecdf6f41f5cdacb683fe92567d860dae SHA1 01623333cecb1ef38b25a130d3b5afe016e70f1c SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34
-AUX 3.3.1-spamd.init 1036 RMD160 7d05471ac592f81e926918f9535cfd8f6ba9a1df SHA1 1345569eaa4989d0a300ccf8e17702d72c76f3a8 SHA256 f431c09d7ecfd773b658ead29ef26ef54ac0a170255714a2ee97ea7e2b7b284f
+AUX 3.3.1-spamd.init 1052 RMD160 c5166155fc6b7be234aa06802e7aff05d5539ca3 SHA1 2de84b9ca084029b1206585df9c6e22aaf6663a0 SHA256 05c61f546c6dd701e53689163e282125c2f3a916b0bada4bad5686fc8ddb1a3c
 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 AUX spamassassin-3.3.1-PERL-5-12.patch 8952 RMD160 f748f6568adeedd9db7b6302cd9f484cc9882599 SHA1 fd2b8f081d26c062a1e21f4ccf90b2b4079f89e1 SHA256 6054e7ac297e22c0f24ca524169140526e4d036dc0c11bedf4e64e30c6cbb593
 AUX spamassassin-3.3.1-uninitialized_value.patch 754 RMD160 0dea62c4b2a716557d4dd485336d60a885a0108e SHA1 6fb6781deb9f8e3344930e755baaeb3c387c7a52 SHA256 b393684a626240bf75e2c6fe7fe56bedc4b64c59220d7129ee0b1d99381493be
@@ -10,12 +10,22 @@ DIST Mail-SpamAssassin-3.3.1.tar.bz2 1015008 RMD160 b681fc60292cd30efd405585aad7
 DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 RMD160 ae164d1b1772590ca261492c5cde37485d64ed9c SHA1 f38480352935fe3bb849a27a52615e400dee7d66 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205
 EBUILD spamassassin-3.3.1-r4.ebuild 6816 RMD160 03d777cd71fa3a6c916e7bbc7676c445ae53dc1d SHA1 7caaa7821b86cd440f71dfd6e32186ad1e0a7b10 SHA256 7b0712918bc314c45a3a04fe4ff25af8b08a183d8e963729d5dbc9de056180bf
 EBUILD spamassassin-3.3.2.ebuild 6383 RMD160 fd689e199bee017f6172e0d9ece05e4ea37bdbc7 SHA1 683534bcc7e5d5e9c03f1940f6684dc8a8743e03 SHA256 1fd8a6cf140e002d51e5e66f5b15c76706c973aeb2e0b20091293aadad89ae91
-MISC ChangeLog 40537 RMD160 0e5b8566e04a5c2675822963f9916bdd3e054b0a SHA1 d6ef1d6d90f5b88dd002a4553c9494128889e364 SHA256 7b8cd6db0ff7a723b5b86798a222687901842cc133d758d81aa978ba5a62cbd0
+MISC ChangeLog 40767 RMD160 f4f6af4b277be064eb450fee882239615d72b70e SHA1 ca88d78680965456c34f8a487bb7f533f8773015 SHA256 2bd0a6e42153a4ae488668723c621c511bf074fd516214fbe4bca34a1fe04bea
 MISC metadata.xml 339 RMD160 d26879faaf735d1ca3001a1c61ab472b14789420 SHA1 8b21003a4404ada77b2a9bf2a3fa1733e46fe352 SHA256 140cb2839ea50486116c578fe574b9090de04c483c2c7bce792dfa7e21138aa5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk5lAMAACgkQV3J2n04EauxWhACfVM92G0OBaS0VAUIAT7uRfRBv
-8MgAn3V2IjhrZs+pQZlLigCgd2ct2zyz
-=dYu8
+iQIcBAEBCgAGBQJOcTIbAAoJEPiazRVxLXTFtYcP/jTZNzQlx2rCfRDOUddTcZ6+
++wshUO2QECj0Yev3/ZldTGOJucX/h44M+Rbr202pjGBNXfAzYBXox3KSLYP9RptM
+djhApyhB/R02m+d2QXQX+20Ak0WsYepPhEO8RSxpbJiaJ0/liknaBWFj4DUzoG7j
+0m/eorBImAP23LWyebZGS+I80F2d/h5yAkGeS9HLVa3gdJvy/H/QvK0+gRchF+EJ
+vzdVUAVprMk74uYRn0G8NPMDM2nk+ewtOV9tUKdCm8HOQmrcM13X/XK4AVyIhf4o
+PxXxvl/6mEB1e3qLrwziSuGrYnOktROwhTssuceneVSODuQI1pcw1NGpEezhEtfx
+6Bm+dzb7bSMFHgghB0NSprUrb7P396Sr0ygyZf5NLRKwAC4YPQmpL8dfNNku4ID0
+F8Ihqe/gvCdBCG7UurTKHpHU7gtjJj0y4xLWIVWK0SoFiR+VqMIzcIN+miDgyWy0
+SdYUbmaA8xz6r2Tgj2irE7nKy90dLEI+TjGVENNqFZ1Gze/NuDPzszmiCqX4yLia
+uH+XUGH9YorvV4RmDYQuNQ6tITthv0UTnWuAIcXRi5t3l1XTdhMy6rlXvXhg/9FW
+bhJjSVkzc2d8ofz89q9DY8X01/o/sVjqLAb3UmobIaZ/WccQVaueD3U9GVN5nv39
+Niml+P3YikDjPT16rF6x
+=5Qmf
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/3.3.1-spamd.init b/mail-filter/spamassassin/files/3.3.1-spamd.init
index 58fadee7f5c9..e52dba67916e 100644
--- a/mail-filter/spamassassin/files/3.3.1-spamd.init
+++ b/mail-filter/spamassassin/files/3.3.1-spamd.init
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.3 2011/09/05 17:02:51 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.4 2011/09/14 23:00:38 polynomial-c Exp $
 
 # NB: Config is in /etc/conf.d/spamd
 
 # Provide a default location if they haven't in /etc/conf.d/spamd
 PIDFILE=${PIDFILE:-/var/run/spamd.pid}
 
-extra_commands="reload"
+extra_started_commands="reload"
 
 depend() {
 	need net