Version bump

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

3 files changed, 347 insertions, 15 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index fbd1978b86d6..042fce99bb74 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.17 2011/03/30 20:30:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.18 2011/04/24 15:15:23 dilfridge Exp $
+
+*collectd-5.0.0 (24 Apr 2011)
+
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +collectd-5.0.0.ebuild:
+  Version bump
 
   30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.3.ebuild, metadata.xml:
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 00dcb316b94a..8d69ceef3d8a 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -12,24 +12,26 @@ AUX collectd.initd 1475 RMD160 27a19af6419a7bd450e7877bd8b95075e6653c70 SHA1 b83
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be
 DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
+DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.3.ebuild 11380 RMD160 9544cf59e2aa4153208043e8bed3565d767736bb SHA1 89a3175d7b6408cc4ae6e03aaa677d60d68a0f65 SHA256 0b516e1d2ca39b2f74a2094e1505c4898c4e2bd3b79ed474ef07f83e7dfdd02f
-MISC ChangeLog 3944 RMD160 4d067398b7bc7675aad10990b6ed23d11c7c8a6b SHA1 8c7811988788de9fc5d6965fdc8bf84976258fa5 SHA256 383f6d37eb3a3d60c2ad27ee50a06b870fd51c565927591f1f4da838dc700676
+EBUILD collectd-5.0.0.ebuild 11674 RMD160 aceb515fc67d5c6ce8f71ed6a7fd161a0ca05884 SHA1 ad34a09d145bd9f87ec993b45ec607f618588fe2 SHA256 144042290827176d9aa963d291e9150614cf19c073b8dc6bc41d6f7cfa5ac47d
+MISC ChangeLog 4074 RMD160 32d14a6916acee4c457cb8b2606b0273a379cda3 SHA1 71ec2104bb9246778a27aa0cd9b5f3fca75e1b73 SHA256 9edb05a9bd2093c745590342088b246719945449842ce06676ee8cf17ff5727b
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNk5LzAAoJENwGBM22xffe0AYP/0hLvDl5u2nPHaCPGoW2No1R
-ep22wuKwkY5973omBtAP3tZPufFfNne7OXTOZbz39BoQizN8ij4DHMIV2TGSy4Pg
-cVOZyfNW8LQVfJ7TE+qGeMq19QRKhTduduzPLHaZCua6dmcXdre1YzhG5Zoen7Gj
-VWfsubj0ZRTUCBPpuyge4xyg9FDxSRqyx7HCq8J1ZzYNudKtlZNeSQGC4/6E4d1Z
-rFOOZV56Kf8fobNENkLyRHacd5iDvxShczoOIC9Xs8XDy4pAjETW6mEl+WsN1bKQ
-9JVbUSZY4Z3vw0br0o8XHY+68v/ncFmji1RTSgmd28Hw1mpF9UsS5WjkjLEh3OTd
-0XPUhDQbjJ6C10444MHkIPT9QAW8v+2MZ/Z4nx+lL9FPWiqihga/wpeaK4xKUOgb
-M8rXn5/jGVJZP5oo8Kg3sXm4Q3sXlDbLxxzXuHPz45b5azLEt43Tw1Kj3beieC2u
-h/HSPzQ7nf8uMb5jG+sUlUUFvbJ6VljZm9rXFHt2Z5z7RtKojfN4lixiDFyT2c7O
-PBwvabnmfmke4nAh17f6PHkXLFE6rzU5RbH8su0pLo8chuRC69DH9eot5LiOdZlj
-kSQTvba+sqMlcBMPOaOb5J9byYWVaOSg8NvrC413nNQg5C4GIN4pZ/KiKKncNbIq
-LkyI2QNtjNJvea95uSgN
-=v8cA
+iQIcBAEBCgAGBQJNtD8rAAoJENwGBM22xffeo7oP/jeU+Jra0zc9LyByfoFt1AsZ
+7hvqN6mBQ5SeobVnqxftg8OAk+iMbmyHQwte9xOWtAVHW/NasZpXWTt8ms/FexqX
+R+gA3PI9o3dmgRh54g2vw4Gz3lcherCUlV+ru0kd55d+GUb13oaXXxyC12s5NktL
+/P7C8/6ykc8WuRKv5l6IGztwSY/z51wLuiu/QetDUsYcEORu+UTb7RXT35B586wy
+mE7V5EgRwC6DJvB/IwDZUxxcw89mSRKrcB+pYc3sudW8tJqbN3IditwbF1fAADSt
+yZHcqGNtDbhJTiEEv01sT/oQOyzjst92JSVy3Fbg2Djat8zRfROzF5W8f+ilJqzH
+iKmK3p0o9T7RmN3Dy38Cgife6cZ9CKRADQByILdF+LVu90f4lWjUxxF1Cb9Y1cLp
+aAJBTdwYo6lPJAH4rXvLLka17xZ62jm1QA9JG85qXu4kshy/EJ4EDPWj+jYG7nA1
+PtSF7Sp8HYEnb5Uwlxj4oApcewnPDsVXVTbOqsUJm55IlNG/2lGbYDB9pDd95u/S
+ETD2/PQERJ+RG3w6sEQ7olnKzP2OQYOnwPNSDmEPc17Z7a9KQ4nTckFbuEnHUyJr
+h1Gs4aE7peZx9Q2CbhD5k3V6hsB7l1ueiZkMznH6TjASEt4c6voIGTDnw/jzfOdq
+x3j6NHMHhPxPjbw/Vehy
+=0mjE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collectd/collectd-5.0.0.ebuild
new file mode 100644
index 000000000000..ea869a363e35
--- /dev/null
+++ b/app-admin/collectd/collectd-5.0.0.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0.ebuild,v 1.1 2011/04/24 15:15:23 dilfridge Exp $
+
+EAPI=4
+
+inherit eutils base linux-info perl-app autotools
+
+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"
+
+# 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 routeros tape zfs_arc modbus amqp genericjmx lpar redis threshold varnish 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 exec filecount fscache gmond
+	hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec
+	memcached memory multimeter mysql netlink network nfs nginx ntpd 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 vmem vserver wireless csv exec logfile network
+	notify_desktop notify_email oracle perl python rrdcached rrdtool syslog unixsock write_http
+	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="
+	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.9.1-r2 )
+	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-2.6.34 )
+	collectd_plugins_network?		( dev-libs/libgcrypt )
+	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_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_write_http?		( net-misc/curl )
+
+	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}
+	dev-util/pkgconfig
+	kernel_linux?	(
+		collectd_plugins_vserver?	( sys-kernel/vserver-sources )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_syslog?		( virtual/logger )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
+	"${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.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
+}
+
+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
+
+	# the tarball of 4.10.3 and 5.0.0 was generated with a different set of autotools, leading to odd problems
+	_elibtoolize --ltdl
+
+	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 interface iptables ipvs irq load
+		memory netlink nfs 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
+		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
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl --disable-static --localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	fixlocalpod
+
+	find "${D}/usr/" -name "*.la" -exec rm -f {} +
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /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:^.*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"
+
+	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
+	ewarn
+	ewarn "Version 5 of collectd uses a database format different from version 4. You will"
+	ewarn "have to migrate your database after the upgrade, following the guide at"
+	ewarn "   http://www.collectd.org/wiki/index.php/V4_to_v5_migration_guide"
+	ewarn
+}