Version bump. #454594. Thanks to Johan Bergström <bugs@bergstroem.nu>

Package-Manager: portage-2.1.11.53/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 392 insertions, 2 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index ce29f71134f9..9b1c37eb29c9 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.49 2013/01/16 07:23:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.50 2013/03/05 21:26:50 hwoarang Exp $
+
+*collectd-5.2.1 (05 Mar 2013)
+
+  05 Mar 2013; Markos Chandras <hwoarang@gentoo.org> +collectd-5.2.1.ebuild:
+  Version bump. #454594. Thanks to Johan Bergström <bugs@bergstroem.nu>
 
   16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> collectd-5.2.0-r1.ebuild:
   Sort eclasses inherit order, wrt bug #448480. Changes by Johan Bergström
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 9c07a96eb8b6..fa1d26d0d2dc 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX collectd-4.10.1-libiptc.patch 534 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e SHA512 65eda9c76508dcc1b8f2d2aba9253a2738f7d66e430e50f4f275aa53e23218a416a376b00d9d46472b578fc4a11e4236d71f35867470eb8f4dc287da72c8da2c WHIRLPOOL 14d4047f7e02684f1b677128e3263ed700b9cc12cef58a382baa19c26c8a65e5ff4fe5e11efa29f020b9a0cb6bed8d237c63dfa34f70e7f3f8a452b66434af2a
 AUX collectd-4.10.1-libperl.patch 917 SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7 SHA512 4ff8cfe4b9f5925d77d5313bc513047f7680532f3206b51e83cfb334ed6715ce274f7c5208f1b4ab72ede1816ac3d5b64bced3ff0b6a75055146116abff4e7fe WHIRLPOOL 0e16752cb70132028c5a7ed0517224f8fdf5980be1ce57a2eb374cf837e32083a8034673b21e4f92d9f24f53983245fdab2574c59da256921998b7604845202a
 AUX collectd-4.10.1-noowniptc.patch 837 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d SHA512 1d299b2eb9de58e39ee8db1e310a3aad8a3fd490ad226009fbd719b2a84f377b24e72eec0feeb52bed50515db5e209d3e60b57ce153a00121a43770edb4350f8 WHIRLPOOL 053313e2b401a4f2a73e7178ad0acbcae4855621e35fee5b5268624a0f9bea010b8c2eb604a0d60a26364d418be4cd578d3470c0c01ce40bbdac09d5c2d8d429
@@ -17,11 +20,32 @@ AUX logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043
 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
+DIST collectd-5.2.1.tar.bz2 1395740 SHA256 d82a5c302d2cfa0c3f7a3c7b7e37fb3faf42b17d2addae036cb819b6b25b9d98 SHA512 f97c9367ed45dc01f187ee8ec2cfdb27e26380b1369383c4d2b5569fc13ec660ffaf074a4b2929c1fb6633ad97aef87ef2fe2a633da5527bb26703f8ca625736 WHIRLPOOL 21127c27f1ac146699b4a7c355e8f60e9d78784e3f7908b7208feaaecb687c64de05f03877265f58ecc852cbad906b4acfb0026493e61372ddb03cc3419a599e
 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 12876 SHA256 5521c0397620811aae33cab7fac41574d29559149cd13388adaf6aec3e2b85ba SHA512 028edcb6698c42f9518d021b8a87ea6d632aeb64d11b6627f98a07b66d63ced7a1d512ccf1478b7e8b73bc752cd36a8921b3d1f6dacd88f45e83239ba34d1b75 WHIRLPOOL 29bf5c2267e5ca8ed996a2f37f56065be24556270218cd342568d8dbd86a418d9f58dd26a032f2ea152e427ab3c48193722fa90e9a96a6dac99a3c9dd3a27c93
 EBUILD collectd-5.1.1.ebuild 12795 SHA256 cae2544e576bcfaeb65900bd1ff3175bb2ed315348772a897bc883dab0c5cf84 SHA512 6aaeaf6d1888bee03bd2ff60853a079a863bc994736ac910ff78e568eb8ed72e79d7be8a4432900f5962c028d58ce502b1de160f3cc493bb2922dcfd06ff687f WHIRLPOOL e16071f9cc379a1fa25452cb3abd2d2090307d41a7b411913fa3f6b4462a2ea05d9329833fb8b3be1476327e6ceab629239a8f7b70043a9b81d2c07c4583c4e7
 EBUILD collectd-5.2.0-r1.ebuild 13030 SHA256 3e9983029c9680cabd7eae9ab374600e94b92d3a5e8cd8b176385622f7a32ff1 SHA512 2906ed8811da8ddfacd268bb0c1b23c586568c38eeef6c28ad7d64b1617e4d1bf9bafcdfa35f0ce29482516dccb8b6cb5a4a6b26235bd5257574b8946b3c9e60 WHIRLPOOL 06d6f15020c434941f2b4665aed340caf971c83c58c97742e95630781f37c139bc1d9f7e16ebb3de1f886191ff9f10b2aed134be92a3485b298e73ec4cd8a62a
 EBUILD collectd-5.2.0.ebuild 12836 SHA256 0bfb51dc839796b5e32f45611109a12da3f523f887895a2ea36a970c86d46418 SHA512 b4cff22cda419469a8dd5ca139a09ff1d355e3f826d41f337239035c108cee5e7a6f0489e2bba71aeea20ea870f3f217e3e4d0faa0e6dd835e3c3390765ef62d WHIRLPOOL 1f96be940810e4c48d29478c56745465b2fdb40c9b720478fceed9f5c196402364479ea801cac2b2882cb1edbc9830ed7ab57df4fb33e7070af439d3c21adfd0
