Replace opts with extra_commands (bug #393113 by Sven Schwyn) and remove extra whitespace.

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

3 files changed, 17 insertions, 19 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index eafb7e3892ca..168abd79e533 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.142 2011/11/25 23:45:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.143 2011/12/06 05:44:01 radhermit Exp $
+
+  06 Dec 2011; Tim Harder <radhermit@gentoo.org> files/dspam.initd:
+  Replace opts with extra_commands (bug #393113 by Sven Schwyn) and remove
+  extra whitespace.
 
   25 Nov 2011; Markos Chandras <hwoarang@gentoo.org> dspam-3.10.1-r1.ebuild:
   Stable on amd64 wrt bug #391121
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 66d84a7bcb0d..f15f3f083da0 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -6,7 +6,7 @@ AUX README.qmail 2317 RMD160 ebdd90be77441540848caf39b6fcde3d332b2b93 SHA1 081b2
 AUX dspam.confd 299 RMD160 f53e474d51912b00ccf4876a20071814d2066364 SHA1 cde7c587dcf94174568d538cd55188bf5916de16 SHA256 fdc691c71a2518c13f61aa44159f1318b03ba4f9ca004a3f38c3c95ba6f02e63
 AUX dspam.cron-r3 9269 RMD160 8063c0d0b5a7150a4aa9ba98e62795adca154e20 SHA1 6c1657aefc2a2e391a20c19ffc82475f88d39515 SHA256 e6a1a4194818a6ede5065979227b6b092ef2bea26cad6767f41de1a1952c840d
 AUX dspam.cron-r4 160 RMD160 cd633a4a72ecae12ad70faf8d0ae486bba1fbe6e SHA1 0b620d69451b52968389c6e83d5a904d38299cc1 SHA256 ef59ea37a272b3d044a59fc1f30d1c60087e15d5735ba961cc57458cc5026aca
-AUX dspam.initd 970 RMD160 a73beb331e0ace2815a5554f31f22075b69f6b40 SHA1 f0261dff012aa1104a6d0d787e0caf79c8875201 SHA256 1163ebb42e636cb07839ea37c192c479c7cc6c2b4d51d7386bef6272460387ad
+AUX dspam.initd 979 RMD160 e7248f5b2feb6416bdc61e0b8ebf7593cae3c573 SHA1 fdbdfd9565e1581b422b2a0afc3daa27003be495 SHA256 4eaf5da3420a6196ce987429bedf3ba25d21616ea1eb2ebc35c58778c0105d7c
 AUX dspam.logrotate 180 RMD160 56ba31d0bf4558dd0b3b6bda247050bd2cbcc18e SHA1 94a988258efad37d51604769b0336c27e1aa3b31 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d9de4eabf273d582
 AUX dspam.rc 1025 RMD160 d223977cf390b1e89392462f06b31b0722810fa3 SHA1 6b243ffac8179120ed7ee6f4b24bf01ad3a511f0 SHA256 9726e4b7699ccbb305d5e161baec2010e115731e582f69c3c670ec36bb099d34
 AUX logrotate.dspam 155 RMD160 17e0f5401843ccac1d349b938b1e9b755f847108 SHA1 7462edc16642aa3b43263f8a7ce093de7f4a2ade SHA256 dd5bce638b92936e02ff02faf781cbf903faac7b73c61c1c666eb06cfb56bfac
@@ -18,22 +18,16 @@ DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 S
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
 EBUILD dspam-3.10.1-r1.ebuild 6185 RMD160 7e52b078cb6edb021cd16e7e80fb6a4bb6e9a530 SHA1 35a6414dfb1d9429dcf47204d00f6c03e4d16bef SHA256 7b2fe2b3add22734d865269cdff1550ca619dd9b4964ac53ae6ff4ab914a9ee3
 EBUILD dspam-3.8.0-r15.ebuild 19692 RMD160 dbfc9ae12e751cc0ade8608f3073c284fd6f7fe4 SHA1 3beff2e7820d8a3a7e35d2ca871e042d8fc0c100 SHA256 6002f6e9db1e6e2de4296596297e7ea91d59b7090652d428df53301737fcd4a7
-MISC ChangeLog 24323 RMD160 73d34b7d26b673ef01fd3e9420488def579a5123 SHA1 321bb3784c66238b5eaeb24a4cdeca99701a5658 SHA256 849e98ad0b4e5a94da062701f6aef00b52cfa8dafdedb3734629608a1271ab02
+MISC ChangeLog 24488 RMD160 54f431f454f27c3ddfd28f783beede9049de03b4 SHA1 8b72123e253322c9d26568c35a0b7460f4e13de8 SHA256 611327acdb74095a39909f7fe60e45e38493cad077b33b2c241627b59276ebc4
 MISC metadata.xml 1429 RMD160 40b71e8574ed33364dd81fae8f6f510c9dadbe5f SHA1 727dcfbe77e781fb4ad6b45837d70acace16e4bb SHA256 797884e76db42660b78b292db1436cf3154c74cd71a891ea482f9a68264d1560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO0CihAAoJEPqDWhW0r/LCAM8P/37TIq3vrQj7/Zg5IvFZ7ZCk
-t++4s/+OXKw7j5NCHbxgaIqSFf/AY4z3KxmxC6NKAvG9Z0f89GxJE70nbaATUN22
-QvnGtysg2dh34o+SgZQVeYnhAEQIuyDObJ4vj9O3zhknV+DneCS3PVORZf0b1l0x
-rDi4LZ8UFtUkeYWgbE+XJiEXJ64It8co8yyUZ8NvU1ZpTQJ1U5f9UxYyFm2/ZwqG
-DTCbXVP8tZQPgM+BWrAuTQR9iXrbNimmaaWlA0ANBmoPNSi48ouleCdrSGVKbqTM
-T7Et4TsI89ycvWR8VVhyixyU26s7NCGdhkXC8G+G2Bw3TnVe1em2VC5pv2TmePE+
-liL4FZU9BoGOyQC40aob2fz/tCztJFZfoG9WCpyi1NFWknWGGzBwyAT3UTufIfOu
-tYczNE4vCTrYH7xscI8Bhr1+mSEmay2epWiMrwi+itOWqahCaq5uOaZ4c4eiSnSv
-tJCsW1kmy+W6DzM0gqgE+iwDVnQQZZlgWlZVhQ8KI+Qa8DxoR7TC1zOiUQq3sGzu
-WLInm6JrXNc387msEDvK+Xu/CiS3bzQ27hrk1i4GHYOy+ZLbG6Dnv9Iie2jveuGE
-R2/RWj/18m50qH+LGTwL2/kFoXQ7bapjnOV2TCmK4EanY+mxyryg7+d5AsixKAo1
-l3Uj5GZcoas0lLoofrX3
-=EyGa
+iQEcBAEBCgAGBQJO3aunAAoJEEqz6FtPBkyjy1AIAKBX19Oq3POwm+imwI164788
+uH6nu6QeG5ixe0zP2cf5xjVY1puTn2rMWZVCw8hSQhER1M+6h4L53wDC9NVrbB2A
+mlU1Y+IgLMti1H1ih7oRXAwWmyRSqc9EmXKkdpA1UG41hLhVxLAkKRC6/oDO4VBa
+oV7K0eiXbKEAc0MZi5we7O61Az8i49QvV1Z+OZVHvvJl+CUGhbRoweUzLBwkuZxQ
+VdKbz3iowjFfsdx2cT+sf9dbXtahCjdu5GbNlkQs2ah+3u7YQrMIVK899Z+omDdy
+hW3bzhnOEAKKc/4XR2284h0VgqcSG0yiG76hav996Yoq2uDvUc9KEjnm1KNywTU=
+=9u/O
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/files/dspam.initd b/mail-filter/dspam/files/dspam.initd
index 2b1bd08b45b7..65c13a2dcc65 100644
--- a/mail-filter/dspam/files/dspam.initd
+++ b/mail-filter/dspam/files/dspam.initd
@@ -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-filter/dspam/files/dspam.initd,v 1.3 2011/09/10 10:17:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.initd,v 1.4 2011/12/06 05:44:02 radhermit Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 PIDFILE=${PID_FILE:-/var/run/dspam/dspam.pid}
 
 depend() {
@@ -40,6 +40,6 @@ stop() {
 
 reload() {
 	ebegin "Reloading dspam"
-	start-stop-daemon --signal SIGHUP /usr/bin/dspam 
+	start-stop-daemon --signal SIGHUP /usr/bin/dspam
 	eend $?
 }