app-admin/collectd: Drop vserver support (#472170)

Package-Manager: portage-2.2.26

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index 5b6a9550fb960a4c760a6c95c2b2b1bf0515ffd1..a7fc037f2f93a9c3ff46d450937c1c57f894630d 100644 (file)
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
        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
+       tokyotyrant unixsock uptime users uuid varnish vmem wireless
        write_graphite write_http write_mongodb"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -107,9 +107,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       kernel_linux? (
-               collectd_plugins_vserver?       ( sys-kernel/vserver-sources )
-       )"
+"
 
 RDEPEND="${COMMON_DEPEND}
        collectd_plugins_java?                  ( >=virtual/jre-1.6 )
@@ -240,7 +238,7 @@ src_configure() {
        # 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
+               memory md netlink nfs numa processes serial swap tcpconns thermal users vmem
                wireless"
 
        local libstatgrab_plugins="cpu disk interface load memory swap users"

diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
index 64af3dd795ef7d7825257d34e0f26566e2b04f8d..d32eaf8e0e294b840b778443fa420be923d5b631 100644 (file)
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind ceph
        rrdcached rrdtool sensors serial smart snmp statsd swap syslog table tail
        target_notification target_replace target_scale target_set tcpconns teamspeak2
        ted thermal threshold tokyotyrant turbostat unixsock uptime users uuid varnish
-       virt vmem vserver wireless write_graphite write_http write_log write_mongodb
+       virt vmem wireless write_graphite write_http write_log write_mongodb
        write_redis write_sensu write_tsdb zfs_arc zookeeper"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -113,9 +113,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       kernel_linux? (
-               collectd_plugins_vserver?       ( sys-kernel/vserver-sources )
-       )"
+"
 
 RDEPEND="${COMMON_DEPEND}
        collectd_plugins_java?                  ( >=virtual/jre-1.6 )
@@ -250,7 +248,7 @@ src_configure() {
        local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
                ethstat interface iptables ipvs irq ipc load memory md netlink nfs
                numa processes serial swap tcpconns thermal turbostat users vmem
-               vserver wireless zfs_arc"
+               wireless zfs_arc"
 
        local libstatgrab_plugins="cpu disk interface load memory swap users"
        local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc"