[gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-03-29 22:40 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-03-29 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     6acde778c7ae79968d75618a6429c1dbbc783c6f
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Mar 29 22:39:58 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 22:39:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=6acde778

[app-admin/collectd] Version bump, fails in eautoreconf

(Portage version: 2.1.9.44/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog              |    6 +
 app-admin/collectd/Manifest               |   30 ++--
 app-admin/collectd/collectd-4.10.3.ebuild |  315 +++++++++++++++++++++++++++++
 3 files changed, 337 insertions(+), 14 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 92300f1..096379f 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*collectd-4.10.3 (29 Mar 2011)
+
+  29 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +collectd-4.10.3.ebuild:
+  Version bump, fails in eautoreconf
+
 *collectd-4.10.2-r3 (29 Mar 2011)
 
   29 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 604795f..da871ce 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -11,27 +11,29 @@ AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f5
 AUX collectd.initd 1475 RMD160 13141c68cd0d22ca5ea84ca70187b835c1831783 SHA1 fca53c6ad12139176033c992fc361a4cf3879245 SHA256 3a322c53b199661eafdf11af192cffd9a1ed54d618a0fd29bcbab9e214b1071d
 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-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4e2f648852389d3 SHA1 c68a33cf1c5382bdfdf6910405683e2993e6af65 SHA256 fff8f6c361a5e731dacfa65aa6679c8ea25b35956a5e8d68a686b9c13b11f82e
 EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357
-MISC ChangeLog 5513 RMD160 30025630f16b089f90e04479204c2620c425801d SHA1 cf8d6d65d944bb23268df27a0157e3024057a623 SHA256 5950778c0a30ea45a7cf53ccc10b202f000dc25acf96d15d9061f5c283ee77ed
+EBUILD collectd-4.10.3.ebuild 11222 RMD160 f2b2c0673f49f168041c669153a77e16dfa32eb1 SHA1 fc327e90867c18b6c21214c41e28c6efd38d4353 SHA256 ef9002362eafb3393061add74792ccf181574b8b8338e98726f313f3a138a4f5
+MISC ChangeLog 5667 RMD160 77c418da2c808e09a59b1b20550091a6dec4624d SHA1 76873287cdd2ac351374eb4113746710891cfeea SHA256 56122a0426a09337c62fb17e61a413ac81fdc1a9503184ca16be19aca9b4df80
 MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNklrBAAoJENwGBM22xffejPsP/iHLy1wVewtyftX0eTO2yuUw
-Gn0VL4qzyM7Rp6nj8Dq0ECXjqBIL/tGzKsTegZZqPIhf39xESiR7jRI6mxRODEjH
-F1hlSXbbchOKEtzJAHJtUKo92s3FG397p6Br9J1wX6mF8yxE68tADMPWkswZkUCS
-cl5tu/zCdci2LTEDa8JxJodzlUXcVbndfD1Hg3oK2WtupvyjCaEhqX8/RuA9/h21
-NPrT7VY1MpFqb23YYwb4EPnBUbXImjcJPi2Sg3KAMmrugpmOz1umh7uSz0RaYrAw
-BocIaqx1bwV27akQsoRQPrwF7EXqAHCJvZ90dHU3No0WhXalbocQYIEY1OhVgzSt
-KQUPB0HnKVSrlzw1pGab1og0Bojg6XXDtPPz9snc0/LrzOw7CDVLF+ZNPUoYVyat
-+CuE3ilyng+OK7JQv3R5ND1DtP6AhrccLpgtjNbgZ7Km336zmHv8b6T7uFq7IS+f
-o8rPKHOoepxLyI2OAHBrJWBI+bQT8+qrMCtz4uqIMJfUZ3uhnmCGr0KmbnK1ggOO
-ouIt3hDy9p3do96PXTXjKBV3HAD1BWk3J6RYhkEDPxrk7u5hldsFVU97LtsRheHF
-sDPuwkA9z42ahBwUOASDaoUGHnMETmh66GKTQlvvoSLcP2lG3D2G69XS7j0RTsoZ
-UsF86E6jwykTqCsclTmX
-=mpbB
+iQIcBAEBCgAGBQJNkl++AAoJENwGBM22xffeN6sQAJbjO8uS1n3FXgRvTm1Nl+J6
+pWqZBdgJqG1LP/k2s/fb43QYSjpqxZeTnO3BQq0Pv7fyxyBOtVPdnhRS9wU9UQ+V
+3KUGiQT2pgn1VJhER7zlX8epe20JvD7bZo+d9CzOxguWhdIecSBFg6DR3HSpGaiR
+nntt8Crirzfm+0k2XtX4UAWbfp19tTJ6TijrN6EAZmWq/Tfkr0+OvruQWQcVhnCi
+wIwyDEU3+mmDkinq9pabXYa/WTtaJiXGSdM6zjsU+A3ldYwNWH5+WQCuw785v2ir
+q0G8/bVZ/gVl+vmVMQlCYswQiS178k068S+8/oXBcoPYfMKG+QBOzSkaKZdqf7IW
+lpW+r4LagcsjCm50Q4e1VnVplal366hh47Lhs+MMWaQ1HMOTOGgVlmoFYd0m7Ach
+g+uYgkf4SW90Z6RTRDVPPxMAHWHh/Vk3x6TCiorxZfnaMTdPKadJHLDiiONfjYJ5
+UjiwN67YvqIYH4BYKQMaCDi5+cawj8iEZpOD3OSSIu3OWTT/3E9O5Xw6uPxz2WGc
+4VWTEMYx2qu7ihRYGVSwi7B56+twmDipbTxkms1PNfqKtiY0KNp620lk4akY9WTQ
+FaYRLy/l1W9JHY08SeYkveOHQtEF4lUcnje0qfuWMl2CpY2twf/gamK1+JtAey/H
+XZfUZ28n3YGpQf9TtKT/
+=Ixtj
 -----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 0000000..c8be9db
--- /dev/null
+++ b/app-admin/collectd/collectd-4.10.3.ebuild
@@ -0,0 +1,315 @@
+# 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $
+
+EAPI="2"
+
+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
+
+	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
+}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-03-30 20:06 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-03-30 20:06 UTC (permalink / raw
  To: gentoo-commits

commit:     4d71b286a48f32011b1ee69d90bd5707271f1290
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Mar 30 20:06:23 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 20:06:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=4d71b286

[app-admin/collectd] Works now, thanks to octo and bonbons on #collectd for the help!

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog              |    4 +++
 app-admin/collectd/Manifest               |   30 ++++++++++++++--------------
 app-admin/collectd/collectd-4.10.3.ebuild |    5 +++-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 096379f..8544f0f 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.3.ebuild:
+  Works now, thanks to octo and bonbons on #collectd for the help!
+
 *collectd-4.10.3 (29 Mar 2011)
 
   29 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index da871ce..b2ef1c6 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -16,24 +16,24 @@ EBUILD collectd-4.10.2-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4e2f64885
 EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357
-EBUILD collectd-4.10.3.ebuild 11222 RMD160 f2b2c0673f49f168041c669153a77e16dfa32eb1 SHA1 fc327e90867c18b6c21214c41e28c6efd38d4353 SHA256 ef9002362eafb3393061add74792ccf181574b8b8338e98726f313f3a138a4f5
-MISC ChangeLog 5667 RMD160 77c418da2c808e09a59b1b20550091a6dec4624d SHA1 76873287cdd2ac351374eb4113746710891cfeea SHA256 56122a0426a09337c62fb17e61a413ac81fdc1a9503184ca16be19aca9b4df80
+EBUILD collectd-4.10.3.ebuild 11340 RMD160 fec4ebcdfb521099d0f6ec6b5d745bd2ed1498e7 SHA1 548493661b434667a19de6a0fbe1103681238ca1 SHA256 7d9800456083a8e383057b32ec8b84a081a53956d9328e348635fc0f7e09de5c
+MISC ChangeLog 5818 RMD160 cbf37eb1b802a6f6da79e023aa5d3ee3b276a8f3 SHA1 0bd7d92b39831c31e2b701db2d351b65775e0eeb SHA256 54b8bbbc4fbf1d3bddeb402f88610172a7e4ca3dcf2aed7fbe6c93fa30661285
 MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNkl++AAoJENwGBM22xffeN6sQAJbjO8uS1n3FXgRvTm1Nl+J6
-pWqZBdgJqG1LP/k2s/fb43QYSjpqxZeTnO3BQq0Pv7fyxyBOtVPdnhRS9wU9UQ+V
-3KUGiQT2pgn1VJhER7zlX8epe20JvD7bZo+d9CzOxguWhdIecSBFg6DR3HSpGaiR
-nntt8Crirzfm+0k2XtX4UAWbfp19tTJ6TijrN6EAZmWq/Tfkr0+OvruQWQcVhnCi
-wIwyDEU3+mmDkinq9pabXYa/WTtaJiXGSdM6zjsU+A3ldYwNWH5+WQCuw785v2ir
-q0G8/bVZ/gVl+vmVMQlCYswQiS178k068S+8/oXBcoPYfMKG+QBOzSkaKZdqf7IW
-lpW+r4LagcsjCm50Q4e1VnVplal366hh47Lhs+MMWaQ1HMOTOGgVlmoFYd0m7Ach
-g+uYgkf4SW90Z6RTRDVPPxMAHWHh/Vk3x6TCiorxZfnaMTdPKadJHLDiiONfjYJ5
-UjiwN67YvqIYH4BYKQMaCDi5+cawj8iEZpOD3OSSIu3OWTT/3E9O5Xw6uPxz2WGc
-4VWTEMYx2qu7ihRYGVSwi7B56+twmDipbTxkms1PNfqKtiY0KNp620lk4akY9WTQ
-FaYRLy/l1W9JHY08SeYkveOHQtEF4lUcnje0qfuWMl2CpY2twf/gamK1+JtAey/H
-XZfUZ28n3YGpQf9TtKT/
-=Ixtj
+iQIcBAEBCgAGBQJNk40/AAoJENwGBM22xffe2msQAJ6vgfTdNuFUdibjY3dx4DUo
+pKC1iYvyjvQwOw02nc2VBQHrsiIwsFQJgWfN2NK/AOPRCRqayAY8etfsYsc/ESy1
+ccUv3Bqb1785sTFf6RczxaBnpVvKNp1twOEp2BOY/uoLwRKLbZfuU5+shJM4jD/B
+csEXylQvq1/suFqgx+kfuVB4KzaGREKwZYdKd9dHVcJJxpvJDMwbyEPT5+cKyGgV
+kgyB9tjwWvRbhu1B4J5Qb4l1hWrXVc8MY2l/J5vurbRAD3vrT1h2jkV1cBKAwbN1
+csjYYw99YA5qpGTtF6ZHe+z/FQz6bVW/117rm+rHuyIYfl7uNurbSKbELGJX/+Sv
+E9qtXz8rztVgUnu+qWFNc+VUOogbzy9xINZi0GOuEcL9U34K6WAoIe4ECcHL/CEU
+uwplNYDS0g/n1RPn65Sup5lYph95KM+jG7LUMwkvSKk5uJXtzFcjLZ9Q9XkkwvME
+GSsGazdEGBNL3DTnEKvwUbfQjv9G42eAdFTsBLOPOFyLAgetvzBoEjWxuTgGKsHf
+jY5MLeACxix9GQQct1L3osm/O8K43DLtMkwyn9AcI9EiePELFOydI2h82elugL8g
+iOVa+ArF6I+f57Rsc5kCxWMJfpuQFbrJp8AiofHd6HPOwA44ThCTbmVe08CT8TLS
+hqtiW4bAPIypPaoGFBxZ
+=mCVN
 -----END PGP SIGNATURE-----

diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild
index c8be9db..1503f40 100644
--- a/app-admin/collectd/collectd-4.10.3.ebuild
+++ b/app-admin/collectd/collectd-4.10.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $
 
-EAPI="2"
+EAPI=3
 
 inherit eutils base linux-info perl-app autotools
 
@@ -192,6 +192,9 @@ src_prepare() {
 	# 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
 }
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-03-30 20:45 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-03-30 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1ddc0ca8fd3e557a2a7b64f960839700d209b43a
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Mar 30 20:28:49 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 20:28:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1ddc0ca8

[app-admin/collectd] Added support for sys-power/nut

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog              |    4 +++
 app-admin/collectd/Manifest               |   32 ++++++++++++++--------------
 app-admin/collectd/collectd-4.10.3.ebuild |    5 ++-
 app-admin/collectd/metadata.xml           |    1 +
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 8544f0f..a3b0a9f 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.3.ebuild, metadata.xml:
+  Added support for sys-power/nut
+
+  30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.3.ebuild:
   Works now, thanks to octo and bonbons on #collectd for the help!
 

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index b2ef1c6..2349048 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -16,24 +16,24 @@ EBUILD collectd-4.10.2-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4e2f64885
 EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357
-EBUILD collectd-4.10.3.ebuild 11340 RMD160 fec4ebcdfb521099d0f6ec6b5d745bd2ed1498e7 SHA1 548493661b434667a19de6a0fbe1103681238ca1 SHA256 7d9800456083a8e383057b32ec8b84a081a53956d9328e348635fc0f7e09de5c
-MISC ChangeLog 5818 RMD160 cbf37eb1b802a6f6da79e023aa5d3ee3b276a8f3 SHA1 0bd7d92b39831c31e2b701db2d351b65775e0eeb SHA256 54b8bbbc4fbf1d3bddeb402f88610172a7e4ca3dcf2aed7fbe6c93fa30661285
-MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88
+EBUILD collectd-4.10.3.ebuild 11383 RMD160 d1ca4225cd5ebe4d4726eff46dac18b0d3f02535 SHA1 8caf55275c051ef6cb095ae1608ffca6d4cf2c98 SHA256 2eabc4f40e56e746f81ff1050a15f2f6a01475a30374969c438c27e36b7ce898
+MISC ChangeLog 5950 RMD160 3ea07fbce63980876ee7a8a68997784bd0138333 SHA1 73da294e1887c2826476eafbb8587d8b32265923 SHA256 883129fc7a98c684492fd8629273c8ec44187d631afaf094841d0744d3b1dad9
+MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNk40/AAoJENwGBM22xffe2msQAJ6vgfTdNuFUdibjY3dx4DUo
-pKC1iYvyjvQwOw02nc2VBQHrsiIwsFQJgWfN2NK/AOPRCRqayAY8etfsYsc/ESy1
-ccUv3Bqb1785sTFf6RczxaBnpVvKNp1twOEp2BOY/uoLwRKLbZfuU5+shJM4jD/B
-csEXylQvq1/suFqgx+kfuVB4KzaGREKwZYdKd9dHVcJJxpvJDMwbyEPT5+cKyGgV
-kgyB9tjwWvRbhu1B4J5Qb4l1hWrXVc8MY2l/J5vurbRAD3vrT1h2jkV1cBKAwbN1
-csjYYw99YA5qpGTtF6ZHe+z/FQz6bVW/117rm+rHuyIYfl7uNurbSKbELGJX/+Sv
-E9qtXz8rztVgUnu+qWFNc+VUOogbzy9xINZi0GOuEcL9U34K6WAoIe4ECcHL/CEU
-uwplNYDS0g/n1RPn65Sup5lYph95KM+jG7LUMwkvSKk5uJXtzFcjLZ9Q9XkkwvME
-GSsGazdEGBNL3DTnEKvwUbfQjv9G42eAdFTsBLOPOFyLAgetvzBoEjWxuTgGKsHf
-jY5MLeACxix9GQQct1L3osm/O8K43DLtMkwyn9AcI9EiePELFOydI2h82elugL8g
-iOVa+ArF6I+f57Rsc5kCxWMJfpuQFbrJp8AiofHd6HPOwA44ThCTbmVe08CT8TLS
-hqtiW4bAPIypPaoGFBxZ
-=mCVN
+iQIcBAEBCgAGBQJNk5KBAAoJENwGBM22xffeZsoQAKfgGm1UP/JiQcXVAUipOo0M
+6m88aYvwBHwbDyaFOYoDzuidgypLcxSktso/LlV9sv6dWX8sATqGYykiRgoaWHGU
+4ov04Rm+F7eXo/bu30lSreGzcgbK48RGcWGnu4GIyBJtqdCquDJd9MwA6WYrmthS
+qxGaMAkj0PezdbI04ckw317l2MrLnUnKH1mVwSHwkOCq8V4xJHXBPJBQzW6qaZgf
+rR1B4ZbeAgV7Xuv9HRWdqcKoxEKCsKRdigNqng4CRjuiIUfIgHP/kBuIrfAS7NCF
+FxSc/goKuHQFB9vu3QXD0PWveY31dXQhDCTSniwjTgMYncPuNjpUJ2T92To7IFFG
+ZXYlEwMjJSdLz8GHkkn8srMFPcbXGUVOM5IjefjLR0wKszbM82R8IGVa23quDXjU
+acj1N7kfheXokHoXayc0b9iTu8nYqXsAgEC4ISFw8ykwJL4S1Chf7CWefw2dh33U
+r22fcAJfB3msRxJXpzaOEtJJufk2ugf7K4sf1E+7+RQWnLWetXhSeG9d/JBpzXC+
+24yqsXGjlruSMYljrRVhh2ivif8A5kWdXH8fXbNaAz80BXQwAEWPU0q6rstKc2Ve
+cw4bRzpJSnyFfcUYnEhPsUSfYS4a4v6USBWDR2ooJ1jH0IX6IK2kMOwUUrWNoilB
+W+yKO2vjc84KDpYCfPOU
+=17IF
 -----END PGP SIGNATURE-----

diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild
index 1503f40..4937f53 100644
--- a/app-admin/collectd/collectd-4.10.3.ebuild
+++ b/app-admin/collectd/collectd-4.10.3.ebuild
@@ -21,13 +21,13 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin"
 COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
 
 # Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc nut modbus"
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc 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
+	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
@@ -67,6 +67,7 @@ COMMON_DEPEND="
 	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 ) ) )

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 5188889..401f206 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -58,6 +58,7 @@
 		<flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
 		<flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
 		<flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> 
