Enable threshold and v5upgrade plugins

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

4 files changed, 29 insertions, 23 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 17d2c91e489d..1ba83aa431d4 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.38 2012/05/24 04:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.39 2012/05/25 21:26:29 dilfridge Exp $
+
+  25 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> collectd-5.1.0.ebuild,
+  metadata.xml:
+  Enable threshold and v5upgrade plugins
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> collectd-5.1.0-r1.ebuild,
   collectd-5.1.0.ebuild:
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 449fb8875556..6363caacaa21 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -15,23 +15,23 @@ AUX collectd.initd 1649 RMD160 69e2d339e328b7e7806c49c0226e6e2ffcd40675 SHA1 e83
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 DIST collectd-5.1.0.tar.bz2 1305538 RMD160 31d211b14086edbcbd8c8c9081ec07201310c62d SHA1 77545833b77a03ec02219bfb925e6a1f3463ddef SHA256 521d4be7df5bc1124b7b9ea88227e95839a5f7c1b704a5bde0f60f058ec6eecb
 EBUILD collectd-5.1.0-r1.ebuild 13029 RMD160 b2090e9326064b6e8217aaf47115e7f92b3b1318 SHA1 cbf3b2bce862e5fcc5631879181d32c19c6440e3 SHA256 ce21beadc55a025c0e85f736a9f403a2fa6183acfc6f56a9bd2b7b8cd9ab0691
-EBUILD collectd-5.1.0.ebuild 13011 RMD160 994005aa7dc9a6fa95678d470c1da7b2aa926628 SHA1 446a768a6c8f1cacac2c341412c1ebf6f84a047a SHA256 a157d69379fe636263c6aa4090f1593569bdc50ca2e51b2e2c5dcb4e9f4c776c
-MISC ChangeLog 8150 RMD160 a4bb1fa82707bff8a0bd49c89f438673ab66ab58 SHA1 9059a67ca1cd433630f438122b0622182df1b5ae SHA256 33286c88ab206715d2aa821c1756abeda487ed4b0163f18ba33860e81729f4bb
-MISC metadata.xml 12594 RMD160 a9d9f41828e6ca5c347489e14706fb3833e54469 SHA1 25d1c30386c90fe864404f7ed191c1618e89748d SHA256 854310c4fef0cfa27a436d27b348de8d9ae618fc6f66f9dcb7bdb0f14bf514e4
+EBUILD collectd-5.1.0.ebuild 13014 RMD160 f05cf7dde3fa6de4f4f0e315e6fea943e7c29591 SHA1 9757a1afa65304f9472e0e64e25d225f1a191cb9 SHA256 bf45ba8ec67230c499509829f2616be162ddaec8089bedee3c5b469ec8741bc4
+MISC ChangeLog 8291 RMD160 1f0ff15ea967e8be85a199cae3c4c0736b17740c SHA1 639c6272a35ca34439b1f05592539e2befee6d76 SHA256 3ded3448f4302435581d2eb34420c2918b1100f4daa629f67ac9653dfa318c03
+MISC metadata.xml 12746 RMD160 f65246752a7be2727c424dd90fc0ce854390fe27 SHA1 2e77bd70548a9d85deed9181b9e2480f1195ad70 SHA256 60df947efd892fcf4b7fc4b15c3681b456edc1bb735be51560788b6bf3705c1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvbf4AAoJELEHsLL7fEFWWFQP/AwlNeLyIMYew2RaawLuhKQ8
-VDUEHO9Jk1w66Io5H0uGR2Y65xpJvWVleWl/I5DC+awyVwc7BHOSvhw0q9xZRBd8
-nBIEuYCivCO39gU5c+Bz66HslxI2TsRnF9cvF254J4gGQY4CXcZj6F52l51XmQag
-biGQ7m+3CoF5UPZTxIKzXg5S4R2HMHtu8lKJLW9/Qc/yEYezg/meGMVRR4sTKFu4
-FAZLidkk6aaaKVK98QaqygVA4rlxP6TncdPWFJaQ9mzSxXLq8+T/JdQUTGNnD4nX
-uCBgP6E17Un8qdajWwrsknPgCvCdvPiPeVPJ/RyHOMJ8zyfxeqaZbC7dl3M5gn32
-fPYx0SBdTziFZSBdnaUjIenX45Kf8w/qRjYg0EvVyCwoTAJWOvk8j2EmkFTsFRrJ
-rY9ba+E0bgO42uKNj9kN+LCw7ZpInyPNiXGVfkTzK28UIN2jvMOM9yknO3h8sYXX
-ka07N5dEhX5ZTGC6hyS5nEgfpBMiVH6zKzEJNEbdWMVsOxLbv8WKb9nRSa+yxe5c
-i23wk2p1nC1uVwl5qQWx++z17+/8u4U6IEaWkeXY+Gxd428Y9WEpOTnAfZhrgx50
-4lTbaa0/4e9cySCACIuAUPpafWYLb+KOze9CkPnillih1ptKM6tzAF9ehJP5n0I/
-uP4yPHjFbfJOREupFNvZ
-=NfOe
+iQIcBAEBCgAGBQJPv/lMAAoJENwGBM22xffetQEQAJMSsYksN3fC2jfRal7mt1y7
+gXcWTf74zyfNdvh2jzZy4HKEQ+lQL2fSE6ckCxgjzR1Vx453rgVrF/57qhqnKA2l
+Q6o9qHeQ6oMNql1k9Y/Nrw+uJjMKJBZE+8MwwZ+kjdxhWQ9OQQnyPIXRjxvM4Gv6
+7CJIrEOfaRKZBFzH3p4QWRApJuxk9/3YW05y45lh6XaoQRexAxzJ761Ddc/lAY1M
+jTsSsfQxIdZHExsYm+UWKLX6uFQcs8XbEU2G9lCMsMPSq/FPr3VD5i1Hz3thD6o9
+xKeoBekJ1LOwrvYRE0CTHezlMEeKMlHxvQQhlKh+K3Su2jz4GCMqKujoVMhJH/r9
+MqdWxcl3RdZUsLoqu7PVp/XKnte7hMfNEvA7EiJYvhkVpGxPo73YftvTdlBPVonr
+pR1QEZC7SY4hRoMi3XEVIqBHMryWh1z+K5CfTE5lpz1JhLUTgvp+Ce8GYnrpRpfL
+KC2/Td/qWIp4FBlD/30IjVJXu55iRdYzcfyMH/rhhSaxSaNc8rV6jPNuYPF2QoBb
+uetKU3BMHf+EL0KB7OaLxUjmqT3ppnlVMmEyyYW6UuaYJgamc4gKnY1rljCEDOcG
+Fwjj/6fmGQUVbxSFQ6qZuTqGrbw19XpXrRZ9v+58GUENvujRip8K3a6tFpqGC5Xo
+kVfGVE+ciRhEZhYMKvck
+=Xfoe
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.1.0.ebuild b/app-admin/collectd/collectd-5.1.0.ebuild
index 1eb760766c4c..53ecf7c9fe5b 100644
--- a/app-admin/collectd/collectd-5.1.0.ebuild
+++ b/app-admin/collectd/collectd-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.0.ebuild,v 1.4 2012/05/24 04:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.0.ebuild,v 1.5 2012/05/25 21:26:29 dilfridge Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
 COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
 
 # Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors tape zfs_arc modbus amqp genericjmx lpar redis threshold write_redis v5upgrade"
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors tape zfs_arc modbus amqp genericjmx lpar redis write_redis"
 
 # Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
 COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch
@@ -31,8 +31,8 @@ COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswit
 	onewire openvpn perl ping postgresql powerdns processes protocols python
 	rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal
 	tokyotyrant uptime users varnish vmem vserver wireless csv exec logfile network
-	notify_desktop notify_email oracle perl python routeros rrdcached rrdtool syslog unixsock
-	write_graphite write_http write_mongodb match_empty_counter match_hashed match_regex match_timediff
+	notify_desktop notify_email oracle perl python routeros rrdcached rrdtool syslog threshold unixsock
+	v5upgrade write_graphite write_http write_mongodb match_empty_counter match_hashed match_regex match_timediff
 	match_value target_notification target_replace target_scale target_set uuid"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 14bba8676ccd..915470b74511 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -96,11 +96,13 @@
 		<flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> 
 		<flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> 
 		<flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
+		<flag name='collectd_plugins_threshold'>Build the threshold plugin</flag>
 		<flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> 
 		<flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> 
 		<flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
 		<flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> 
 		<flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
+		<flag name='collectd_plugins_v5upgrade'>Build the v5upgrade plugin</flag>
 		<flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag> 
 		<flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> 
 		<flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag>