[app-admin/collectd] Resync with main tree

(Portage version: 2.1.9.23/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

5 files changed, 28 insertions, 24 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 865dfe5..9e5077d 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.1-r2.ebuild, files/collectd.confd, files/collectd.initd:
+  Resync with main tree
+
   12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.1-r2.ebuild, -collectd-4.10.1-r3.ebuild:
   Moved changes back to -r2, no version bump
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index d70c77d..e06facb 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -5,27 +5,27 @@ AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c5
 AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7
 AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d
 AUX collectd-4.10.1-werror.patch 2005 RMD160 c06320ac7a189de421faabeb377c957f15c757b8 SHA1 6b130c57f63d6aafccbe0fff42edb490030c92ae SHA256 38a704b07121f56494daff59366de1f4793a5d357ed1000de01eafed2e350f60
-AUX collectd.confd 529 RMD160 d8cdc1db33b611a3bcfbce0fb9723ebc976c4391 SHA1 c7f580e256d06f20946cf411e43225f2e3b32064 SHA256 e37808c26a7d1f34fe29f942edb4b798bf9ccf3258e780d0ed3166581b5c71b1
-AUX collectd.initd 661 RMD160 a8a810a3f4970525a9694cd97a02ba703b8bdde6 SHA1 2859d5c0a2d4ad22e91f8eeb35f450690445021c SHA256 87144b300c4d32d2cb36272d035fb1d6760b9708765015140607e3e2b844ffb6
+AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430
+AUX collectd.initd 749 RMD160 ca0ea7029c5646299733b1e75e6cbfc2307f175f SHA1 52dbfc6a26998afc2059180114b872f439ba4ca1 SHA256 31566ee872442d64e20f0431d7e0687725eb4fe1c03b84fe5b9c5cec79d3c570
 DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56
-EBUILD collectd-4.10.1-r2.ebuild 9956 RMD160 80ee234ef974d87317ffb7dffe5d43f5ac94fa4d SHA1 66db0bc362fd073f988f224f9b304472ab4d4aed SHA256 daa0a5d4263251713a76170e0e0fe0872d65b6dea24518c0164fd9410a5b6e78
-MISC ChangeLog 3189 RMD160 c82d9c8f2d4d43c07284bfd80e7838b03cb40983 SHA1 bbfe0c39f932ef316a63770ec8e1a8983e8272ab SHA256 c70b01429ea96668d8b5e16326cdb8bb93ebee962f69e489b0d3d4f2782601bc
+EBUILD collectd-4.10.1-r2.ebuild 9956 RMD160 5e745db3aef65ee506c9a7895a2c66f8904e2675 SHA1 928cb45b5e537a77b7b690a29ff30f6ff7a1375d SHA256 794a63a905398059e5c29c545200f887a22a2b2f692c15722f6d3939c5857830
+MISC ChangeLog 3344 RMD160 819a4d570232838cb40f18e17c14cb0b22dc1def SHA1 2ebb9f8ce806e4c6bff55646d57277507a6bbeff SHA256 a4000890e24cbd28109d6b1dd53e1a619b7c72e441da20aacae6680b95540a6d
 MISC metadata.xml 10712 RMD160 2c1e1064f30421d73297d30f61c63430947d8f5b SHA1 d5c71108a4fe21188e400602f8ed99a541743b37 SHA256 518746b2dd219fd53ec6c63596a0e842f6988182bfa6e1ef52eb607961bc354a
 MISC notes.txt 2089 RMD160 cd61c2757dc1a147bc1b9172bbff940cc6cfdc87 SHA1 81e49e513986406e37af00ed9511893f59699f4d SHA256 87515a0ad5131bf44bdba5f257b8b61beea9b7825f1db5501de9ae3551be72e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMtKB8AAoJENwGBM22xffeCJcQAJkvn6bE6w7LMZ/5WZ2JfrTj
-TGEvZJddLwcGut0mvNo6qm+1LRU0u9bdzfWAjrvOwedKTotS2ebPYigq8CYUxZNP
-19UEkwbERrK/Llz3/HR39hd/5Qg7RwSbZlGNP1KtN98B8jrVY0QASu4xc4ZL9FwC
-WaFponHBEVxka4lCqYVVjJQrJAzDntQWxirCd3UZth3SsePPJpqNVqcwDA/cPDcc
-OBVnQSoH156pEo3aupX2Ij8a11r7UOI4RlZgWCuw0NR3+CHmWpUhcIqc+rHLS038
-zP3TLOutT7FTCNODPgXEKdDeE8NzD+hnussk4LdPEGBVsh5nbSPKSub6SWEh59Wn
-8QL9pW5FXT26D7eNwrcECOdMW92tQ2eWrBqcRCKiXIW6cHVyt+1agRe6MLik4NLT
-v26SskVzuolyhSE13i68HWOswaeYCkgp6MmtmoLajD6P/SXU38C0z4pIHY7lTTAu
-txm12CQdRzxOQXoiAeNIRAMMa+uJRxVruZgKR0Dxk5fwO7TUjXFBJakcKoQ2EDEv
-s2aQbjNz8rTJiwrWZOorTHAVGMbRxVopGV+tHYuIiKwvH50oXs0OJlLz+cbtzvuz
-crip45JMHCyx7fO4VOtXSFzInwDnottHRum5VTDN2mgqCj5UV9tytIwdiVE66hFJ
-tTCBcyyHBrvBpkalySEW
-=7uEo
+iQIcBAEBAgAGBQJMyxqpAAoJENwGBM22xffecM8P/RsBTNcLc8l2jDKszMWt5Kvk
+wRrmhgvB8eXfe1NvH1wwbsz4UUnNF5G4sLYBnaXDRdYCYcil93HMYZg0fM4lV5Oq
+fzvRD8KXkqTrb/YVklpTRIcUCBlknJSsghGnxpXjKzVbD2x+LZzWxwN/MUYLsFvo
+6DpfJB+u0e+AJcBLts/nVYkjlsebxILWkLO2Rkd2zRhAHWXe51zkRNok1vjSrpbp
+n4xcCUzMbh4wAqg02OpezKV5Odvt0x7nfVbbj3iGRy8TNMwBwbGgU23TO+5Nd9zP
+B0aOCkEb2GGstcnMuabTgu6uMgtrAo+5GJ/uOJe4h4LqA10mYAT/vqDRpN8MN22H
+UNW1xoVPdkNGkxd5p7B1i0HzCMLqJZK/mdhBXqrDq5rN7Gs3Z+zs5SORpVTwnkcE
+PjW7+Uqbg8rUzfsnsaqyE0fgef89snFNaFgbuj28OhgxpkiVNJEg4Xkf8iUUVX5V
+3Sgtf2kfLQXXDFIr6oVYb6quWq53pENmJZM3LZlFqUs18PHyDZj13K3IdcQ7imqf
+F6K/+/j8gjCgn7+ZzwmB5DexGcZ1Zhy8IZIdK7M05YVxbEG1hZbogoGc+xfcJurV
+z2Rqr2tt0sHNyE4JUHQpjHQmP/H3W94I/0zLAL0mq4uWLRug6dKsu4gqhb8J80fD
+F1BGVaM6uiwHCxw/ZnwO
+=7f/s
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.1-r2.ebuild b/app-admin/collectd/collectd-4.10.1-r2.ebuild
index b1ec87f..2927ca6 100644
--- a/app-admin/collectd/collectd-4.10.1-r2.ebuild
+++ b/app-admin/collectd/collectd-4.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.5 2010/10/10 18:15:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
 
 EAPI="2"
 
diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd
index 2e5e1f6..a08b917 100644
--- a/app-admin/collectd/files/collectd.confd
+++ b/app-admin/collectd/files/collectd.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.confd,v 1.1 2010/09/28 15:17:05 dilfridge Exp $
 
 # Nice value used to launch collectd, to change priority of the process. As
 # you usually will want to run it in background, a default of 5 is used.
diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
index 746ea69..002620a 100644
--- a/app-admin/collectd/files/collectd.initd
+++ b/app-admin/collectd/files/collectd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.2 2010/10/10 19:13:04 dilfridge Exp $
 
 : ${COLLECTD_PIDFILE:='/var/run/collectd.pid'}
 : ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
@@ -14,7 +14,7 @@ depend() {
 
 start() {
 	ebegin "Starting collectd"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start \
 		--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
 			-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
 	eend $? "Failed to start collectd"
@@ -22,7 +22,7 @@ start() {
 
 stop() {
 	ebegin "Stopping collectd"
-	start-stop-daemon --stop --quiet \
+	start-stop-daemon --stop \
 		--pidfile "${COLLECTD_PIDFILE}"
 	eend $? "Failed to stop collectd"
 }