app-admin/collectd: Adjust dependency on sys-power/nut (#540750)

Bug: https://bugs.gentoo.org/show_bug.cgi?id=540750

Package-Manager: portage-2.2.27

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index a7fc037f2f93a9c3ff46d450937c1c57f894630d..feea5d7479aae0ad46b47ddc0789b42f088210cd 100644 (file)
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools base eutils java-pkg-opt-2 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"
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
 HOMEPAGE="http://collectd.org"
 SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
@@ -77,13 +77,13 @@ COMMON_DEPEND="
        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_notify_email?          ( net-libs/libesmtp dev-libs/openssl:= )
+       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
        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_postgresql?            ( dev-db/postgresql:= )
        collectd_plugins_python?                ( ${PYTHON_DEPS} )
        collectd_plugins_routeros?              ( net-libs/librouteros )
        collectd_plugins_rrdcached?             ( net-analyzer/rrdtool )

diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
index d32eaf8e0e294b840b778443fa420be923d5b631..a06c442ca531328df3dd125238f40ba5134a1834 100644 (file)
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
        collectd_plugins_nginx?                 ( net-misc/curl )
        collectd_plugins_notify_desktop?        ( x11-libs/libnotify:= )
        collectd_plugins_notify_email?  ( net-libs/libesmtp dev-libs/openssl:0= )
-       collectd_plugins_nut?                   ( sys-power/nut )
+       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
        collectd_plugins_onewire?               ( sys-fs/owfs )
        collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
        collectd_plugins_openldap?              ( net-nds/openldap )

diff --git a/app-admin/collectd/collectd-5.5.1.ebuild b/app-admin/collectd/collectd-5.5.1.ebuild
index 63ded29fcb5e69cf3c8b7a6238aec4672557e156..5d65a4a59d3fd08e22b72b1f882011752dcf5de0 100644 (file)
--- a/app-admin/collectd/collectd-5.5.1.ebuild
+++ b/app-admin/collectd/collectd-5.5.1.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
        collectd_plugins_nginx?                 ( net-misc/curl )
        collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
        collectd_plugins_notify_email?          ( net-libs/libesmtp )
-       collectd_plugins_nut?                   ( sys-power/nut )
+       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
        collectd_plugins_openldap?              ( net-nds/openldap )
        collectd_plugins_onewire?               ( >=sys-fs/owfs-3.1 )
        collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )