app-admin/collectd: Remove old
authorJames Le Cuirot <chewi@gentoo.org>
Thu, 3 Sep 2015 09:00:14 +0000 (10:00 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Thu, 3 Sep 2015 09:00:14 +0000 (10:00 +0100)
Package-Manager: portage-2.2.20.1

app-admin/collectd/Manifest
app-admin/collectd/collectd-5.4.0.ebuild [deleted file]
app-admin/collectd/collectd-5.4.1-r1.ebuild [deleted file]
app-admin/collectd/collectd-5.4.1.ebuild [deleted file]
app-admin/collectd/files/collectd-4.10.2-libocci.patch [deleted file]
app-admin/collectd/files/collectd-4.10.2-nohal.patch [deleted file]
app-admin/collectd/files/collectd-5.1.0-libperl.patch [deleted file]
app-admin/collectd/files/collectd-5.1.1-lt.patch [deleted file]

index 6698b99e6355aa226058ab71d8e3c30ba0c710ef..3bb23b29a92234b1b90702aa96adc6b6aa6120e2 100644 (file)
@@ -1,2 +1 @@
-DIST collectd-5.4.0.tar.bz2 1506520 SHA256 90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e SHA512 10de94d082e6bf2e0a8e2f0b179868c0f25b223c61cb8a5fda641d01f90d6332062459410d54d74a4d666f7149bb429976e9542dabeda988ed6772df9001b222 WHIRLPOOL 19db89217dfaf38fd358a60a64155e01bd68d4c8ca4fad13b97667eb3e4e4d8dbe4e9cae8568e970d8d6fe5e8dde960b06159b3026d1a554fad7a455f973ff0a
 DIST collectd-5.4.1.tar.bz2 1521907 SHA256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492 WHIRLPOOL 2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
diff --git a/app-admin/collectd/collectd-5.4.0.ebuild b/app-admin/collectd/collectd-5.4.0.ebuild
deleted file mode 100644 (file)
index 6e56ffb..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools base eutils linux-info multilib perl-app systemd user
-
-DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
-
-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 selinux 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="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
-       tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
-       conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
-       email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
-       iptables irq java libvirt load logfile lvm madwifi match_empty_counter
-       match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
-       memory multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
-       powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
-       sensors serial snmp statsd swap syslog table tail target_notification
-       target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
-       tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
-       write_graphite write_http write_mongodb"
-
-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:0
-       sys-devel/libtool
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       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.13 )
-       collectd_plugins_java?                  ( virtual/jre dev-java/java-config-wrapper )
-       collectd_plugins_libvirt?               ( app-emulation/libvirt dev-libs/libxml2 )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp dev-libs/openssl )
-       collectd_plugins_nut?                   ( sys-power/nut )
-       collectd_plugins_onewire?               ( sys-fs/owfs )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql )
-       collectd_plugins_python?                ( =dev-lang/python-2* )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool )
-       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 )
-       collectd_plugins_write_mongodb?         ( dev-libs/mongo-c-driver )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab )
-               collectd_plugins_load?          ( sys-libs/libstatgrab )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab )
-               collectd_plugins_users?         ( sys-libs/libstatgrab )
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig
-       kernel_linux? (
-               collectd_plugins_vserver?       ( sys-kernel/vserver-sources )
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                                ( sec-policy/selinux-collectd )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.10.2"-{libocci,nohal}.patch
-       "${FILESDIR}/${PN}-4.10.3"-werror.patch
-       "${FILESDIR}/${PN}-5.1.0"-libperl.patch
-       "${FILESDIR}/${PN}-5.1.1"-lt.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plug-in name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-       local multi_opt opt
-       if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-               if use collectd_plugins_${1}; then
-                       for opt in ${2}; do
-                               if linux_chkconfig_present ${opt}; then return 0; fi
-                       done
-                       multi_opt=${2//\ /\ or\ }
-                       case ${3} in
-                               (info)
-                                       elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (warn)
-                                       ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (error)
-                                       eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (*)
-                                       die "function collectd_plugin_kernel_linux called with invalid third argument"
-                               ;;
-                       esac
-               fi
-       fi
-}
-
-collectd_linux_kernel_checks() {
-       linux-info_pkg_setup
-
-       # battery.c:/proc/pmu/battery_%i
-       # battery.c:/proc/acpi/battery
-       collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-       # cgroups.c:/sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS 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
-
-       sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || 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 ethstat interface iptables ipvs irq load
-               memory md netlink nfs numa 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
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # 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
-
-       perl_delete_localpod
-
-       find "${D}/usr/" -name "*.la" -exec rm -f {} +
-
-       # 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}
-       systemd_dounit "contrib/${PN}.service"
-
-       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"
-       collectd_rdeps write_mongodb "dev-db/mongodb"
-
-       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.4.1-r1.ebuild b/app-admin/collectd/collectd-5.4.1-r1.ebuild
deleted file mode 100644 (file)
index e0c3192..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools base eutils linux-info multilib perl-app python-single-r1 systemd user
-
-DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
-
-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 selinux 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="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
-       tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
-       conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
-       email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
-       iptables irq java libvirt load logfile lvm madwifi match_empty_counter
-       match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
-       memory multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
-       powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
-       sensors serial snmp statsd swap syslog table tail target_notification
-       target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
-       tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
-       write_graphite write_http write_mongodb"
-
-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:0
-       sys-devel/libtool
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       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.13 )
-       collectd_plugins_java?                  ( virtual/jre dev-java/java-config-wrapper )
-       collectd_plugins_libvirt?               ( app-emulation/libvirt dev-libs/libxml2 )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp dev-libs/openssl )
-       collectd_plugins_nut?                   ( sys-power/nut )
-       collectd_plugins_onewire?               ( sys-fs/owfs )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql )
-       collectd_plugins_python?                ( ${PYTHON_DEPS} )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool )
-       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 )
-       collectd_plugins_write_mongodb?         ( dev-libs/mongo-c-driver )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab )
-               collectd_plugins_load?          ( sys-libs/libstatgrab )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab )
-               collectd_plugins_users?         ( sys-libs/libstatgrab )
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig
-       kernel_linux? (
-               collectd_plugins_vserver?       ( sys-kernel/vserver-sources )
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                                ( sec-policy/selinux-collectd )"
-
-REQUIRED_USE="
-       collectd_plugins_python?                ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-5.4.1"-{nohal,libocci,libperl,lt}.patch
-       "${FILESDIR}/${PN}-4.10.3"-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
-
-       # cgroups.c:/sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS 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
-
-       use collectd_plugins_python && python-single-r1_pkg_setup
-
-       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
-
-       sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || 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 ethstat interface iptables ipvs irq load
-               memory md netlink nfs numa 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
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # 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
-
-       perl_delete_localpod
-
-       find "${D}/usr/" -name "*.la" -exec rm -f {} +
-
-       # 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}
-       systemd_dounit "contrib/${PN}.service"
-
-       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"
-       collectd_rdeps write_mongodb "dev-db/mongodb"
-
-       echo
-       elog "collectd is now started as unprivileged user by default."
-       elog "You may want to revisit 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.4.1.ebuild b/app-admin/collectd/collectd-5.4.1.ebuild
deleted file mode 100644 (file)
index 554a27e..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools base eutils linux-info multilib perl-app systemd user
-
-DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
-
-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 selinux 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="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
-       tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
-       conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
-       email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
-       iptables irq java libvirt load logfile lvm madwifi match_empty_counter
-       match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
-       memory multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
-       powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
-       sensors serial snmp statsd swap syslog table tail target_notification
-       target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
-       tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
-       write_graphite write_http write_mongodb"
-
-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:0
-       sys-devel/libtool
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       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.13 )
-       collectd_plugins_java?                  ( virtual/jre dev-java/java-config-wrapper )
-       collectd_plugins_libvirt?               ( app-emulation/libvirt dev-libs/libxml2 )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp dev-libs/openssl )
-       collectd_plugins_nut?                   ( sys-power/nut )
-       collectd_plugins_onewire?               ( sys-fs/owfs )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql )
-       collectd_plugins_python?                ( =dev-lang/python-2* )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool )
-       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 )
-       collectd_plugins_write_mongodb?         ( dev-libs/mongo-c-driver )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab )
-               collectd_plugins_load?          ( sys-libs/libstatgrab )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab )
-               collectd_plugins_users?         ( sys-libs/libstatgrab )
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig
-       kernel_linux? (
-               collectd_plugins_vserver?       ( sys-kernel/vserver-sources )
-       )"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                                ( sec-policy/selinux-collectd )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-5.4.1"-{nohal,libocci,libperl,lt}.patch
-       "${FILESDIR}/${PN}-4.10.3"-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
-
-       # cgroups.c:/sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS 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
-
-       sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || 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 ethstat interface iptables ipvs irq load
-               memory md netlink nfs numa 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
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # 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
-
-       perl_delete_localpod
-
-       find "${D}/usr/" -name "*.la" -exec rm -f {} +
-
-       # 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}
-       systemd_dounit "contrib/${PN}.service"
-
-       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"
-       collectd_rdeps write_mongodb "dev-db/mongodb"
-
-       echo
-       elog "collectd is now started as unprivileged user by default."
-       elog "You may want to revisit 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/files/collectd-4.10.2-libocci.patch b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
deleted file mode 100644 (file)
index 2ae42dc..0000000
+++ /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 (file)
index a82a3bc..0000000
+++ /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-5.1.0-libperl.patch b/app-admin/collectd/files/collectd-5.1.0-libperl.patch
deleted file mode 100644 (file)
index 9a44d5b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 1cfc2fc..384c298 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2944,11 +2944,13 @@ if test "x$with_libperl" = "xyes" \
- 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 -lpthread"
-   AC_CACHE_CHECK([for libperl],
-     [c_cv_have_libperl],
-@@ -2967,7 +2969,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
-                        Nullsv);
-       ]]),
-       [c_cv_have_libperl="yes"],
--      [c_cv_have_libperl="no"]
-+      [ 
-+        c_cv_have_libperl="no" 
-+        LIBS="$SAVE_LIBS"
-+      ]
-     )
-   )
\ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.1.1-lt.patch b/app-admin/collectd/files/collectd-5.1.1-lt.patch
deleted file mode 100644 (file)
index 4aa734b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 5267123..a7e0d0c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,4 @@
--ACLOCAL_AMFLAGS = -I libltdl/m4
--
--SUBDIRS = libltdl src bindings .
-+SUBDIRS = src bindings .
- INCLUDES = $(LTDLINCL)
-diff --git a/configure.in b/configure.in
-index eff8d61..a22a561 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config])
- 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.])
-@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION],
-        AC_SUBST(LTDLINCL)
-        AC_SUBST(LIBLTDL)
-        AC_LIBTOOL_DLOPEN
--       AC_CONFIG_SUBDIRS(libltdl)
-        AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
-       ]
- )
\ No newline at end of file