Added curl_json support thanks to Johan Bergström, fixing bug 349124

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

4 files changed, 28 insertions, 20 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index dba1028fea15..ce4e14ee4438 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2010/12/17 01:29:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.11 2010/12/21 21:14:24 dilfridge Exp $
+
+*collectd-4.10.2-r2 (21 Dec 2010)
+
+  21 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -collectd-4.10.2-r1.ebuild, +collectd-4.10.2-r2.ebuild, metadata.xml:
+  Added curl_json support thanks to Johan Bergström, fixing bug 349124
 
 *collectd-4.10.2-r1 (17 Dec 2010)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index f7ce0da2714e..ce9edfc36492 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -11,23 +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-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
+EBUILD collectd-4.10.2-r2.ebuild 10811 RMD160 d89e0933bf5fb4518afe0d940b35e3684b960391 SHA1 1cb6d913c706a38e9beb2b3801ffdd8d93cf4a61 SHA256 5c354556e0c47668942070efb34e01adb8a4793801dcc19567fd7e5fdeb4b89f
+MISC ChangeLog 2866 RMD160 411fbc983f5d568ae1203cf0eb97c2e932fc1a51 SHA1 fa15f73e80aafe0a12586e4bbde3b98a89649ec3 SHA256 91c12e37c2505e0392d9d9f143cae227e1d2728f68bd65c99d08c787b32939cf
+MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
 -----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
+iQIcBAEBAgAGBQJNERiYAAoJENwGBM22xffeK10QAIcUvZKPqeFFSb6vUEWnKhd8
+rSwbAew08aUXwb5AXjohiX38x0dIuCcFkMuLkQNQbXJZCrYxU3UR1LC8v3Cx99OO
+QBoQYqBt/FR6yj7cOkYLtqO9h4K2Va6Oz/0PnWBaPr7uv25t22F4WjCOGPMo2Yw4
+WI6Usv7FrTXHjDfDopkQUOojjdaDrGZveju5dKpv2yOhAj7QFQp8FXi5gDYVdskF
+b+23LQUpjKOecdTHYQeuFzfUSgwJq/pnJTc1xAOyJU17QfKMRXfutj3G6Riq4LLh
+tKEHHzHt2X14xro6WsnCYYhsUy1oppvr7lR3bbAOB7diqCSQaWhFIjDFoSnSuiEE
+6R5SS9xFXMZ9iwsqRziZCig9X3erBKU1nkxec1cRaAVWSUgrkRKdLgaDjk6Ut3v8
+JMQrx407s1GV9+fhfhRr4h/w6g6FSqFp2N+DSkbIfs+qedbFWB70weedeMLDOStx
+gsXobYfwOw+FO4zrQvQQLMTTG6jIG8tmeGZMFRkmnF165YUS/VyT1z8GeOntJ9XI
+V2C6NpFBT44yNaViPsoryvBkOUO4+q9ZGVPISosQouJgNk9go9NxiVT8zSOnb3CH
+kXSywawhT8gW+vP0BByyF0eDakP6/6HhQFxFR1yDU4tUXcPE7+RrDy36zRP7glVq
++VyOgfvRkIBP9qquYYTl
+=T+Nj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.2-r1.ebuild b/app-admin/collectd/collectd-4.10.2-r2.ebuild
index a573127b4761..b899773ed91b 100644
--- a/app-admin/collectd/collectd-4.10.2-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.2-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.2-r1.ebuild,v 1.1 2010/12/17 01:29:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r2.ebuild,v 1.1 2010/12/21 21:14:24 dilfridge Exp $
 
 EAPI="2"
 
@@ -18,14 +18,14 @@ 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 xmms"
+COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
 
 # Plugins that still need some work
 COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc nut modbus"
 
 # Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
 COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch
-	cpu cpufreq curl curl_xml dbi df disk dns email entropy exec filecount fscache gmond
+	cpu cpufreq curl curl_json 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 ping postgresql powerdns processes protocols python
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
 	collectd_plugins_bind?			( dev-libs/libxml2 )
 	collectd_plugins_curl?			( net-misc/curl )
+	collectd_plugins_curl_json?		( net-misc/curl dev-libs/yajl )
 	collectd_plugins_curl_xml?		( net-misc/curl dev-libs/libxml2 )
 	collectd_plugins_dbi?			( dev-db/libdbi )
 	collectd_plugins_dns?			( net-libs/libpcap )
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 589ee1d4f880..5188889c657b 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
 		<flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
 		<flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
+		<flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
 		<flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
 		<flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
 		<flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>