+		<flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> 
 		<flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
 		<flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
 		<flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> 



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-03-30 22:08 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-03-30 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6e47568d0a35cced1a6177b2ba5a8f7a9ac53183
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Mar 30 22:07:56 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 22:07:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=6e47568d

[app-admin/collectd] Version bump, for now disabling all new plugins

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog             |    6 +
 app-admin/collectd/Manifest              |   30 ++--
 app-admin/collectd/collectd-5.0.0.ebuild |  319 ++++++++++++++++++++++++++++++
 3 files changed, 341 insertions(+), 14 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index a3b0a9f..f2e083b 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*collectd-5.0.0 (30 Mar 2011)
+
+  30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +collectd-5.0.0.ebuild:
+  Version bump, for now disabling all new plugins
+
   30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   collectd-4.10.3.ebuild, metadata.xml:
   Added support for sys-power/nut

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 2349048..1e4588c 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -12,28 +12,30 @@ AUX collectd.initd 1475 RMD160 13141c68cd0d22ca5ea84ca70187b835c1831783 SHA1 fca
 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-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4e2f648852389d3 SHA1 c68a33cf1c5382bdfdf6910405683e2993e6af65 SHA256 fff8f6c361a5e731dacfa65aa6679c8ea25b35956a5e8d68a686b9c13b11f82e
 EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357
 EBUILD collectd-4.10.3.ebuild 11383 RMD160 d1ca4225cd5ebe4d4726eff46dac18b0d3f02535 SHA1 8caf55275c051ef6cb095ae1608ffca6d4cf2c98 SHA256 2eabc4f40e56e746f81ff1050a15f2f6a01475a30374969c438c27e36b7ce898
