Version bump thanks to Johan Bergström <bugs@bergstroem.nu>. Bug #443954

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 384 insertions, 17 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 2f2df34db8ab..c1b4ea6f8cc8 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2012/12/03 20:49:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.47 2012/12/03 20:57:02 hwoarang Exp $
+
+*collectd-5.2.0 (03 Dec 2012)
+
+  03 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +collectd-5.2.0.ebuild,
+  metadata.xml:
+  Version bump thanks to Johan Bergström <bugs@bergstroem.nu>. Bug #443954
 
 *collectd-5.1.1-r1 (03 Dec 2012)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index c103acfd6513..8a19b99ee409 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -19,26 +19,28 @@ AUX collectd.initd 1649 SHA256 9db6809d7e7991208d35bc517c71d12a5fa8b8453f096a433
 AUX logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
 DIST collectd-5.1.0.tar.bz2 1305538 SHA256 521d4be7df5bc1124b7b9ea88227e95839a5f7c1b704a5bde0f60f058ec6eecb SHA512 c107bdad66d90d6e299ba0da68cc0726e3b0541efd7d672687713f5a414765d2afbd66a8c834da36dafe201dc0ec97caf80844d5f0354503fa67fcbfe0d43725 WHIRLPOOL 3de7d344d622ac20cb63fc0ce78e5d18c7d57d52e76ea09a47fc58bc339cf1108baa521e142a3d386f56dbf7a83311f2f93489241f2061da90900617f1715e8c
 DIST collectd-5.1.1.tar.bz2 1331678 SHA256 0eeb8e45c83ba13fa00bd4f6875528e8a13769ba218205785d40b861489bf1fd SHA512 5d5f30ddb9ded3b48b64efdc1a4dbbbfe1601c16fc2450a7d1a1786493b12e01da66f23eca4d59853326b3c598b2fa9475f036e78e0d9e50b3f5ddd3a37c3c9b WHIRLPOOL 6a7256f1dc526bd0b6cb4c4845d511257c2c61c0de9c17ecff6751ad89698eb4127fe1cba4919920772bacd2a3c6966201ea162e61caf8e9f4e5baeaa0fb20e2
+DIST collectd-5.2.0.tar.bz2 1391762 SHA256 3f8dd235b8e2493a4ad558e3cd15b89007a0deaaef5481782d1e8e048dd43e4f SHA512 c98fe0b64df0c4dcbc254fb0781d3aae15985c89a8b9121d2e79fafbac0d8b290b02b27c3eca0e471305086a36db10dcecb2d27c71eb87b0c9dc9e2eff1c02f2 WHIRLPOOL 1ed6b089870879bf294b53154738a9cce480885250c10d61b7b5a6502ff191a9e3942e312bcd3de530cb6e9486165dd4d6d2ad7659e6e051aa135c26f2c68f65
 EBUILD collectd-5.1.0-r1.ebuild 13039 SHA256 79521d9f28c13621de895bd9c4dd9c0f9011d132c50c0333caefd69dfd1dda58 SHA512 8000c771e827fb23aafa4af402e713b17a537cb5dac17f5423cceed3da27da53f6d80aae0c9cff3c29102bfbedc4282db0a7d6ed6627371f717276a3e1b9c548 WHIRLPOOL df9aef6f32f53c6a2e838d446e17f41e99349533d6a7aaa2bc1b7ab061ae51ad31d5d41d45aa11c328a18ec964542d61e9c350c63439c9c6bf61b0e6a2710e74
 EBUILD collectd-5.1.0-r2.ebuild 13143 SHA256 0edea50f8894b2735858679655d83c2e68611d17757f598051da5f1b82c167c9 SHA512 a099084e14dadc7948206cfd524c75d13007cb526fff85551438f5f5554427e79367d6e8aaaeb7c82623ded288de5a3e7067caea4242eab3a79f998aab4b2697 WHIRLPOOL 54d377f35bcaf1d99d2bbf28fe5c6ace98cae4a24c39a040e82695510bf48c8d0fe6bd46d4674d45d1eb903ec47123001b845e8f157f8e96c7fc4d554e40872f
 EBUILD collectd-5.1.1-r1.ebuild 12874 SHA256 1cd73bd6aa49a2f69aa036bcee259b80c075f1676a107aacba5b2838d8417d23 SHA512 681c469d1c903ef7392fdb0709752406635b539e1c8258663976dd9059d54bb83652f357972781d97c9734ff86ac9f7a719724ec929325326f23f9a2b70477c5 WHIRLPOOL 2e1fe0d8c45a5c403fb64c987341fc6c0a1cc21c37e50fc13b864aa36c489dfbfb7228cde5ccf56b54dda260e1b922e404d4bb884b0aa4a43fcb59c5426f3c39
 EBUILD collectd-5.1.1.ebuild 12795 SHA256 cae2544e576bcfaeb65900bd1ff3175bb2ed315348772a897bc883dab0c5cf84 SHA512 6aaeaf6d1888bee03bd2ff60853a079a863bc994736ac910ff78e568eb8ed72e79d7be8a4432900f5962c028d58ce502b1de160f3cc493bb2922dcfd06ff687f WHIRLPOOL e16071f9cc379a1fa25452cb3abd2d2090307d41a7b411913fa3f6b4462a2ea05d9329833fb8b3be1476327e6ceab629239a8f7b70043a9b81d2c07c4583c4e7
