[app-admin/collectd] Not needed anymore

17 files changed, 0 insertions, 1365 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
deleted file mode 100644
index 8f3fcac..0000000
--- a/app-admin/collectd/ChangeLog
+++ /dev/null
@@ -1,210 +0,0 @@
-# ChangeLog for app-admin/collectd
-# 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, +files/collectd-4.10.3-werror.patch,
-  collectd-5.0.0-r1.ebuild:
-  Don't use -Werror else gcc-4.6 will drive us mad; move 4.10.3 to EAPI=4;
-  use wrappers for chown and chmod
-
-  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)
-
-  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  -collectd-4.10.2.ebuild, -collectd-4.10.2-r1.ebuild,
-  -collectd-4.10.2-r2.ebuild, -collectd-4.10.2-r3.ebuild,
-  +collectd-4.10.3-r1.ebuild, +collectd-5.0.0-r1.ebuild,
-  files/collectd.confd, files/collectd.initd:
-  Add useflag for perl bindings and static libs, run as unprivileged user;
-  bug 361723
-
-  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.3.ebuild, +files/collectd-4.10.3-lt.patch,
-  collectd-5.0.0.ebuild:
-  Properly address libtool mess
-
-  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>
-  +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
-
-  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>
-  +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>
-  +collectd-4.10.2-r3.ebuild, +files/collectd-4.10.2-libnotify-0.7.patch,
-  +files/collectd-4.10.2-nohal.patch, files/collectd.initd:
-  Resync with tree
-
-  28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.2-r2.ebuild:
-  Added hints about new configuration
-
-  28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.2-r2.ebuild:
-  Resync with treee
-
-  25 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  -collectd-4.10.1-r2.ebuild, -collectd-4.10.1-r3.ebuild,
-  -collectd-4.10.1-r4.ebuild, -files/collectd-4.10.1-werror.patch,
-  notes.txt:
-  Cleanup
-
-*collectd-4.10.2-r2 (21 Dec 2010)
-
-  21 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.2-r2.ebuild, metadata.xml:
-  Added curl_json support from Johan Bergström, fixing bug 349124
-
-*collectd-4.10.2-r1 (17 Dec 2010)
-
-  17 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.2-r1.ebuild:
-  Enabled ping plugin since we now have liboping
-
-  16 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  files/collectd.initd:
-  Added oracle and checkconfig features to init script
-
-  15 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.2.ebuild, +files/collectd-4.10.2-libocci.patch:
-  Added oracle support from Aurelien Minet to ebuild
-
-*collectd-4.10.2 (15 Dec 2010)
-
-  15 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.2.ebuild:
-  Version bump without feature additions
-
-*collectd-4.10.1-r4 (15 Dec 2010)
-
-  15 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.1-r4.ebuild:
-  Resync with tree
-
-  31 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r3.ebuild:
-  Resync with tree
-
-  31 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r3.ebuild:
-  Added ipmi plugin for testing
-
-  29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r3.ebuild:
-  Added netlink plugin for testing
-
-  29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.1-r3.ebuild, +files/logrotate:
-  Started with improvements from bug 342985
-
-  29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r2.ebuild, files/collectd.confd, files/collectd.initd:
-  Resync with main tree
-
-  12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r2.ebuild, -collectd-4.10.1-r3.ebuild:
-  Moved changes back to -r2, no version bump
-
-*collectd-4.10.1-r3 (10 Oct 2010)
-
-  10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  +collectd-4.10.1-r3.ebuild, +files/collectd-4.10.1-noowniptc.patch:
-  Added patch to completely disable the bundled libiptc. The build will now
-  rather fail.
-
-  10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r2.ebuild:
-  Resync with tree: dont apply -Werror patch, unconditionally depend on
-  iptables
-
-  10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r2.ebuild, +files/collectd-4.10.1-werror.patch:
-  Disabled -Werror
-
-  03 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r2.ebuild:
-  Removed the PROCFS checks for speedup (on request from flameeyes)
-
-  29 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  collectd-4.10.1-r2.ebuild:
-  Fix DEPEND variables.
-
-*collectd-4.10.1-r2 (28 Sep 2010)
-
-  28 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  -collectd-4.10.1-r1.ebuild, +collectd-4.10.1-r2.ebuild:
-  Synced with tree
-
-  28 Sep 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-  metadata.xml:
-  Added myself as maintainer
-
-  26 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild:
-  Removed spurious elogs.
-
-  26 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild:
-  Added some additional sanity checking
-
-  24 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild, metadata.xml:
-  More local variables, and use-flag documentation.
-
-  24 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild, metadata.xml, notes.txt:
-  Removed useflag descriptions and dependencies for disabled plugins.
-
-  24 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild, +files/collectd-4.10.1-libperl.patch,
-  notes.txt:
-  Compile-tested and enabled for now only the tested plugins. Prepared for
-  tree commit. Sorted out libperl asneeded issue (well, kind of).
-
-  21 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
-  collectd-4.10.1-r1.ebuild:
-  More elaborate warnings and TESTED_PLUGINS classification
-
-  27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-  collectd-4.10.1-r1.ebuild, +files/collectd-4.10.1-libiptc.patch:
-  And we still need a patch. Better one though...
-
-*collectd-4.10.1-r1 (26 Aug 2010)
-
-  26 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-  -collectd-4.9.2.ebuild, -collectd-4.10.0.ebuild, -collectd-4.10.1.ebuild,
-  +collectd-4.10.1-r1.ebuild, -files/collectd-4.10.1-libiptc.patch:
-  Require iptables version where --as-needed linkage is fixed, see bug
-  #334503.
-
-*collectd-4.10.1 (23 Aug 2010)
-
-  23 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-  +collectd-4.10.1.ebuild, +files/collectd-4.10.1-libiptc.patch:
-  Version bump. Fixed autoconf test for libiptc, which may fail because of
-  as-needed... Fixed postgresql dependency.
-
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
deleted file mode 100644
index 7ce625c..0000000
--- a/app-admin/collectd/Manifest
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e
-AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7
-AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac80da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d
-AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc5ffc61206ad97b2ba37 SHA1 fae5913db9fe0c9243bad1aa9610f0759c1e0abb SHA256 b7a4baca65b4c68ca46ac95a269071c356ca4674ebfda50e872f665cf2422fe8
-AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b
-AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799
-AUX collectd-4.10.3-lt.patch 1006 RMD160 b7eee4c9261af6ac3d330494746b922792241bac SHA1 ce2f25fbb84912bce137866faecf147d4da4ee57 SHA256 b5640f7a029366d33d6821f8efe203097d56c0193ec39e1e52d93bc7723179c7
-AUX collectd-4.10.3-werror.patch 849 RMD160 1bf304deb3addbdeb4d7e12ea06f49dd3f85e387 SHA1 07f8c063f788c77e2958f2490bc910296a9db25e SHA256 c9b70f892f96c0d5da5d65702679bc0b4a38b4e77ff819f69c03ad68cc3f68fd
-AUX collectd.confd 865 RMD160 0e2655d185bc5bb973cbe7a32fbdfa832bc51d54 SHA1 88f9398411dea63ff19e07e27fe68da2a97cd1da SHA256 cde0eedcdf29bb9994a7897388c3d60b069900f4a5e304cfc033be89c303992b
-AUX collectd.initd 1644 RMD160 b290f64b0c08bd42d367d6a2ef78bf81d75145cd SHA1 db188725f6a93e14e51a17c5b9177590a0ae3908 SHA256 cd17fb867783ce8c1a4dcbabae696eec734c7b1c88aa66f0586911908d02d1b6
-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 12509 RMD160 a868c47d13e2d3f0b0c690909f0295e74a195ff9 SHA1 d043277bd65904f0c5a1c589314321afcad3f722 SHA256 56ef4977df9a6b9616107bb6057b346372136b0e54ba0b04977ef993048bafab
-EBUILD collectd-5.0.0-r1.ebuild 12835 RMD160 3428af56cc424899eafa0e2059fbf76cd61d5712 SHA1 e6af4d250bc7766fc17589e42485af62dc947520 SHA256 9f4d0e42a356b877853a8417bf0792b01ca82b2109f1be6b62bd96e5e7066786
-MISC ChangeLog 7227 RMD160 1d479c9ae53c193eb711b69c57bc793bfaa27d45 SHA1 c88ea53572b8849b7d924358c0f82e10b27dbd5b SHA256 1952a16848a1d6dc33df625506e7c82b76f349c087f2f0657f90920934488b41
-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)
-
-iQIcBAEBCgAGBQJNtJJiAAoJENwGBM22xffeP7AP/0ASz60srRNHrhWe/pUOh1Ps
-JNP6BRQuyOJFAabPpSjS2TuLWNwkVFflxjjrhKD3lMcQ0M85FxE7uyyfs99ZtWZc
-KqnxHZET+TaYWjHILt+Dcwo9SyCDmINi4MEU4G4B9CHRyokqsBS7+pYVrikkgQA+
-UBNVKliIaEoYwWY/BCqr7HLVPGhWnN5H1vc+6G+nt53t0dMn5sUpvAsjOwqNX2f9
-F9waidkyMdhNNmxjtW8hzveDZ0qq6+v35K2zPjK8iRXoimweJATMim5VPSFwUeh8
-aMEjbj8E51FW15QRomsm6Zf2jEoE9LPjxXyaFTFzlipBPe5mq3hSffC6eHjTsVgt
-/Ffb/BeeCJvW+F0AgxyDEK1SWHBHCyoTqcqXKP6mI6I13YX43edJHjt74FFrR780
-91tJn24WXH3ZAVEiv5iByrS5I6NzxV3RRRrRMog838Yaange3M7kyRdG7DhRAXgB
-dXoBYqXVnM57LqS4G/Zh3wBFhfKI53yboGkTYgD9ZPs/9Zx1KT2V5EhK6u+gTxDt
-fjvU3nP9AmJRbh/SipwXf0konLzEF2MUMVvO0yj93v0EwRzsRC/go5WhbBUw4nUA
-5SamPJFe+EhYwEr49n72y7mSlHhJltW9n48VtArUDwWEpzS1e9Fv7+K++FfcZQQ1
-mXDeQLVcBVtKxeev+jzh
-=jqeB
------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
deleted file mode 100644
index c1fd53f..0000000
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild
+++ /dev/null
@@ -1,346 +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.3-r1.ebuild,v 1.1 2011/04/24 17:10:05 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"
-
-# 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="
-	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_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,werror}.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
-}
diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild
deleted file mode 100644
index bd3b67f..0000000
--- a/app-admin/collectd/collectd-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,351 +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-r1.ebuild,v 1.1 2011/04/24 17:10:05 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 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="
-	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_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,werror}.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/files/collectd-4.10.1-libiptc.patch b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
deleted file mode 100644
index 193a479..0000000
--- a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
---- collectd-4.10.1.orig/configure.in	2010-07-09 12:01:59.000000000 +0200
-+++ collectd-4.10.1/configure.in	2010-08-27 22:27:57.010271693 +0200
-@@ -1626,7 +1626,7 @@
- # Check for the iptc_init symbol in the library.
- if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
- then
--	AC_CHECK_LIB(iptc, iptc_init,
-+	AC_SEARCH_LIBS(iptc_init, [iptc ip4tc],
- 	[
- 		AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
- 	],
diff --git a/app-admin/collectd/files/collectd-4.10.1-libperl.patch b/app-admin/collectd/files/collectd-4.10.1-libperl.patch
deleted file mode 100644
index 8fc25a8..0000000
--- a/app-admin/collectd/files/collectd-4.10.1-libperl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
---- collectd-4.10.1.orig/configure.in	2010-07-09 12:01:59.000000000 +0200
-+++ collectd-4.10.1/configure.in	2010-09-24 20:15:22.666434555 +0200
-@@ -2607,11 +2607,13 @@
- then
-   SAVE_CFLAGS="$CFLAGS"
-   SAVE_LDFLAGS="$LDFLAGS"
-+  SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
-   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
-   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
-   CFLAGS="$CFLAGS $PERL_CFLAGS"
-   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+  LIBS="$LIBS -lperl"
- 
-   AC_CACHE_CHECK([for libperl],
-     [c_cv_have_libperl],
-@@ -2630,7 +2632,10 @@
- 			 Nullsv);
-       ]]),
-       [c_cv_have_libperl="yes"],
--      [c_cv_have_libperl="no"]
-+      [ 
-+        c_cv_have_libperl="no" 
-+        LIBS="$SAVE_LIBS"
-+      ]
-     )
-   )
- 
diff --git a/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch b/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
deleted file mode 100644
index 6496890..0000000
--- a/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
---- collectd-4.10.1.orig/src/Makefile.am	2010-07-09 12:01:59.000000000 +0200
-+++ collectd-4.10.1/src/Makefile.am	2010-10-11 00:10:59.000000000 +0200
-@@ -1,7 +1,4 @@
- SUBDIRS = libcollectdclient
--if BUILD_WITH_OWN_LIBIPTC
--SUBDIRS += owniptc
--endif
- if BUILD_WITH_OWN_LIBOCONFIG
- SUBDIRS += liboconfig
- endif
-@@ -415,12 +412,9 @@
- iptables_la_SOURCES = iptables.c
- iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
- iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
--if BUILD_WITH_OWN_LIBIPTC
--iptables_la_LIBADD  = owniptc/libiptc.la
--iptables_la_DEPENDENCIES = owniptc/libiptc.la
--else
-+
- iptables_la_LIBADD = -liptc
--endif
-+
- collectd_LDADD += "-dlopen" iptables.la
- collectd_DEPENDENCIES += iptables.la
- endif
diff --git a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch
deleted file mode 100644
index 92b01b1..0000000
--- a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/notify_desktop.c
-+++ src/notify_desktop.c
-@@ -31,6 +31,10 @@
- #include <glib.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #define log_info(...) INFO ("notify_desktop: " __VA_ARGS__)
- #define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__)
- #define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__)
-@@ -95,7 +99,12 @@
- 				: (NOTIF_WARNING == n->severity) ? "WARNING"
- 				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
- 
--	notification = notify_notification_new (summary, n->message, NULL, NULL);
-+	notification = notify_notification_new (summary, n->message, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 	if (NULL == notification) {
- 		log_err ("Failed to create a new notification.");
- 		return -1;
diff --git a/app-admin/collectd/files/collectd-4.10.2-libocci.patch b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
deleted file mode 100644
index 2ae42dc..0000000
--- a/app-admin/collectd/files/collectd-4.10.2-libocci.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -u collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
---- collectd-4.10.2.orig/configure.in	2010-11-28 03:27:47.000000000 +0100
-+++ collectd-4.10.2/configure.in	2010-11-28 03:28:23.000000000 +0100
-@@ -2446,14 +2446,14 @@
- ])
- if test "x$ORACLE_HOME" != "x"
- then
--	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
-+	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
- 
- 	if test -e "$ORACLE_HOME/lib/ldflags"
- 	then
- 		with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
- 	fi
- 	#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
--	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
-+	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
- fi
- if test "x$with_oracle" = "xyes"
- then
diff --git a/app-admin/collectd/files/collectd-4.10.2-nohal.patch b/app-admin/collectd/files/collectd-4.10.2-nohal.patch
deleted file mode 100644
index a82a3bc..0000000
--- a/app-admin/collectd/files/collectd-4.10.2-nohal.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
---- collectd-4.10.2.orig/configure.in	2010-11-27 11:10:38.000000000 +0100
-+++ collectd-4.10.2/configure.in	2011-02-07 21:55:22.000000000 +0100
-@@ -1109,18 +1109,7 @@
- AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
- 
- dnl Check for HAL (hardware abstraction library)
--with_libhal="yes"
--AC_CHECK_LIB(hal,libhal_device_property_exists,
--	     [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
--	     [with_libhal="no"])
--if test "x$with_libhal" = "xyes"; then
--	if test "x$PKG_CONFIG" != "x"; then
--		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
--		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
--		AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
--		AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
--	fi
--fi
-+with_libhal="no"
- 
- m4_divert_once([HELP_WITH], [
- collectd additional packages:])
diff --git a/app-admin/collectd/files/collectd-4.10.3-lt.patch b/app-admin/collectd/files/collectd-4.10.3-lt.patch
deleted file mode 100644
index 68cba15..0000000
--- a/app-admin/collectd/files/collectd-4.10.3-lt.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ruN collectd-4.10.3.orig/Makefile.am collectd-4.10.3/Makefile.am
---- collectd-4.10.3.orig/Makefile.am	2011-03-26 17:04:26.000000000 +0100
-+++ collectd-4.10.3/Makefile.am	2011-04-24 17:48:18.013229944 +0200
-@@ -1,6 +1,6 @@
--ACLOCAL_AMFLAGS = -I libltdl/m4
-+# ACLOCAL_AMFLAGS = -I libltdl/m4
- 
--SUBDIRS = libltdl src bindings
-+SUBDIRS = src bindings
- 
- INCLUDES = $(LTDLINCL)
- 
-diff -ruN collectd-4.10.3.orig/configure.in collectd-4.10.3/configure.in
---- collectd-4.10.3.orig/configure.in	2011-03-26 17:08:53.000000000 +0100
-+++ collectd-4.10.3/configure.in	2011-04-24 17:50:06.001229943 +0200
-@@ -6,7 +6,6 @@
- m4_ifdef([LT_PACKAGE_VERSION],
- 	# libtool >= 2.2
- 	[
--	 LT_CONFIG_LTDL_DIR([libltdl])
- 	 LT_INIT([dlopen])
- 	 LTDL_INIT([convenience])
- 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
-@@ -18,7 +17,6 @@
- 	 AC_SUBST(LTDLINCL)
- 	 AC_SUBST(LIBLTDL)
- 	 AC_LIBTOOL_DLOPEN
--	 AC_CONFIG_SUBDIRS(libltdl)
- 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
- 	]
- )
diff --git a/app-admin/collectd/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch
deleted file mode 100644
index 6ddb508..0000000
--- a/app-admin/collectd/files/collectd-4.10.3-werror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am
---- collectd-4.10.3.orig/src/Makefile.am	2011-03-26 17:08:53.000000000 +0100
-+++ collectd-4.10.3/src/Makefile.am	2011-04-24 22:56:39.521229944 +0200
-@@ -7,7 +7,7 @@
- endif
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
-diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am
---- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am	2011-03-26 17:04:26.000000000 +0100
-+++ collectd-4.10.3/src/libcollectdclient/Makefile.am	2011-04-24 22:57:12.231229943 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- pkginclude_HEADERS = client.h lcc_features.h
diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd
deleted file mode 100644
index 6fa531f..0000000
--- a/app-admin/collectd/files/collectd.confd
+++ /dev/null
@@ -1,22 +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/files/collectd.confd,v 1.1 2010/09/28 15:17:05 dilfridge Exp $
-
-# Nice value used to launch collectd, to change priority of the process. As
-# you usually will want to run it in background, a default of 5 is used.
-#
-#COLLECTD_NICELVL='5'
-
-# Location of configuration file. Modify if you don't like the standard one.
-#
-#COLLECTD_CFGFILE='/etc/collectd.conf'
-
-# File used to store the PID file. Usually you won't need to touch it.
-#
-#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid'
-
-# User to run collectd as (default is collectd, change to root or give
-# collectd user appropriate privileges if you use one of the plugins that 
-# require it, as e.g. ping or iptables plugins)
-#
-#COLLECTD_USER='collectd'
diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
deleted file mode 100644
index c5de073..0000000
--- a/app-admin/collectd/files/collectd.initd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.3 2010/12/16 17:33:45 dilfridge Exp $
-
-: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'}
-: ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
-: ${COLLECTD_NICELVL:='5'}
-: ${COLLECTD_USER:='collectd'}
-
-opts="${opts} configtest"
-
-depend() {
-	use net
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfig() {
-	if [[ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ]] ; then
-		if [[ -e /etc/env.d/50oracle-instantclient-basic ]] ; then
-			source /etc/env.d/50oracle-instantclient-basic
-		        export ORACLE_HOME
-		        export TNS_ADMIN
-		else
-			ewarn "Unable to set Oracle environment, Oracle plugin wont work"
-		fi
-	fi
-
-	/usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your setup:"
-		/usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}"
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return 1
-	[ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd
-
-	ebegin "Starting collectd"
-	start-stop-daemon --start -c "${COLLECTD_USER}:collectd" \
-		--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
-			-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
-	eend $? "Failed to start collectd"
-}
-
-stop() {
-	ebegin "Stopping collectd"
-	start-stop-daemon --stop \
-		--pidfile "${COLLECTD_PIDFILE}"
-	eend $? "Failed to stop collectd"
-}
-
diff --git a/app-admin/collectd/files/logrotate b/app-admin/collectd/files/logrotate
deleted file mode 100644
index 5d344f6..0000000
--- a/app-admin/collectd/files/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#      /etc/logrotate.d/collectd
-#
-/var/log/collectd.log {
-    daily
-    rotate 5
-    notifempty
-    missingok
-}
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
deleted file mode 100644
index 401f206..0000000
--- a/app-admin/collectd/metadata.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<use>
-		<flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
-		<flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
-		<flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
-		<flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
-		<flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag>
-		<flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag>
-		<flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
-		<flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
-		<flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
-		<flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
-		<flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
-		<flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
-		<flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
-		<flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
-		<flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>
-		<flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
-		<flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
-		<flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
-		<flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag>
-		<flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
-		<flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
-		<flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
-		<flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
-		<flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag>
-		<flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
-		<flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag> 
-		<flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag> 
-		<flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag> 
-		<flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag> 
-		<flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag> 
-		<flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag>
-		<flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag> 
-		<flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag>
-		<flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag>
-		<flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag>
-		<flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag>
-		<flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag>
-		<flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag> 
-		<flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag>
-		<flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag> 
-		<flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag> 
-		<flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag> 
-		<flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag> 
-		<flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag> 
-		<flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag> 
-		<flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag> 
-		<flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag> 
-		<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> 
-		<flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> 
-		<flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> 
-		<flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> 
-		<flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> 
-		<flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag> 
-		<flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag> 
-		<flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> 
-		<flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
-		<flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> 
-		<flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> 
-		<flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> 
-		<flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag> 
-		<flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
-		<flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag> 
-		<flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag> 
-		<flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag>
-		<flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag>
-		<flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag>
-		<flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag>
-		<flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag> 
-		<flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> 
-		<flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> 
-		<flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
-		<flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> 
-		<flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> 
-		<flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
-		<flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> 
-		<flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
-		<flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> 
-		<flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag> 
-		<flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag> 
-		<flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
-		<flag name='contrib'>Install user-contributed files in the doc directory</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-admin/collectd/notes.txt b/app-admin/collectd/notes.txt
deleted file mode 100644
index 5e2ab36..0000000
--- a/app-admin/collectd/notes.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
- 544   * libnatapp (optional)
- 545     Required for the “netapp” plugin.
- 546     This library is part of the “Manage ONTAP SDK” published by NetApp.
-
- 586   * librouteros (optional)
- 587     Used by the `routeros' plugin to connect to a device running `RouterOS'.
- 588     <http://verplant.org/librouteros/>
-
- 596   * librt, libsocket, libkstat, libdevinfo (optional)
- 597     Various standard Solaris libraries which provide system functions.
- 598     <http://developers.sun.com/solaris/>
-
- 625   * libxmms (optional)
- 626     <http://www.xmms.org/>
-
-
-		<flag name='collectd_plugins_apple_sensors'>Build the apple_sensors input plugin (temperature, fanspeed and voltage)</flag>
-		<flag name='collectd_plugins_ipvs'>Build the ipvs input plugin</flag> 
-		<flag name='collectd_plugins_modbus'>Build the modbus input plugin</flag> 
-		<flag name='collectd_plugins_netlink'>Build the netlink input plugin</flag> 
-		<flag name='collectd_plugins_nut'>Build the nut input plugin</flag> 
-		<flag name='collectd_plugins_oracle'>Build the oracle input plugin</flag> 
-		<flag name='collectd_plugins_routeros'>Build the routeros input plugin</flag>
-		<flag name='collectd_plugins_tape'>Build the tape input plugin</flag> 
-		<flag name='collectd_plugins_zfs_arc'>Build the zfs_arc input plugin</flag>
-
-
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.11 )
-	collectd_plugins_modbus?		( dev-libs/libmodbus )
-	collectd_plugins_netlink?		( sys-apps/iproute2 )
-	collectd_plugins_nut?			( >=sys-power/nut-2.2.0 )
-
-	collectd_plugin_kernel_linux ipmi IPMI_HANDLER warn
-	collectd_plugin_kernel_linux ipvs IP_VS warn