4 files changed, 423 insertions, 2 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index e47316580527..2f2df34db8ab 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.45 2012/11/19 19:30:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.46 2012/12/03 20:49:27 hwoarang Exp $
+
+*collectd-5.1.1-r1 (03 Dec 2012)
+
+  03 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +collectd-5.1.1-r1.ebuild,
+  +files/collectd-5.1.1-perl-prefix.patch:
+  Revbump to fix installation path for perl module. Bug #444360 thanks to Johan
+  Bergström <bugs@bergstroem.nu>
 
 *collectd-5.1.1 (19 Nov 2012)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index d41a59d9e47d..c103acfd6513 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
@@ -10,6 +13,7 @@ AUX collectd-5.1.0-libperl.patch 935 SHA256 1e4aaa19809f0f3b02e6056d0d7538607239
 AUX collectd-5.1.0-mongoc06.patch 824 SHA256 12eef9d80b314ca53f26db66261992f5e201f8a90bd0da8ca79fec1b6e570dc0 SHA512 9e299fd5216e96e9f0f25e1f1e33ea823f63077b3694b0f04361b8da437a71fe24d6710f6bcd5574834469c0fa19d4fe4cbafc6a10d99a0622df1d4bd85931e6 WHIRLPOOL 28ba4f08fad3ea2c39310553a5050d299f728650557bdad9e981513dc0b4d46560c5503f893b4b0f6514a65f88b2493956ef3d4d5cbe4dd8891149bed55fbd11
 AUX collectd-5.1.0-netlink.patch 714 SHA256 06eaaaa452da20d6d441a0a98108fa81b2ab17ce5b7842e6ea546e777374f47b SHA512 8c2a51f8176f62c9bc5a4230b4dd2c05b3b616d5b8799e9cd3704580ea2b994d765ad1c52d5a7c0a986bbf3ae53465009ec77fd5affbfbc6ca511d7f6eaaa5c6 WHIRLPOOL 411f3694af6e9db6688638afa8095125305d56e9f8e3bf0e82429b266b2353fb4c88003bbc1784cf0bfaa525d01d539b39586ccaa3334fde4da71a113172f81b
 AUX collectd-5.1.1-lt.patch 827 SHA256 c5af9d57d03f66a9651779c041847304e58464f3b680af8973411d126fae00ac SHA512 33dcddf3e1c094ce35c827d3f61cb6cdd8b6da49488a34055797b830e00d8abeff3aeaf0911dd1e100bb4d98479bef71c4f97cb94cafdd987721d1a921d1d17e WHIRLPOOL 327dbd1ccc1993fc21fdd651d021ac7cc794220b91e0f7811a3134b4a18d91dbf42f172dcec82b24bb8948e8095af3bd1fd7d4e128c9776f933af4ba15a1667d
+AUX collectd-5.1.1-perl-prefix.patch 1243 SHA256 54ca399fbfaaebbd1f19c0fcb1c4ce60630a8e98f8fa6148b47b099e0b217846 SHA512 32bc45a6c0cc7241ace2110d0db49c6651287df3ac210664ea69a50143ab4b3baf10635b8ba746e081e7a01a0690320d1efd05d72b65e450b82e5e475788bee3 WHIRLPOOL 278b183e7a8b48bd3a16d1f9f2f5dc14db484b86afd60a8b0315985f32f87ff6e5e745f677ded27e9cc566c1eff58ebff2116783ff7c7979009bd44218587864
 AUX collectd.confd 865 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592 SHA512 4df752ec2af61dfbf7856c8ec09d299ab0db6ae6e1e223a6c65a4261f13cadd2d9d66f20ee307906dd1ed4ef184244aa323e80a0aba7c655970b1bf5a06992b3 WHIRLPOOL 0935d68ab660ed7ec63b9dd4a9287e88716a6665e5ac04b0b8e7dda468f29577e5014f69a6b42cafef5b19ae4fdf249625586dc579fcabd7ddcc5d65087c3bb9
 AUX collectd.initd 1649 SHA256 9db6809d7e7991208d35bc517c71d12a5fa8b8453f096a433e386259c7301163 SHA512 4a46e55c63933a762401c537a49a108c93ae6dc2b4e8576869f1b5b693fa822d68456d83fa72548a30e8775cd5d01c7ed3a1567336091d9622db3eec66fdcd1c WHIRLPOOL dcedcc3ec33fcc350232ee26f8d9a04b64808b450dd66e348b80501fb8b96f466a264782cf8e748d8653227ef8b307c8ebdcea9d816adadfcfaadb2c742269bb
 AUX logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
@@ -17,6 +21,24 @@ DIST collectd-5.1.0.tar.bz2 1305538 SHA256 521d4be7df5bc1124b7b9ea88227e95839a5f
 DIST collectd-5.1.1.tar.bz2 1331678 SHA256 0eeb8e45c83ba13fa00bd4f6875528e8a13769ba218205785d40b861489bf1fd SHA512 5d5f30ddb9ded3b48b64efdc1a4dbbbfe1601c16fc2450a7d1a1786493b12e01da66f23eca4d59853326b3c598b2fa9475f036e78e0d9e50b3f5ddd3a37c3c9b WHIRLPOOL 6a7256f1dc526bd0b6cb4c4845d511257c2c61c0de9c17ecff6751ad89698eb4127fe1cba4919920772bacd2a3c6966201ea162e61caf8e9f4e5baeaa0fb20e2
 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 9221 SHA256 012a2c39c53e0d5c48fc708300558755eb7a38af0c74a3789169daa5cfcacaf5 SHA512 de879fcfa7f03cd0a2bd55127fc0ae75a45963a9ad6a188a15581bcebce45318a861989790c58e2ff8eff34547f6e43631c22e04afd59a9d90793d61981c4f67 WHIRLPOOL 0cbeb6113234940846639083e3c874b6b711fa96a108234d9190072d781ccafd18f996cd32ab9c633e35e6a1d97bb2e47602a84e796c8561c1f272b2940ad206
+MISC ChangeLog 9493 SHA256 755602ab614640494f7bc520b7ee2fe4b483f82a15d0de99ecebf44fecf29cc2 SHA512 dcb8c4f579c6014043926ad7a22e4ad1e3b444d9009ad63d462615c3f4269a5344e2c919c1949280a0f99c6e7d801497d7c9bbd7dd19be363c2ada492018be1f WHIRLPOOL 83d66e30bcc250e4b5712f45d389d9baca2aa0efcb4e682e18c50e41f5794b9a0bb349f97238cd8845aca57c4299d1e47f20f476a27a85477919bd3c55337fce
 MISC metadata.xml 12479 SHA256 b9185660fbb34e888e50be1e9eb27270e6d3743a147c289d991f0d89bf62141e SHA512 7d3fe03386c4c3c53ed0236206d65a5cd9aa3b15d7254fd98b0d44bc6c70d487d1491845181dbc9fa795635d83d9194e5a618bb37ff822a3a3bb2169f5672812 WHIRLPOOL 73db0a994adf29c0eb1615891f988d4f1a4d676e51861ea87e4b69dee1348db66b816f610dfdc32337355320cb1c87e8920d31c23782ee4a326d2c641a192473
+-----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
+-----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.1.1-r1.ebuild b/app-admin/collectd/collectd-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..c3c45b1bc54c
--- /dev/null
+++ b/app-admin/collectd/collectd-5.1.1-r1.ebuild
@@ -0,0 +1,354 @@
+# 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.1-r1.ebuild,v 1.1 2012/12/03 20:49:27 hwoarang Exp $
+
+EAPI="4"
+
+inherit eutils base linux-info perl-app autotools multilib user
+
+DESCRIPTION="A small daemon which collects system performance statistics - with a near-infinite number of plugins"
+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 threshold write_redis v5upgrade"
+
+# 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_json curl_xml dbi df disk dns email entropy ethstat exec filecount fscache gmond
+	hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon md memcachec
+	memcached memory multimeter mysql netlink network nfs nginx ntpd numa nut olsrd
+	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
+	match_value target_notification target_replace target_scale target_set uuid"
+
+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
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	fi
+
+	# 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/files/collectd-5.1.1-perl-prefix.patch b/app-admin/collectd/files/collectd-5.1.1-perl-prefix.patch
new file mode 100644
index 000000000000..890781f62ef7
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.1.1-perl-prefix.patch
@@ -0,0 +1,38 @@
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index 3876cc2..6d1411d 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -48,7 +48,7 @@ perl: buildperl/Makefile
+
+ buildperl/Makefile: .perl-directory-stamp buildperl/Makefile.PL \
+ 	$(top_builddir)/config.status
+-	cd buildperl && @PERL@ Makefile.PL INSTALL_BASE=$(prefix) @PERL_BINDINGS_OPTIONS@
++	cd buildperl && @PERL@ Makefile.PL @PERL_BINDINGS_OPTIONS@
+
+ buildperl/Makefile.PL: .perl-directory-stamp $(top_builddir)/config.status
+
+diff --git a/configure.in b/configure.in
+index 98395ed..5345a1d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5062,6 +5062,7 @@ then
+ fi
+
+ dnl Perl bindings
++PERL_BINDINGS_OPTIONS="PREFIX=${prefix}"
+ AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@], [Options passed to "perl Makefile.PL".])],
+ [
+ 	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+@@ -5069,12 +5070,10 @@ AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@
+ 		PERL_BINDINGS_OPTIONS="$withval"
+ 		with_perl_bindings="yes"
+ 	else
+-		PERL_BINDINGS_OPTIONS=""
+ 		with_perl_bindings="$withval"
+ 	fi
+ ],
+ [
+-	PERL_BINDINGS_OPTIONS=""
+ 	if test -n "$perl_interpreter"
+ 	then
+ 		with_perl_bindings="yes"
+\ No newline at end of file