-MISC ChangeLog 5950 RMD160 3ea07fbce63980876ee7a8a68997784bd0138333 SHA1 73da294e1887c2826476eafbb8587d8b32265923 SHA256 883129fc7a98c684492fd8629273c8ec44187d631afaf094841d0744d3b1dad9
+EBUILD collectd-5.0.0.ebuild 11460 RMD160 ff6d362705fbae6a28026e22286f7790b6e3d6de SHA1 946f1b678f57afb8c766abcb378e3121f319ec6f SHA256 29f52644212a4bae4b3dd2443381129b52c083bae4d2acc630667ab50d7ae15c
+MISC ChangeLog 6115 RMD160 807824078ea2f95905f62d68dc0609589959fa1f SHA1 d4b430e7d51a686ba8431bad14b08aeabaf7febd SHA256 c2f5ca3e04b79192603fdb518903ea76fda346cf4f95d5de8b53eb761d96070d
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNk5KBAAoJENwGBM22xffeZsoQAKfgGm1UP/JiQcXVAUipOo0M
-6m88aYvwBHwbDyaFOYoDzuidgypLcxSktso/LlV9sv6dWX8sATqGYykiRgoaWHGU
-4ov04Rm+F7eXo/bu30lSreGzcgbK48RGcWGnu4GIyBJtqdCquDJd9MwA6WYrmthS
-qxGaMAkj0PezdbI04ckw317l2MrLnUnKH1mVwSHwkOCq8V4xJHXBPJBQzW6qaZgf
-rR1B4ZbeAgV7Xuv9HRWdqcKoxEKCsKRdigNqng4CRjuiIUfIgHP/kBuIrfAS7NCF
-FxSc/goKuHQFB9vu3QXD0PWveY31dXQhDCTSniwjTgMYncPuNjpUJ2T92To7IFFG
-ZXYlEwMjJSdLz8GHkkn8srMFPcbXGUVOM5IjefjLR0wKszbM82R8IGVa23quDXjU
-acj1N7kfheXokHoXayc0b9iTu8nYqXsAgEC4ISFw8ykwJL4S1Chf7CWefw2dh33U
-r22fcAJfB3msRxJXpzaOEtJJufk2ugf7K4sf1E+7+RQWnLWetXhSeG9d/JBpzXC+
-24yqsXGjlruSMYljrRVhh2ivif8A5kWdXH8fXbNaAz80BXQwAEWPU0q6rstKc2Ve
-cw4bRzpJSnyFfcUYnEhPsUSfYS4a4v6USBWDR2ooJ1jH0IX6IK2kMOwUUrWNoilB
-W+yKO2vjc84KDpYCfPOU
-=17IF
+iQIcBAEBCgAGBQJNk6m8AAoJENwGBM22xffeLjQP/2EBhpBkmKnyEX2gKbc9HnaN
+94TCVUaUlr4MwICYy2eyWJsHuEoMe4KvZ37u0ShIQFexX+kIrPaoxFWkhvDLwyxO
+muuNgq34V+0EdVLzTiJbsxUtrZkz9gLKU7YY33+cm6x0tZCU76r+nABhfZyaj/gI
+hrs8/m+qDBQVRJfZBgSSVshMF7Kviy6pljCbhl7SSme787nUzheWc2GWC8IB6Emp
+oQhEuNYywOqeFcz+0sSXtgGq9m7XdNOq1WMLdw2S9P+2taf7T/X8IfU3rYuUlOYw
+l9QkAKS6df/N3DdDfcru8NGxGpqjod0JZRCuT+RAPFczHJoDAykuNcEGzsNxRVO1
+R620+5sXBAFiEYJm+Hd7iev1JfWXOIiyHj8Av3ebSicrBzrsTero1gGzCQH6oR5q
+hmeLmmjvWShFCx8CQp+U8xjUcbbc2EuwO1T6BnFAEHnw0VIAuqIN2KMGIA99Y+JZ
+YkvVAT+FEwb1GIEK6CBC456z2YmOgcW1eY5GSo+oaHZ3HYq9jJMQvnd92NLrgtQo
+CCxMCFc+8xiDkhTQU0iykGP383hf1lX4i8pLkeheDsFBxuJ/nx4QyGXBUZyEr/l3
+ZGpAQbTRi/vXuMOct+PeT9383V3rXSiB62cOeoiJKZ9EWLx0kwcosAwX8JV/AhB/
+4yBU/CpSBGzJALZbWPBm
+=gPC5
 -----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 0000000..b25d77e