-MISC ChangeLog 9493 SHA256 755602ab614640494f7bc520b7ee2fe4b483f82a15d0de99ecebf44fecf29cc2 SHA512 dcb8c4f579c6014043926ad7a22e4ad1e3b444d9009ad63d462615c3f4269a5344e2c919c1949280a0f99c6e7d801497d7c9bbd7dd19be363c2ada492018be1f WHIRLPOOL 83d66e30bcc250e4b5712f45d389d9baca2aa0efcb4e682e18c50e41f5794b9a0bb349f97238cd8845aca57c4299d1e47f20f476a27a85477919bd3c55337fce
-MISC metadata.xml 12479 SHA256 b9185660fbb34e888e50be1e9eb27270e6d3743a147c289d991f0d89bf62141e SHA512 7d3fe03386c4c3c53ed0236206d65a5cd9aa3b15d7254fd98b0d44bc6c70d487d1491845181dbc9fa795635d83d9194e5a618bb37ff822a3a3bb2169f5672812 WHIRLPOOL 73db0a994adf29c0eb1615891f988d4f1a4d676e51861ea87e4b69dee1348db66b816f610dfdc32337355320cb1c87e8920d31c23782ee4a326d2c641a192473
+EBUILD collectd-5.2.0.ebuild 12834 SHA256 34c85ec844b9077685cabaf4766982f917e4040cf88969524f18a8075ba88be1 SHA512 7269086414ce70fffaa8f53c19363e0382d0b6bbd5d06c5401f217b08942e10db8915eb14c90628dc447999cb895681ee97d60eb394ec791ba2ce39b6ac952e3 WHIRLPOOL 0500c38bd805ef3873cfbb77ce21459f6adddf12d6dd310d414e606823a4ba9f25cef20a84688be2a82eacbc06e05dccce5b79e19ddf879c743b990c9c894204
+MISC ChangeLog 9694 SHA256 bac0671bed9296979743907bdcfbe0dd8a39f779735c6a2207efc3e6475d9786 SHA512 9de97df65f3cb13314fbfb4e824646ab191955578cc0abdb43af60ce7a1c0918bf5818178de0df464f5c91af91fbff74d54e0f97635ddc55ae37be0afb8758b4 WHIRLPOOL 549a6c2fb4005e7046f57db2b7593a77fd30ba04ed7ba1840f4d2a590f8862a5a8d0232cd986acd7fd79773397380a7df471b34816503a41618c89a6ef2c2fdc
+MISC metadata.xml 13197 SHA256 9bb892b004ad111ce67d23e5c1cc6bcddfd4152f9a62550c878be361a1c2b268 SHA512 80f2ef5ef1ef267546f4cb040bf79d67a77daeee2dd52e79f38c942da29f9e1250ff8437238ce38bb4a1720d8baa48d78f971dcbc97fed17a141d3a60bc21d1c WHIRLPOOL 06add4b9db1ddd13b91f34501dde92e999eaae9439cc3708723125c54d4e055e141d256c28513e66e58d187a1d51dbfb4ad8bcfd1567d74428c515553ebc92ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQvRBYAAoJEPqDWhW0r/LCP4QP/3ChmEKasxMSVYztN56g8ax8
-eKbd5gEjyN69vRlyrnGiISjgkFQticKgQuiPRyS8DrpjjSNtaMe1aktz3uyeC287
-pDnwaiYNtq51FkvauaNr9dvfd161+84HI65/L4cDC7yltBsMkqIvK2o5MqEUPThS
-Ixr5+ZOGdqi5plakw9+lyZY5P1erKICJL+RCmKgVc0lw94asVsaUkvhpDHrX8c0S
-i6uwVXyT752zgl/wJUDCAeoYPvDClLUgMmDhR4+3MUI54EoAOTmG3vTk6T9xKns7
-137mD5U/JzcagZYZLnOibgYpM65kzmDoWC6QBnZPQpnGs2/nmU2VwIEX/ol55idb
-1TV18eKp1TmvJyKri87mhpEHJ3RTLZErzzkDDL014zWfhJ8t15pB5FoUqPkEJt3k
-I5/my5OKR6N4LLcnr8L/6IWX1KfL8OJ9S+8Ewi7P43aX4JPyD2NvFVaYt1vx3a8x
-oZ/84PfOYN6Flj4OuWypQe010Vk9PKtsFC6rpiSJXs451wFvh36oyyGUC7o2Qy09
-KxGdawP13PKtsZUacnPw2zkmGc11J1wkOW2clHn6OLD+vH0eouHbRQ/bd031j9kK
-g33tLlMQCaSzbuy97T8WscK3f3LpuPF/eHGEsg33ssUWANb9aALfRHA1LxwG596o
-2rmDkxqhiRqM/UUefEdQ
-=OiNh
+iQIcBAEBCAAGBQJQvRIfAAoJEPqDWhW0r/LCeNsQAK61q5muPg3etXjc2hlrek+R
+ymoC7gUyizNNl1pf6lDU/XA0DopVfq8/V/RpkFtH33JTemHApGSQbxMWWm7h5kam
+0Apvn0IGKolbHwZVQ2lGhUrQzPkK+vNfNIV9th31a4Dfp1A6hF5VSnGJnv0//ag0
+q4dtW2Tn98bMnobAMPLgxy96PzwCqhJ73j2oxQKib9xPIGakP0H4uU68xkgJathG
+f6gs5ErKuSWXu2zCLdBLEnMq2KodyY7TDxlB8I+1pUULZBFLqVHe036a1pF7FD6m
+bvw+uCBQI1UONOWMYJ1DbC7FbNo6R/LC8m6Z1YM3sLuRDajqIgzDgXXVR4bX+h/Z
+xQLab/cY6aiwK58vaFPYCBte3mBxouR52DtmVNMbuzlgkI5FI9mo9mxI/NI8hjnS
+RgIdOSd62S3i0HhpEFA5W9CFQu2LdfW73sZONcoM3U3sjMG72eMq2/JHCFH+UT6I
+pkKoIRIu83NuDWd4Wckotfs4YNW7w+4UYue27pbtyKV8yNyNrTdjaEd1DBnpa5m6
+QGw3p3FH4M6lfJDwVd3UAS78ErsGNMuYZsFCP6x4ZyQFpbERuNAK/yFLCnbgdA7U
+UwRIpsIEX1jb6iaTiAYG7R6qFBi5h2BKsDvHcNFcxId8RacN6ir8snwbwrZUHHHk
+X/fB7DAahjmDNznv01rQ
+=9SF6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.2.0.ebuild b/app-admin/collectd/collectd-5.2.0.ebuild
new file mode 100644
index 000000000000..6902a6b41782
--- /dev/null
+++ b/app-admin/collectd/collectd-5.2.0.ebuild
@@ -0,0 +1,356 @@
+# 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.2.0.ebuild,v 1.1 2012/12/03 20:57:02 hwoarang Exp $
+
+EAPI="4"
+
+inherit eutils base linux-info perl-app autotools multilib user
+
+DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
+
+# 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="netapp pinba xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors tape zfs_arc modbus amqp genericjmx
+	lpar redis write_redis v5upgrade"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind conntrack
+	contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns email
+	entropy ethstat exec filecount fscache gmond hddtemp interface ipmi iptables
+	irq java libvirt load logfile madwifi match_empty_counter match_hashed
+	match_regex match_timediff match_value mbmon md memcachec memcached memory
+	multimeter mysql netlink network network nfs nginx notify_desktop notify_email
+	ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql powerdns
+	processes protocols python python routeros rrdcached rrdcached rrdtool sensors
+	serial snmp swap syslog table tail target_notification target_replace
+	target_scale target_set tcpconns teamspeak2 ted thermal threshold tokyotyrant
+	unixsock uptime users uuid varnish vmem vserver wireless write_graphite
+	write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt
+	sys-devel/libtool
+	perl?					( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
+	collectd_plugins_apache?		( net-misc/curl )
+	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 )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13 )
+	collectd_plugins_java?			( virtual/jre dev-java/java-config-wrapper )
+	collectd_plugins_libvirt?		( app-emulation/libvirt dev-libs/libxml2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_mysql?			( >=virtual/mysql-5.0 )
+	collectd_plugins_netlink?		( >=sys-apps/iproute2-3.3.0 )
+	collectd_plugins_nginx?			( net-misc/curl )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
+	collectd_plugins_notify_email?		( >=net-libs/libesmtp-1.0.4 dev-libs/openssl )
+	collectd_plugins_nut?			( sys-power/nut )
+	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_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
+	collectd_plugins_rrdtool?		( >=net-analyzer/rrdtool-1.2.27 )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
+	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_write_http?		( net-misc/curl )
+	collectd_plugins_write_mongodb?		( dev-libs/mongo-c-driver )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_interface?	( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_load?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_memory?	( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_swap?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_users?		( >=sys-libs/libstatgrab-0.16 )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	kernel_linux? (
+		collectd_plugins_vserver?	( sys-kernel/vserver-sources )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_syslog?		( virtual/logger )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.2"-{libocci,nohal}.patch
+	"${FILESDIR}/${PN}-4.10.3"-werror.patch
+	"${FILESDIR}/${PN}-5.1.0"-libperl.patch
+	"${FILESDIR}/${PN}-5.1.1"-lt.patch
+	"${FILESDIR}/${PN}-5.1.1"-perl-prefix.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then return 0; fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	linux-info_pkg_setup
+
+	# battery.c:/proc/pmu/battery_%i
+	# battery.c:/proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# nfs.c:/proc/net/rpc/nfs
+	# nfs.c:/proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c:/proc/tty/driver/serial
+	# serial.c:/proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c:/proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c:/proc/acpi/thermal_zone
+	# thermal.c:/sys/class/thermal
+	collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# vmem.c:/proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# uuid.c:/sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c:/proc/net/wireless
+	collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	rm -r libltdl || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
+		memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+		wireless"
+
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	# Do we debug?
+	local myconf="$(use_enable debug)"
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	# Need JAVA_HOME for java.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	if ! use collectd_plugins_iptables; then
+		myconf+=" --with-libiptc=no"
+	fi
+
+	# The perl bindings
+	myconf+=" $(use_with perl perl-bindings)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	fixlocalpod
+
+	find "${D}/usr/" -name "*.la" -exec rm -f {} +
+	rm "${D}/usr/$(get_libdir)"/collectd/*.a
+
+	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
+	# we cannot do this yet
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" collectd
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+	if (use collectd_plugins_${1} && ! has_version "${2}"); then
+		elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+	fi
+}
+
+pkg_postinst() {
+	collectd_rdeps apcups sys-power/apcupsd
+	collectd_rdeps hddtemp app-admin/hddtemp
+	collectd_rdeps mbmon sys-apps/xmbmon
+	collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+	collectd_rdeps ntpd net-misc/ntp
+	collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+
+	echo
+	elog "collectd is now started as unprivileged user by default."
+	elog "You may want to recheck the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
\ No newline at end of file
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index a4191040eaec..d113b154cc86 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -2,12 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
+	<longdescription>Collectd gathers statistics about the system it is running on and stores this information. Those statistics can then be used to find current performance bottlenecks (i.e. performance analysis) and predict future system load (i.e. capacity planning). Or if you just want pretty graphs of your private server and are fed up with some homegrown solution you're at the right place.</longdescription>
 	<maintainer>
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
 	<use>
+		<flag name='collectd_plugins_aggregation'>Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
 		<flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
 		<flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
 		<flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
@@ -92,6 +94,7 @@
 		<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 (checks values against configured thresholds and creates notifications if values are out of bounds)</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>
@@ -106,4 +109,4 @@
 		<flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
 		<flag name='contrib'>Install user-contributed files in the doc directory</flag>
 	</use>
-</pkgmetadata>
+</pkgmetadata>
\ No newline at end of file