Remove old

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

4 files changed, 19 insertions, 729 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index d3ae6c937bcf..147a7e5017cc 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.32 2012/02/12 16:17:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.33 2012/02/12 16:20:49 dilfridge Exp $
+
+  12 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -collectd-5.0.0-r2.ebuild, -collectd-5.0.1.ebuild:
+  Remove old
 
 *collectd-5.0.2-r1 (12 Feb 2012)
 
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 6f44c71f9db4..664989494565 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -18,29 +18,25 @@ AUX collectd-5.0.2-message.patch 268 RMD160 5c3b166a0921bedcd0d9f29c73730a62a224
 AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592
 AUX collectd.initd 1649 RMD160 69e2d339e328b7e7806c49c0226e6e2ffcd40675 SHA1 e83e80f0a56ed8153861aaa1ced5f81256e6d93b SHA256 9db6809d7e7991208d35bc517c71d12a5fa8b8453f096a433e386259c7301163
 AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c
-DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
-DIST collectd-5.0.1.tar.bz2 1331938 RMD160 26911d3d2c528df43be4ef50dde6e6a6d009132d SHA1 43c61e2aadb4fe648a24a690163a34cd7da76af2 SHA256 23968cf17ef509832bd7c206de5247571b5120418fc537a14d7c26ebd714d86b
 DIST collectd-5.0.2.tar.bz2 1313812 RMD160 b0e5470111ec8c0a4c336f7457ef70b8dca738af SHA1 d52d7cedb9d14d030a03107a7e2f0f66e81262d6 SHA256 65c1a0dcea7eca65acb4a52dfae62ed6dba488089d7710ca5ff1cc4225a59dcb
-EBUILD collectd-5.0.0-r2.ebuild 12996 RMD160 5e5ecc67f2b206e3d4c1cf1c014123a147b6ec4e SHA1 6fb1867f1529d8cf2a73a1b10656257e7239931e SHA256 675b625a33de100858da8ccfbc73c9469e9086d7594a87d3285eddb6bdf59a90
-EBUILD collectd-5.0.1.ebuild 12892 RMD160 78d9ce373f35c4388f9a64962badc80e9d5aa9cc SHA1 184f449f8f205bcb2619156a36a96c3f76da5184 SHA256 8ebe516152bfa09d524b0762fe3c16aa32538a545ac74e280a256b14737fad08
 EBUILD collectd-5.0.2-r1.ebuild 13070 RMD160 e501785ab54b27b810887726480d7c4c477c1336 SHA1 161357b580e17f5e3038c041281f41d105637640 SHA256 04b2c2740c9071addf3b6d5923c22d22b029cbd91c83d736d8a6f9f42552b127
 EBUILD collectd-5.0.2.ebuild 13026 RMD160 43709599968a9b1ab042f2f7a4dbd4e6d65668be SHA1 54628d0d3c68c01a507cba8319a0689bb9824b14 SHA256 0e3e4852be0a16529da86fb68c7b217db3bf7371408087e5cc94ee45f12edd02
-MISC ChangeLog 6935 RMD160 bca18cddce1c51264ae3c78a52c4f605e44c6d55 SHA1 5126edec1bd3f17112317cc46d100701f64abf71 SHA256 1cfbc82936b7ec4d0988625532ae64eb91ae442956cdd81736cbd6ca2a52cd85
+MISC ChangeLog 7059 RMD160 6c8c2bd322c4c87f15212412573384f80eb0ce95 SHA1 8af6977dd3049b86397cecff3c4c0316dbba0c36 SHA256 6b299246c54b8ab4ad5c1d6b3e51ab6e56ea8cb39f148e08354db5696142bd12
 MISC metadata.xml 11877 RMD160 362fbdf3abeb7802fdd29fbe19a397208f2c56e4 SHA1 ac90b60de6a36e6c66543780c6a249776f9925ad SHA256 b58a5a790ffccefddcc34753fe0e543659af2689d2c757ee81002d5cbe1d5cd7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPN+ZSAAoJEEb+UGWnxTyHQsoP/0b6hbg7+9zxwMGp+KH2bDtd
