Include support for ping plugin since we now have net-libs/liboping. Fixes bug 346907.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 36 insertions, 7 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 6cf4a5a90a7b..dba1028fea15 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.9 2010/12/16 17:33:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.10 2010/12/17 01:29:29 dilfridge Exp $
+
+*collectd-4.10.2-r1 (17 Dec 2010)
+
+  17 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -collectd-4.10.2.ebuild, +collectd-4.10.2-r1.ebuild, metadata.xml:
+  Include support for ping plugin since we now have net-libs/liboping. Fixes
+  bug 346907.
 
 *collectd-4.10.2 (16 Dec 2010)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 4ad4da12044b..f7ce0da2714e 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e
 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
@@ -8,6 +11,23 @@ AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faa
 DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56
 DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be
 EBUILD collectd-4.10.1-r4.ebuild 10169 RMD160 2e58557e4b1491c49ce296b13934d7a8ed0f98c8 SHA1 22bf8e122db1b0ce7a08a605200e9920752702df SHA256 63b708a3addf663126800fe93df31e6cfa78d961c049605cf13cc4175c2cc770
-EBUILD collectd-4.10.2.ebuild 10698 RMD160 0f6a79c7b5a900f3185957ba372fd120bbc7ec34 SHA1 a3015e0342344bc4945f56ae402f567c447c47da SHA256 0fcecfd309711ed01febb0bb646f59916429f1e4b51358d55ffe8d25a1fe53ed
-MISC ChangeLog 2375 RMD160 a3478e02d9feec4a2ba598d27ca58e8e66f159ee SHA1 88b4374d41d012512d566d59cf4d5c56a3409414 SHA256 5f1036eba216f151e3289c0f6bddf27258f383ce3b8f8522961fdc787a2f585a
-MISC metadata.xml 11154 RMD160 cc4cd6e71b9f80844be5de445f8c3928efd41ba9 SHA1 ecd8157d3ca7298f46313c57711e782b7074f8a1 SHA256 54f495238df08bbd25f964145650567e45492f5117c8dd4dc7604896df804195
+EBUILD collectd-4.10.2-r1.ebuild 10749 RMD160 029dd738593a491c6445ae3e826fe7980fa26a73 SHA1 a00d97ef5005b3842c5a4abff273cb0db30c0094 SHA256 35b0a0ad02fca90e4331842840c7ca6abcba80ba93f6f9a852cb9b36edede223
+MISC ChangeLog 2629 RMD160 1edb08b510fb3c2ea2617e50332f840349a6a7a0 SHA1 2acbfb7f1cb79d6a663a55e354007d6a203011a1 SHA256 fa74f328f579dc472a8f53d63083ec05b014e925eb7be21d3ac6b2d613b090d0
+MISC metadata.xml 11254 RMD160 22fd4a09e86f30527ee4eadd5ac2ffc28cae4c3f SHA1 de399702b39746a57efafb101f98a6ff7235acb2 SHA256 17c01423e9f5983ff454c92d27818425b9df03978dd2decdb116e097bf1f7028
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNCr0GAAoJENwGBM22xffeWH4P/REcV/M/fwGGVJfGAVFvO7KK
+VpJY1rbGOjsn30Typdw+tdlD5omI996tLBipYYY7uPx5ZHdz5cdBDDktPVVeQyOa
+39HfwaROBx95ouAwiSXo/whvWwt17Kr+up5SDJBkfj7YzP0RqVsQUWCEv9m9zwhb
+qDt6eX0HkyJunqm1Bz4cZz8SZf1vI1Ea3Uj/377fK5p2+fjiUpicNAjM7RPPPPTZ
+vu47Whoj5dnD/brCSE14Sp5RR+sYNGtOzWTEQa6tjaXl47GwwKHJCK7XzNrUfcr1
+h42VpY7eeFSN2Z5QyPb98lY/calTVV+7TjPllBRlrsWFNRFdveNZjjR2y1QdMKHV
+FxV7HvElGGZYdZQ5rxdfTBd21tXXLfC7/YBlPnaV3oDnCBKOdG5azSPBHIIScXtn
+oz4dhzeyfEg3ndbiXRoCSehfHSYOGBNN9Ju1pJkRy4UFeEUzdF1B+OGRe5sdPDuB
+X6p9IcTgk6Gbh79M8LMxRPtekwDoLtbk2ZqUJcHGBitctXmdXBv/wdn3wXSHZaAO
+my6AVEIFsie7RuNHgGr81Ol3y7KjUNvKQT6OC2Bwx/4eoHqE2oYB+GLB1qoh1DJR
+Q73e+V78G20Tko9Rw44yOaOCqMKWCFifhcQcAZmfHbkfYYplsWi6biJlKCnv0sT4
+PkVHlN7fFaA6apaPA0h4
+=ZVNa
+-----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.2.ebuild b/app-admin/collectd/collectd-4.10.2-r1.ebuild
index 706fea4df64e..a573127b4761 100644
--- a/app-admin/collectd/collectd-4.10.2.ebuild
+++ b/app-admin/collectd/collectd-4.10.2-r1.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.2.ebuild,v 1.1 2010/12/16 17:33:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r1.ebuild,v 1.1 2010/12/17 01:29:30 dilfridge Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin"
 # The plugin lists have to follow here since they extend IUSE
 
 # Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="curl_json netapp pinba ping xmms"
+COLLECTD_IMPOSSIBLE_PLUGINS="curl_json netapp pinba xmms"
 
 # Plugins that still need some work
 COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc nut modbus"
@@ -28,7 +28,7 @@ COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswit
 	cpu cpufreq curl curl_xml dbi df disk dns email entropy exec filecount fscache gmond
 	hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec
 	memcached memory multimeter mysql netlink network nfs nginx ntpd olsrd
-	onewire openvpn perl postgresql powerdns processes protocols python
+	onewire openvpn perl ping postgresql powerdns processes protocols python
 	rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal
 	tokyotyrant uptime users vmem vserver wireless csv exec logfile network
 	notify_desktop notify_email oracle perl python rrdcached rrdtool syslog unixsock write_http
@@ -69,6 +69,7 @@ COMMON_DEPEND="
 	collectd_plugins_onewire?		( sys-fs/owfs )
 	collectd_plugins_oracle?		( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 )
 	collectd_plugins_perl?			( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
+	collectd_plugins_ping?			( net-libs/liboping )
 	collectd_plugins_postgresql?		( >=dev-db/postgresql-base-8.2 )
 	collectd_plugins_python?		( =dev-lang/python-2* )
 	collectd_plugins_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index f31fd6ebcf01..589ee1d4f880 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -62,6 +62,7 @@
 		<flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> 
 		<flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> 
 		<flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> 
+		<flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> 
 		<flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> 
 		<flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> 
 		<flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag>