Version bump, thanks to octo and bonbons on #collectd for the help!

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

3 files changed, 348 insertions, 2 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 5525b59b0073..7e05956a7b3f 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.15 2011/02/07 21:21:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.16 2011/03/30 20:09:29 dilfridge Exp $
+
+*collectd-4.10.3 (30 Mar 2011)
+
+  30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +collectd-4.10.3.ebuild:
+  Version bump, thanks to octo and bonbons on #collectd for the help!
 
 *collectd-4.10.2-r3 (07 Feb 2011)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 14d62a5e4d68..472592faafe2 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d
@@ -8,6 +11,25 @@ AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f5
 AUX collectd.initd 1475 RMD160 27a19af6419a7bd450e7877bd8b95075e6653c70 SHA1 b8315ce1db2f755d4bc77047d66d0dad12e45668 SHA256 b09dea6513ed0d9932c84f46755c89afc4d04777a96230ead019f68d0b74a583
 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
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
-MISC ChangeLog 3625 RMD160 84a96f865462590391418fe6075c541399adfde1 SHA1 67c11f445674d6b9994fcb2698b55b7533f8b161 SHA256 27a4a3ebaa101b5a583ec65d45debf502cbcd9ef4e28b7139ac5658c3bfc7d8d
+EBUILD collectd-4.10.3.ebuild 11337 RMD160 43e67cf67f644445d346cf7e43df3d864054ba25 SHA1 7b21729ecbeafb1232377aca530a7e14e4622dc0 SHA256 ec2602b8b0aa04b160f04b8e13ddb5d87c789f30372c3a5753948cff26fa340a
+MISC ChangeLog 3812 RMD160 75cadd6a6b27e1222dedac2e56e440fb69474158 SHA1 f3698a50769d1919fbf80d3db4a244aff4ebaf05 SHA256 7f917c8961bf371b73d196fadbdfb45ba7f231f41e8ed5fd82311c2a6c528e28
 MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNk43/AAoJENwGBM22xffevWEP/jpMtopp5V+NeL2/9XgE5N3/
+VP3j+BlqMbqKYj6xqDMC/zYsDDmzx3m6JgaBTnfESEO6pO5CpkohhLHByudhH+rm
+yE4+yHaD2+fEpWxFCteQxx1i8yFkXBFKQsKL7YlbZHttQsYVDFhZ6fsM5SWCSZ0d
+pJ9HZafuMkL4H01Sx/PUp6zLvWmKBXYx5WA7vuiPxkC57aE4PRt4B5hwWb0EQvmU
+acjWk7kpqetyypqAa/F1xvHUJyAPmG3wD+ymsGqodcejH98aHgBPSIs7zw/cVPNm
+/TBZv9/GLebYT0JdnkBxRl4PqRney5RB6fV2HNfJidUFzSW7c45Eq6jQgPkA89+q
+3ca+Zt+0rUiQ7RqdfCGTNa1ap7Ti/NzQE1WkxRxgEpggGfeNjG9sS9F+dmXowzel
+3TA2BC4MXYe/JCiOijTyEpRsF957o9RICVPG8atIlyG/Ji2XrWtlc+BFvOcYZCAw
+7Z1fsm2JRtrGnQt9GB7PurdVxz9k1WYMHF4PNc27cgbtCXTnZTg9t+BZ+OXW19+G
+SbNbMVTf5qN8Vkpuv98UsUbSkKDFWf1qKXzuSAYB+AS5Eb7+V8KTgpIW6we8ZThS
+Z2CGoqR/gkmuxvD/H8N+h5VmRgJwqygMpwEAa+ZEi0nlek8ryyJ3olA8jUme182W
+p/TeDKmSm1x/TIivMKrk
+=haGQ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild
new file mode 100644
index 000000000000..55985ab1b1c7
--- /dev/null
+++ b/app-admin/collectd/collectd-4.10.3.ebuild
@@ -0,0 +1,318 @@
+# 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-4.10.3.ebuild,v 1.1 2011/03/30 20:09:28 dilfridge Exp $
+
+EAPI=3
+
+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 nut modbus"
+
+# 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 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_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 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 || die
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib || die
+	fi
+
+	keepdir /var/lib/${PN} || die
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" collectd || 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"
+
+	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
+}