reload is extra_started_commands

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

4 files changed, 18 insertions, 13 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index fcc8278b7767..987fb6eddc2d 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.57 2011/11/22 16:08:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.58 2011/12/04 10:32:32 swegener Exp $
+
+  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/haproxy.initd,
+  files/haproxy.initd-r1:
+  reload is extra_started_commands
 
   22 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   haproxy-1.4.18-r1.ebuild:
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 2b802f4b2627..26b4c9f0ca0d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX haproxy.initd 948 RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 SHA1 3d003a7f2d1bbb078ca6e51d2588605f0c4700a7 SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628
-AUX haproxy.initd-r1 1129 RMD160 08d281a92820dc424fc3259cc7f915ca682d7d1d SHA1 f7a309acde899b0afb953380b74b63a61713515b SHA256 9f3ee5b09133d206bb1f82038af867eb5797d8ec82fc67ab912cdbae0c8155f1
+AUX haproxy.initd 960 RMD160 6d3459f0977f424224efc5457afd22f0097a2dc3 SHA1 caa768e5efb706f66993d5de4a6c3c99f998ff13 SHA256 7812d95b55e133db49ea5e42b6604471400d70529ff6c2c4e78ffc15925f27c5
+AUX haproxy.initd-r1 1157 RMD160 6703f6fa38f2fcabff9f3f68893ac8e17f007bbe SHA1 45f8015720ace59d6fa0c2a0e35c8255789238b0 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1
 DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6ff SHA1 08fcc1f881514cb8ded801890743af29b93d5d30 SHA256 50dbe7b515c32a643b7caaac32ec3152ba536e589242e4d50ff42618a85f5a78
 DIST haproxy-1.3.26.tar.gz 668337 RMD160 f11286cef16eb3c9e29d09da3293316957226843 SHA1 4a93bcf6bcd48969fa44ac8081ce7a8baf518e17 SHA256 ab97d7f524b8c816c2b42b99d63691c819a32fe593c22242dad3108c7f85f274
 DIST haproxy-1.4.15.tar.gz 812293 RMD160 1a5e3e5c4ea71e4d439ffc4b221e31ae90d04f88 SHA1 8c42bc8c7d3714061b6fb74b0e3565d1e672556f SHA256 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
@@ -13,12 +13,12 @@ EBUILD haproxy-1.3.26.ebuild 2117 RMD160 53403476cc28b297f6fdeaea0334175a2b743d9
 EBUILD haproxy-1.4.15.ebuild 2125 RMD160 46aae9d007aeb5f85073a158048fcb7041714fcb SHA1 ed62ad19e94f15cb72a4adcb50ebdbb122861c62 SHA256 e3d93b9bf710b0b354d2e8081a404aebbf64a31b573927949baec1f503fd1fef
 EBUILD haproxy-1.4.18-r1.ebuild 2137 RMD160 7aaaed3574d4f8647fe131593873e174c4e46a99 SHA1 908299624dfe7a3ee7803b4c3173196a832e288b SHA256 3b1bd2dbac114ff2930a7a805ba177f4859cd1776c237f39c141a6166291795e
 EBUILD haproxy-1.4.18.ebuild 2127 RMD160 1847e9cde0979b4cc3d3217db77cc610c95cceea SHA1 0f7f1988a44a00a0ca21f26adc7c9c96fd045c79 SHA256 99741767f4276f699dcc7c89354fe7b36650afc944626988e28f7fbd6a325d12
-MISC ChangeLog 10696 RMD160 c1a41c98e94f3f48f68827a9e082b1210e4d6ee8 SHA1 faee1f92e6f0fa080859329c13d5b131e86ce139 SHA256 46c53893e4ad4349b491d1155164cd899c5d484e92e3d0fdf86bb33dacff6e53
+MISC ChangeLog 10827 RMD160 4b1a7d7a040802bd4fe057eb303081cc6761ab24 SHA1 a79f4a7c9c513f3f288314ff160c29442dc51cec SHA256 ea5d26965c55622a69dea6ce6dc106575140c58a91721bf00b6a5caef7526c19
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7LyOYACgkQuUQtlDBCeQJrXwCfSm72mihew/iO8WZ6d/wLq1Iv
-Ms0AmgOlTseLLfV+OYS7ba4InV6S7+Dw
-=uLqG
+iEYEARECAAYFAk7bTEUACgkQI1lqEGTUzyT6zQCdESAjhUzD8vGvweukzSw4LYvt
+85oAn3+z6lzctlSp/uS6RLfjsQBT8yJK
+=BzNU
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/haproxy.initd b/net-proxy/haproxy/files/haproxy.initd
index b86d93f236ee..412fcbd9362e 100644
--- a/net-proxy/haproxy/files/haproxy.initd
+++ b/net-proxy/haproxy/files/haproxy.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.3 2007/10/27 10:42:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.4 2011/12/04 10:32:32 swegener Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 CONFFILE=/etc/${SVCNAME}.cfg
 PIDFILE=/var/run/${SVCNAME}.pid
diff --git a/net-proxy/haproxy/files/haproxy.initd-r1 b/net-proxy/haproxy/files/haproxy.initd-r1
index 7edf5e6bc27e..7c2b76ffa8f2 100644
--- a/net-proxy/haproxy/files/haproxy.initd-r1
+++ b/net-proxy/haproxy/files/haproxy.initd-r1
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r1,v 1.1 2011/09/28 15:23:01 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r1,v 1.2 2011/12/04 10:32:32 swegener Exp $
 
-extra_commands="checkconfig reload"
+extra_commands="checkconfig"
+extra_started_commands="reload"
 
 CONFFILE=/etc/${SVCNAME}.cfg
 PIDFILE=/var/run/${SVCNAME}.pid