-cldZzfQY4QxX3/FDcqei86gEHNpbEWWZyu7nLleaHAFtX+7HK1N8d4oyKl1N+Obq
-+7biVuDi0e3U/g7wWgZeHedbw9vH4TbwugK7WZT0IkpubENC1YrriCeM9jxpTguy
-BQHMTssAiYSniQYx9J7ifEawCpl5a896JjDaZc02X/kdHxzC6bQjU2w7nlXYNWHj
-+TERdiPiUa2cEHH9PUTRcTjDHBbvBr2Xtv6SDl0sUgkc72c8wmGK1hLaGUYI8Q0g
-RNrWet2tEurtyNLgV1SZn+RJdUqvcDZf3M/Kzc/wKz5sWiQwvBYM+ZKggSBl3ddw
-BiDNLFWbpZwZZc64k0LPeYE3aODgUh8g+lxVCugocsOhTL7lnooS680xPlaDzThp
-OPKmQQYGKK3gTdq8RgwQCPFooEsZHlt5p4LFKJXmKHfN/qKJgWY3rBqEdmV8aJoK
-5v+U0KDH4221Ubem0Z/wEoN80QCvpZ0dfGCyTUKUI59LdVY9rPN6jaTPVgUFR88q
-PRvr2KdhRcIOdV1CrXfTJhjB83uLbXw/uc7FRDHnMzHkginNfAepiqQHCrUwFPjY
-tnQEK5IVP3411CCtED/HJRf0DbYYG1rpUYMdM6sFaxpIAcTNBRRfJSYOMgb6WDRY
-IAmXdO2g6kfI8TqyNFBo
-=F6Oq
+iQIcBAEBCgAGBQJPN+cBAAoJEEb+UGWnxTyHmYIP/3DJchDOgC9KQ0FP1FSFfPao
+pxirxuT0qVCUbkbuL9xvVCA6DGnrUzI0G+WbqEMJ8ZV/tulBOING0nfcPcw1lmJ5
+fo0uKdrVrABwDNx8H+duzOWvTbTkcqirxZqDOkYm6kbQjvBMy93PbchDAjErs7da
+E3RwPH52EoeyZTC1NS1hgF6e5OUyRgFTH6N5uYZpFq/mu9St7zkwnb+LDbMj3Qfy
+ZRai2R7ImS0ROZOGKXMYq/iPSwju4rxjPUqMZpRDQ1y9L7130enZvoolY1ycVxjS
+X4Ll4y13cijKtSnz2kBXoG7u6ZXKLHlAaLfuvl0oqeMz/pdREOpV0Hmc4AcFyTk5
+NLg7CYEBnr+FOh4jdFvtH5q+3SgzLg7kOmNXPcS8zv+MU+G+AqVSAHrXWVrufX/H
+WiPZ21zNTSwAHdOvzqrNCxpVxgRuNvqnI6pGwLDiJB0lBo8gQ8Rdti+18Hvbwrc4
+A4K7P2rSFJuyO+J6htCm2VRwyAhG2kjYUY3OM8f1rdCLrLZDqMVTwSU2LYEewP7P
+HlxmKI3+Kl/rcXjyABTGCDiwqlotkiYiVSBVI9RV8B0kybCCvo5ReJdlW325b/1h
+XpU8bhMMRUcF265xeOkuDWnqEXXwZLEs/hZjfAuQDCBQ1kUEgMxOVhHAe6t/8mEE
+7dRq2BCcO3NSz62eAyl+
+=3dZw
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-5.0.0-r2.ebuild b/app-admin/collectd/collectd-5.0.0-r2.ebuild
deleted file mode 100644
index 7f7625d43354..000000000000
--- a/app-admin/collectd/collectd-5.0.0-r2.ebuild
+++ /dev/null
@@ -1,356 +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-5.0.0-r2.ebuild,v 1.1 2011/09/17 22:48:14 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 perl static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus amqp genericjmx lpar redis threshold write_redis v5upgrade"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch
-	cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy 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 varnish 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="
-	dev-libs/libgcrypt
-	sys-devel/libtool
-	perl?					( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
-	collectd_plugins_apache?		( net-misc/curl )
-	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
-	collectd_plugins_bind?			( dev-libs/libxml2 )
-	collectd_plugins_curl?			( net-misc/curl )
-	collectd_plugins_curl_json?		( net-misc/curl dev-libs/yajl )
-	collectd_plugins_curl_xml?		( net-misc/curl dev-libs/libxml2 )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.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_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_varnish?		( www-servers/varnish )
-	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,werror}.patch
-	"${FILESDIR}/${PN}-5.0.0"-yajl2.patch
-	"${FILESDIR}/${PN}-5.0.0"-yajl2-2.patch
-	"${FILESDIR}/${PN}-5.0.0"-varnish.patch
-	)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plug-in name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then return 0; fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	linux-info_pkg_setup
-
-	# battery.c:/proc/pmu/battery_%i
-	# battery.c:/proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# nfs.c:/proc/net/rpc/nfs
-	# nfs.c:/proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c:/proc/tty/driver/serial
-	# serial.c:/proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c:/proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c:/proc/acpi/thermal_zone
-	# thermal.c:/sys/class/thermal
-	collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# vmem.c:/proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# uuid.c:/sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c:/proc/net/wireless
-	collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	enewgroup collectd
-	enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	rm -r libltdl || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="battery cpu cpufreq disk entropy 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
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	# Need JAVA_HOME for java.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	if ! use collectd_plugins_iptables; then
-		myconf+=" --with-libiptc=no"
-	fi
-
-	# The perl bindings
-	myconf+=" $(use_with perl perl-bindings)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	fixlocalpod
-
-	find "${D}/usr/" -name "*.la" -exec rm -f {} +
-	rm "${D}/usr/$(get_libdir)"/collectd/*.a
-
-	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
-	# we cannot do this yet
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use contrib ; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" collectd
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
-}
-
-collectd_rdeps() {
-	if (use collectd_plugins_${1} && ! has_version "${2}"); then
-		elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
-	fi
-}
-
-pkg_postinst() {
-	collectd_rdeps apcups sys-power/apcupsd
-	collectd_rdeps hddtemp app-admin/hddtemp
-	collectd_rdeps mbmon sys-apps/xmbmon
-	collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
-	collectd_rdeps ntpd net-misc/ntp
-	collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
-
-	echo
-	elog "collectd is now started as unprivileged user by default."
-	elog "You may want to recheck the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
-	fi
-	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
-}
diff --git a/app-admin/collectd/collectd-5.0.1.ebuild b/app-admin/collectd/collectd-5.0.1.ebuild
deleted file mode 100644
index bb10204075dc..000000000000
--- a/app-admin/collectd/collectd-5.0.1.ebuild
+++ /dev/null
@@ -1,354 +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-5.0.1.ebuild,v 1.1 2011/10/22 17:35:40 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 perl static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus amqp genericjmx lpar redis threshold write_redis v5upgrade"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch
-	cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy 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 varnish 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="
-	dev-libs/libgcrypt
-	sys-devel/libtool
-	perl?					( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
-	collectd_plugins_apache?		( net-misc/curl )
-	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
-	collectd_plugins_bind?			( dev-libs/libxml2 )
-	collectd_plugins_curl?			( net-misc/curl )
-	collectd_plugins_curl_json?		( net-misc/curl dev-libs/yajl )
-	collectd_plugins_curl_xml?		( net-misc/curl dev-libs/libxml2 )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.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_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_varnish?		( www-servers/varnish )
-	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,nohal}.patch
-	"${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch
-	"${FILESDIR}/${P}"-varnish.patch
-	)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plug-in name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then return 0; fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	linux-info_pkg_setup
-
-	# battery.c:/proc/pmu/battery_%i
-	# battery.c:/proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# nfs.c:/proc/net/rpc/nfs
-	# nfs.c:/proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c:/proc/tty/driver/serial
-	# serial.c:/proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c:/proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c:/proc/acpi/thermal_zone
-	# thermal.c:/sys/class/thermal
-	collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# vmem.c:/proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# uuid.c:/sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c:/proc/net/wireless
-	collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	enewgroup collectd
-	enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	rm -r libltdl || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="battery cpu cpufreq disk entropy 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
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	# Need JAVA_HOME for java.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	if ! use collectd_plugins_iptables; then
-		myconf+=" --with-libiptc=no"
-	fi
-
-	# The perl bindings
-	myconf+=" $(use_with perl perl-bindings)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	fixlocalpod
-
-	find "${D}/usr/" -name "*.la" -exec rm -f {} +
-	rm "${D}/usr/$(get_libdir)"/collectd/*.a
-
-	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
-	# we cannot do this yet
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use contrib ; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" collectd
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
-}
-
-collectd_rdeps() {
-	if (use collectd_plugins_${1} && ! has_version "${2}"); then
-		elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
-	fi
-}
-
-pkg_postinst() {
-	collectd_rdeps apcups sys-power/apcupsd
-	collectd_rdeps hddtemp app-admin/hddtemp
-	collectd_rdeps mbmon sys-apps/xmbmon
-	collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
-	collectd_rdeps ntpd net-misc/ntp
-	collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
-
-	echo
-	elog "collectd is now started as unprivileged user by default."
-	elog "You may want to recheck the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
-	fi
-	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
-}