-MISC ChangeLog 10087 SHA256 b7347d4f52020af059fb253fb1cc86f2ceabc42b467bc3d3bc4fc0cc67fe55db SHA512 59860a0afd8930fd25a1dd44d659fa24ccf5f2627890aa28a3d6ae8630ef124784acd0405fa92e1b5dce5034435e8d4299861d839fa11ffee03bfc8fcad13e98 WHIRLPOOL 3c12d0297b81cd17b79f5f217150ed6528631c2c8f215d6581c04084c378a7176f0e01923bd7bcc2d3b019fef711831e463c655847c9dce7fd7385d5855d42e4
+EBUILD collectd-5.2.1.ebuild 13079 SHA256 f8cae226aae9d8e357931ccbb19840cd28ff67e82c666a0900a4b04c229c4301 SHA512 2dbebba547d5f637d5a77948eeceefc5dec5da70e482510ac5b72b83ffbf0eb1b775375c416188ec4a27a1c0aceca61b865bc75034c76fa66bc50f3a44eddc77 WHIRLPOOL 16d06305ddcdfe00bf617399a551170121f9775b95669a801982e0845ebd1b7e2f5abc59bf93a6aa868124c84389e7afa5cb5a2fd59a2e758b527ab4b6ef5040
+MISC ChangeLog 10269 SHA256 cb31abf597fa7c3b0e8ffb6f9e89e88da3d508fa2a3dcaf8cfbfc9702dd17cba SHA512 86c25e0517025d343a8a319bb10d7fc6d8fcf8920017666f98861c232b47aff31a6f688ce9dab21627ca04c121cdad3556c70b3ab88a16ae924b84f21652f4ad WHIRLPOOL 5c97f8110531b1dba2c51ab02342684900a5d01aca5153e81b5ab141643826ed976da21a8f2a4bdafa5ca0898b264db6e54d8169065034c70bfbbaa1e1fecbb2
 MISC metadata.xml 13197 SHA256 9bb892b004ad111ce67d23e5c1cc6bcddfd4152f9a62550c878be361a1c2b268 SHA512 80f2ef5ef1ef267546f4cb040bf79d67a77daeee2dd52e79f38c942da29f9e1250ff8437238ce38bb4a1720d8baa48d78f971dcbc97fed17a141d3a60bc21d1c WHIRLPOOL 06add4b9db1ddd13b91f34501dde92e999eaae9439cc3708723125c54d4e055e141d256c28513e66e58d187a1d51dbfb4ad8bcfd1567d74428c515553ebc92ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQJ8BAEBCABmBQJRNmMbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun889xQQAKOOSwJE+5NbUrnsg6hWOq7J
+zMcHm3flSxdfXghyg591ZD4BMV6P0NH1W5120ZH92Q92fV/nv7cs+wo767CPXAe3
+8nTyI+/2VUsr65zqImAytEfj7A7oeqtcJzF2H8w9FfNvYj1Bwe3KqrNnMSZW+FOX
+NZN8Op0DOuz3Za5sHjjhekxErDZJLzXsjwNtRSrZoHTg0gURPAMevZ7bBgdoFHC9
+MgJpW1j6nI+T36AXQkKPcrdu6VDRJQt6Q4XppQb7CcKtWIeFDZTo3k5nngl8RCX6
+bQT1DlDlXgG+98uPgdcc2O2gdQIfb61XvOkcOMggbvmPZc2rO+c5OhfykUYA/uOw
+KkuMIoJGZ1FlEdF1M70vxg+L+ErbP2+B++BRH1BkCHlPqSqc53AXWaTffXQI6pt7
+PGggY/iJrIMX1C+YEvw7tc/15pRha73dfg814vVA7grbAGTzG0L3p9RVWjV+5sD5
+08gg2czG9aomxItInRJFUu3VT+WD74Wyb1M8BUpRAn7rDxyI96RoCfWRrW/HGu84
+Nka7BCu8BMerSR0x0NH5zrRA8MlY1HJsZuf66sNAXtOFhpF++rhbzPKGqitR0qIR
+I21aWTKvapdixYpUqOvDe7LnSwmbyfGRX1tn5d9YKjXzkAkjGJXpB1DIRlR3d6ht
+d2j1Z5gJ66MM3xCne/lw
+=J1XL
+-----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.2.1.ebuild b/app-admin/collectd/collectd-5.2.1.ebuild
new file mode 100644
index 000000000000..254fd0aff5f9
--- /dev/null
+++ b/app-admin/collectd/collectd-5.2.1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.1.ebuild,v 1.1 2013/03/05 21:26:50 hwoarang Exp $
+
+EAPI="4"
+
+inherit autotools base eutils linux-info multilib perl-app systemd 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="amqp apple_sensors genericjmx ipvs lpar modbus redis
+	tape v5upgrade write_redis zfs_arc"
+
+# 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
+)
+
+# @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
+
+	sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+
+	# fix installdirs for perl, bug 444360
+	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || 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=INSTALLDIRS=vendor)"
+
+	# 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 {} +
+
+	# 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}
+	systemd_dounit "contrib/${PN}.service"
+
+	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"
+	collectd_rdeps write_mongodb "dev-db/mongodb"
+
+	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
+}