--- /dev/null
+++ b/app-admin/collectd/collectd-5.0.0.ebuild
@@ -0,0 +1,319 @@
+# 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 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 || 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
+}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-04-24 15:12 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-04-24 15:12 UTC (permalink / raw
  To: gentoo-commits

commit:     1ecd178349e88456572dfb95d649cc8b87f5dbf7
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 24 15:14:39 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:14:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1ecd1783

[app-admin/collectd] Cleanup and added ewarn

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog             |    4 ++++
 app-admin/collectd/Manifest              |   30 +++++++++++++++---------------
 app-admin/collectd/collectd-5.0.0.ebuild |   17 +++++++++++------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index f2e083b..e8a3d1e 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-5.0.0.ebuild:
+  Cleanup and added ewarn
+
 *collectd-5.0.0 (30 Mar 2011)
 
   30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 1e4588c..0b91f0f 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -18,24 +18,24 @@ EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8e
 EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814
 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357
 EBUILD collectd-4.10.3.ebuild 11383 RMD160 d1ca4225cd5ebe4d4726eff46dac18b0d3f02535 SHA1 8caf55275c051ef6cb095ae1608ffca6d4cf2c98 SHA256 2eabc4f40e56e746f81ff1050a15f2f6a01475a30374969c438c27e36b7ce898
-EBUILD collectd-5.0.0.ebuild 11460 RMD160 ff6d362705fbae6a28026e22286f7790b6e3d6de SHA1 946f1b678f57afb8c766abcb378e3121f319ec6f SHA256 29f52644212a4bae4b3dd2443381129b52c083bae4d2acc630667ab50d7ae15c
-MISC ChangeLog 6115 RMD160 807824078ea2f95905f62d68dc0609589959fa1f SHA1 d4b430e7d51a686ba8431bad14b08aeabaf7febd SHA256 c2f5ca3e04b79192603fdb518903ea76fda346cf4f95d5de8b53eb761d96070d
+EBUILD collectd-5.0.0.ebuild 11678 RMD160 e30edfce0f87b5bd7c83bf57cea6b91179424ec9 SHA1 26d6650568eb7003d484e69e8974385a8cc41f03 SHA256 5647a5ae00ef6a9a96e6e3c9df2b67aea82ed75ec50e7b49e01f1c9c793db0ec
+MISC ChangeLog 6224 RMD160 81a40dd3255fe16fffe8b7059f9a44b59fca43e1 SHA1 8f02ec90b610cc044499927e8c8e30b03eb9ecbf SHA256 16340fffa3c2293827463f9f0fddfc448cd2d501eafa70b35cf09dcb6e6694d9
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNk6m8AAoJENwGBM22xffeLjQP/2EBhpBkmKnyEX2gKbc9HnaN
-94TCVUaUlr4MwICYy2eyWJsHuEoMe4KvZ37u0ShIQFexX+kIrPaoxFWkhvDLwyxO
-muuNgq34V+0EdVLzTiJbsxUtrZkz9gLKU7YY33+cm6x0tZCU76r+nABhfZyaj/gI
-hrs8/m+qDBQVRJfZBgSSVshMF7Kviy6pljCbhl7SSme787nUzheWc2GWC8IB6Emp
-oQhEuNYywOqeFcz+0sSXtgGq9m7XdNOq1WMLdw2S9P+2taf7T/X8IfU3rYuUlOYw
-l9QkAKS6df/N3DdDfcru8NGxGpqjod0JZRCuT+RAPFczHJoDAykuNcEGzsNxRVO1
-R620+5sXBAFiEYJm+Hd7iev1JfWXOIiyHj8Av3ebSicrBzrsTero1gGzCQH6oR5q
-hmeLmmjvWShFCx8CQp+U8xjUcbbc2EuwO1T6BnFAEHnw0VIAuqIN2KMGIA99Y+JZ
-YkvVAT+FEwb1GIEK6CBC456z2YmOgcW1eY5GSo+oaHZ3HYq9jJMQvnd92NLrgtQo
-CCxMCFc+8xiDkhTQU0iykGP383hf1lX4i8pLkeheDsFBxuJ/nx4QyGXBUZyEr/l3
-ZGpAQbTRi/vXuMOct+PeT9383V3rXSiB62cOeoiJKZ9EWLx0kwcosAwX8JV/AhB/
-4yBU/CpSBGzJALZbWPBm
-=gPC5
+iQIcBAEBCgAGBQJNtD5fAAoJENwGBM22xffetc0P/RjXg/IYddQ4QNCCnMrF9Z3I
+kH01RF1JnZVXJwnrKBAWszaX0fPhEWO9vLpdzHY/7u0gk8IdKoTPm2sJQd6yhE9B
+6ufDrGVKjgM0snEG4qZKW3sjjMFx5Fob7o1y70EJK79rjW6Kv00Z0WXATB9I2WWq
+hqtFXJzr9gPJIIyhau6zZZkYyi4U3WdCHHelKOlkLE6XSv0HAfc5BIZl9tQ7T6pu
+GUlj30koFnVtge7eLq0nBr7O+cidzwNYm5KqlbnO8G5aaCGERtwpY0ccuVoxbHO/
+Wfspqgwd+G8VbrfBTtzyyuWUIZws65hnYhWCqsD1+p9yeNdXlxYU0rWseXLQuZur
+K3zoZAH6wWinDLHRbLLBCJ1oM91L+n4vLtuWhYTcUjM9wejFGfIziWcnhTdKMMZQ
+UuFDzG94slJQhVmb4vmPA0GymNFyMLcyvj7QK0XhvfZdVurv6BmhcJGnlJPj/fPB
+YsRPUSgT+WYqN1bpwv/YFxW5k5ZJkNhRam/v886E6u/ovCsKo21ujcbg7itoQLn0
++uWCn889JNk2fsO/V0nVRAUKcEobtHYCtCM1IuJb4ANkXFdTYJ94Q9s+TccO3TAH
+ZaGBNJo0G4hHOmUAC8HXPth/CmZrTD3vlbpixZflPYYVmpkMmY4WKXbu9Qkg4NGd
+rFqRJc6nwboCR6/AQbAu
+=uVtx
 -----END PGP SIGNATURE-----

diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collectd/collectd-5.0.0.ebuild
index b25d77e..5b89907 100644
--- a/app-admin/collectd/collectd-5.0.0.ebuild
+++ b/app-admin/collectd/collectd-5.0.0.ebuild
@@ -276,20 +276,20 @@ src_install() {
 
 	find "${D}/usr/" -name "*.la" -exec rm -f {} +
 
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use contrib ; then
 		insinto /usr/share/doc/${PF}
-		doins -r contrib || die
+		doins -r contrib
 	fi
 
-	keepdir /var/lib/${PN} || die
+	keepdir /var/lib/${PN}
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" collectd || die
+	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
@@ -316,4 +316,9 @@ pkg_postinst() {
 		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
 }



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-04-24 16:58 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-04-24 16:58 UTC (permalink / raw
  To: gentoo-commits

commit:     53ebd951484f2202a09ef51114035e384c5d6099
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 24 17:01:23 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 17:01:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=53ebd951

[app-admin/collectd] Properly set no shell

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/ChangeLog                 |    4 +++
 app-admin/collectd/Manifest                  |   32 +++++++++++++-------------
 app-admin/collectd/collectd-4.10.3-r1.ebuild |    2 +-
 app-admin/collectd/collectd-5.0.0-r1.ebuild  |    2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index ddf1dc3..5f357da 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.3-r1.ebuild, collectd-5.0.0-r1.ebuild:
+  Properly set no shell
+
 *collectd-5.0.0-r1 (24 Apr 2011)
 *collectd-4.10.3-r1 (24 Apr 2011)
 

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 30c3d3d..c9aaac2 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -13,27 +13,27 @@ AUX collectd.initd 1644 RMD160 b290f64b0c08bd42d367d6a2ef78bf81d75145cd SHA1 db1
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 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.3-r1.ebuild 12584 RMD160 76cf607ffaa7672df591b56d8fbf16fc98c457b9 SHA1 cfc1c96460c263e6d442a322d0b2eef8241bca8f SHA256 5445500fea65357e3174d26060f70f603935999f988a24009825dc9aff7852fe
+EBUILD collectd-4.10.3-r1.ebuild 12576 RMD160 5aa451b1f17afbb7f639e2201550b4fb8798c7a4 SHA1 e584bd3e4d1a115f177ccb694b49a8da34ee84bd SHA256 a86c06c9e6ea855e955e80d295af247e85e9f74079f651a3714173335553e5f7
 EBUILD collectd-4.10.3.ebuild 11323 RMD160 5c8d8b86c25c3264480e98d979dbb8e8b402a2b8 SHA1 739dcb4daf0a441384ead5160ad9eab5379f8c33 SHA256 d978f055fdc3c56641a072c32b62770ec17da784ac8b31fe7bff12587b8dbcf4
-EBUILD collectd-5.0.0-r1.ebuild 12869 RMD160 57ba352f47e77126fb387674242f38a94720fe29 SHA1 cdca8a9ea3403cdd65fd4604ee95f5df10a3357a SHA256 17bdedfae0f66b6de0ff864aae77959a590ccca2d74f97153e5d117b834079e4
+EBUILD collectd-5.0.0-r1.ebuild 12861 RMD160 bc8c52de48e666212d624dcb82600f080bb20efe SHA1 6608dd730d6457d1e625eec83d6fe256eeec0d08 SHA256 14237d60631b92615cfc1675a9604cbe19e22416fa6d56973e2e21f3359ffd96
 EBUILD collectd-5.0.0.ebuild 11608 RMD160 1d0744e06e55a2bf17d26673a6519aeafeec03f9 SHA1 adee24c6adf2a359b799f7d2469cae902e544541 SHA256 78734f0654e090454c8b1e60af8e737f3669985976aad77f5fbfaaeca0d83111
-MISC ChangeLog 6828 RMD160 de7ea04f3881677a6b508b6446654a7153c47329 SHA1 64a4b759ea81ca54259b18eebe8942747cc8e0b8 SHA256 86360c14df8f5e6e8f8884b6835a394107cd9f2a301db6be1c974f82dd23a433
+MISC ChangeLog 6965 RMD160 53e5895595b8b24362608a3db50c45a0dcb8f5c9 SHA1 d8ad4d1950537c503087dbdca263dca9630f3e7c SHA256 f8107d628707b00041ba433a4bd238f55a0bf131215c0f4722e0d6020a70fb64
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtFY8AAoJENwGBM22xffeks4P+wZs4CKOvAuM7rvvFhKkt01w
-V91mY313RryiJi5EM7KUs75rE7V7XNFgb3t66BBdqj72y1zr/nmo+9NgF+MugTAv
-EhKkyL3TDMKKWLg8cW5xjUxMp5eRmHqu1uZxJndfy1TaMLfVhdTTEd+ll4GTUfrB
-57x8ddftrHVjDBh0vR84Mm98dL7xz6uvXXOYv4KVkdSJ/s33XDdnZHGU1164YLuX
-zKqLLrxtVkAOHjb1Ampc2/Ls2QfGGZTx1KS0kf/si5W8YyrYrQch9VjzIttkcBkP
-5bjtfAZqH0VNnFT5NYPJm150umJebJE+lsnWa5ypnZpRzDrjef4mztNeViyUKow+
-VFM0d+XLAsmMkmTp2lyT/IZiF+YZE5BkeQa/R4ZNc1pUuTIfKwssu9etM+eznw1g
-HP9vrjfRYiLhyD/wP/LJLasP+KB2Qt+KonD90rwME4MZ8HIzONJ1rUapKNZKMioD
-Ce5wdiGfJXCtpAV8DCmkwVgcAIFCm2/ls1a9apg/ilRQyRWa7YGHgHSan98gwbo8
-PAw2RKju06+LOQaHovDFJeFsWAYrdoa10x3O3Q/Z23/DwSthJIeQT4v9YWOyYVzK
-FgwHfnR1lw0QlJzxiA+NFBxgcXRNTauiIoLPIEtpADLmlBo3BZo2srqgCkZP4aDu
-wXDTZs7tqdIT1HXEnBrD
-=ncuV
+iQIcBAEBCgAGBQJNtFdjAAoJENwGBM22xffepaUP/iJWImMyHr8trM4t2/Gj8axU
+oLNn+P0vd6rmRCaOKiFs/9+e080qPuZxdWvJ8qg4QLoL3vRHhYzzCnpuuB/Y3lwz
+iMI/wyz+P6naTi7IYfNh/jTWANuQ+nr/UCEqX+ti4WnjNqnHorgabDTrEsY96j6g
+BlbDcRb5SwueTUWttXGbcSPeRXoCFxk6kqLqsNWE83yWWVzKQ/UZiz1/tnj2DVMo
+BTO3zO1fqzQ3aC01e9xhpLmBSm78f8gJtGrAu4P0THSj+aiCGFv3xQMbf+7ML4bX
+CJ8cNHGufhY9rum3MAT/4JNDY7to07LsgwJAiDhXpJIW69o6ifhvk5dNMWGcYQkb
+cTvKCqxqitQ+w0eHXc9G/31gqJWMHtQuYHbaZqYdgp0UqztCQfSqclcySqSUbDcI
+D/jAOSWLJY0cEkH6jNNsEdYFCCkKOV2+OoTkjQQjr+SOY1Mfn7dmUXyzhvtx1GJl
+PXMvsaPzD9dbV5n3YDuNggaUOaF27/QQq9Fo+kiY6tXsCr+mM1jA1mycxDHU/3f1
+yKs/Ju8D1pIkBWB5U+aK3yWNObl+lWkZtpn4px3HYVouCNWAf8pA+lYOQg9CpMvy
+CAJI1eUapLOWJAA/R1t9XSiiUaTC8+sZIxF3wGO957gJjuEXavy+fu7Th7tSLxwi
+gQLtgu2W9ldKbk7YK5gi
+=AOez
 -----END PGP SIGNATURE-----

diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild
index cc3d040..5e40237 100644
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild
@@ -186,7 +186,7 @@ pkg_setup() {
 	fi
 
 	enewgroup collectd
-	enewuser collectd -1 /bin/false /var/lib/collectd collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
 }
 
 src_prepare() {

diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild
index 0e00ac6..4138c41 100644
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ b/app-admin/collectd/collectd-5.0.0-r1.ebuild
@@ -186,7 +186,7 @@ pkg_setup() {
 	fi
 
 	enewgroup collectd
-	enewuser collectd -1 /bin/false /var/lib/collectd collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
 }
 
 src_prepare() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/
@ 2011-04-24 20:51 Andreas K. Huettel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas K. Huettel @ 2011-04-24 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     96ad5ac5600f5bc214f02bacf8971fa2e138e1b5
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 24 20:54:07 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 20:54:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=96ad5ac5

[app-admin/collectd] Resync with tree

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-admin/collectd/Manifest                  |   32 ++--
 app-admin/collectd/collectd-4.10.3-r1.ebuild |    2 +-
 app-admin/collectd/collectd-4.10.3.ebuild    |  319 -------------------------
 app-admin/collectd/collectd-5.0.0-r1.ebuild  |    2 +-
 app-admin/collectd/collectd-5.0.0.ebuild     |  324 --------------------------
 5 files changed, 17 insertions(+), 662 deletions(-)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index c9aaac2..d215067 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -13,27 +13,25 @@ AUX collectd.initd 1644 RMD160 b290f64b0c08bd42d367d6a2ef78bf81d75145cd SHA1 db1
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
 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.3-r1.ebuild 12576 RMD160 5aa451b1f17afbb7f639e2201550b4fb8798c7a4 SHA1 e584bd3e4d1a115f177ccb694b49a8da34ee84bd SHA256 a86c06c9e6ea855e955e80d295af247e85e9f74079f651a3714173335553e5f7
-EBUILD collectd-4.10.3.ebuild 11323 RMD160 5c8d8b86c25c3264480e98d979dbb8e8b402a2b8 SHA1 739dcb4daf0a441384ead5160ad9eab5379f8c33 SHA256 d978f055fdc3c56641a072c32b62770ec17da784ac8b31fe7bff12587b8dbcf4
-EBUILD collectd-5.0.0-r1.ebuild 12861 RMD160 bc8c52de48e666212d624dcb82600f080bb20efe SHA1 6608dd730d6457d1e625eec83d6fe256eeec0d08 SHA256 14237d60631b92615cfc1675a9604cbe19e22416fa6d56973e2e21f3359ffd96
-EBUILD collectd-5.0.0.ebuild 11608 RMD160 1d0744e06e55a2bf17d26673a6519aeafeec03f9 SHA1 adee24c6adf2a359b799f7d2469cae902e544541 SHA256 78734f0654e090454c8b1e60af8e737f3669985976aad77f5fbfaaeca0d83111
+EBUILD collectd-4.10.3-r1.ebuild 12576 RMD160 cd13f21b8a20d1377a5d074595281f8c327765e0 SHA1 e5aaa66ebe93ef29077c89b8e23b4dbb02c7560a SHA256 2b31c89f69cf14589e41ca14b4b1eb9803b117984a2e1c419635c80d416dcef2
+EBUILD collectd-5.0.0-r1.ebuild 12860 RMD160 cf8db8fb0562aef7d99f58cdb2ca6cc287b91a3c SHA1 231c585fa421cca5f2613ac4db2eb31b1e779106 SHA256 b6b889a9581da351cf0cf5294b41c43631e7e73479474a817c8e6571445ca5d3
 MISC ChangeLog 6965 RMD160 53e5895595b8b24362608a3db50c45a0dcb8f5c9 SHA1 d8ad4d1950537c503087dbdca263dca9630f3e7c SHA256 f8107d628707b00041ba433a4bd238f55a0bf131215c0f4722e0d6020a70fb64
 MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc
 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtFdjAAoJENwGBM22xffepaUP/iJWImMyHr8trM4t2/Gj8axU
-oLNn+P0vd6rmRCaOKiFs/9+e080qPuZxdWvJ8qg4QLoL3vRHhYzzCnpuuB/Y3lwz
-iMI/wyz+P6naTi7IYfNh/jTWANuQ+nr/UCEqX+ti4WnjNqnHorgabDTrEsY96j6g
-BlbDcRb5SwueTUWttXGbcSPeRXoCFxk6kqLqsNWE83yWWVzKQ/UZiz1/tnj2DVMo
-BTO3zO1fqzQ3aC01e9xhpLmBSm78f8gJtGrAu4P0THSj+aiCGFv3xQMbf+7ML4bX
-CJ8cNHGufhY9rum3MAT/4JNDY7to07LsgwJAiDhXpJIW69o6ifhvk5dNMWGcYQkb
-cTvKCqxqitQ+w0eHXc9G/31gqJWMHtQuYHbaZqYdgp0UqztCQfSqclcySqSUbDcI
-D/jAOSWLJY0cEkH6jNNsEdYFCCkKOV2+OoTkjQQjr+SOY1Mfn7dmUXyzhvtx1GJl
-PXMvsaPzD9dbV5n3YDuNggaUOaF27/QQq9Fo+kiY6tXsCr+mM1jA1mycxDHU/3f1
-yKs/Ju8D1pIkBWB5U+aK3yWNObl+lWkZtpn4px3HYVouCNWAf8pA+lYOQg9CpMvy
-CAJI1eUapLOWJAA/R1t9XSiiUaTC8+sZIxF3wGO957gJjuEXavy+fu7Th7tSLxwi
-gQLtgu2W9ldKbk7YK5gi
-=AOez
+iQIcBAEBCgAGBQJNtI3vAAoJENwGBM22xffeWWoQAJrh9AViibdit/Z7eYjGON1i
+F3fP9F9Yl7WKlVc37U8BrBVk3nfuL/svtqur+QrnMMl69XSX58Bc3pWF2WDEyj74
+fyip+mRLl7urjpbX8ISsPJbU+pZ1nu7xYUsKUQM/Sogt4SuqOdXN4KLsl994/a6X
+ZiPRKP1PM8v0nsjHoVwymw2jsTsVC3Ui9g+bxl3/sNUvZV5Y00WncckdR65MqzpB
+wEUTvTOaqWJ5uQlmKVCsMCKUD18SFvMHImf9LRg9a1f5aZG2GzkSSW6/NSbIHyLV
+YWa93IhBEKNrIhpzkEkt9MIHZ2NFb8I1EvTty8c1pWkDbDV2t/ZJpz7IJTEvupP/
+wm8zGojBgOZzvQj8wtes6xqtiNptvJ7kH9ltf+aHXezY+j1KAgomEw8kxofiwF2z
+cEifavcJdCmA2x598fTJPbVrE4ZdmpZuD0Iv/U8i0BjPJGb3UQsbfuYAb4YAWoT5
+G7hRvxHg7HRZ9UfpvBMskX0Z/j1r3iyM9NlIJvHniQYRKe/NR26NT9gKh+MbTvDl
+R/o81XtBFfMs71iTd0OIKS6G3RUTj2KHBkPcDnmoG1NdqFa7WHEVGXHn9tC7Btwz
+PToPjDI7QWMpDjsivPNA92klJna6iAx+/RsDYCIPjvW0WAMeSlCtky6fvNPunLhw
+W2mjRVMgFhsM6/8j1pAe
+=nQGU
 -----END PGP SIGNATURE-----

diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild
index 5e40237..58e73fd 100644
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $
 
 EAPI=3
 

diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild
deleted file mode 100644
index 73b9683..0000000
--- a/app-admin/collectd/collectd-4.10.3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 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 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 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
-	"${FILESDIR}/${PN}-4.10.3"-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
-}
-
-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 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
-}

diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild
index 4138c41..bd2cd36 100644
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ b/app-admin/collectd/collectd-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $
 
 EAPI=4
 

diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collectd/collectd-5.0.0.ebuild
deleted file mode 100644
index 7f8e343..0000000
--- a/app-admin/collectd/collectd-5.0.0.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 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
-	"${FILESDIR}/${PN}-4.10.3"-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
-}
-
-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 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
-}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-04-24 20:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-24 15:12 [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/ Andreas K. Huettel
  -- strict thread matches above, loose matches on Subject: below --
2011-04-24 20:51 Andreas K. Huettel
2011-04-24 16:58 Andreas K. Huettel
2011-03-30 22:08 Andreas K. Huettel
2011-03-30 20:45 Andreas K. Huettel
2011-03-30 20:06 Andreas K. Huettel
2011-03-29 22:40 Andreas K. Huettel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox