diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2016-03-02 10:40:17 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2016-03-02 10:40:17 +0800 |
| commit | 0d6cb9a67a8c1e4c6fd908ac6ff8e55524bffaee (patch) | |
| tree | e7438e3b76a2aaa9a54e1aafd9d0521268b806f2 | |
| parent | net-misc/curl: use slot operator of openssl (bug #575548) (diff) | |
| parent | app-admin/collectd: Adjust dependency on sys-power/nut (#540750) (diff) | |
| download | gentoo-0d6cb9a6.tar.gz gentoo-0d6cb9a6.tar.bz2 gentoo-0d6cb9a6.zip | |
Merge remote-tracking branch 'remotes/Whissi/gentoo-bug-540750'
Pull request: https://github.com/gentoo/gentoo/pull/958
| -rw-r--r-- | app-admin/collectd/collectd-5.4.1-r2.ebuild | 10 | ||||
| -rw-r--r-- | app-admin/collectd/collectd-5.5.0.ebuild | 2 | ||||
| -rw-r--r-- | app-admin/collectd/collectd-5.5.1.ebuild | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild index a7fc037f2f93..feea5d7479aa 100644 --- 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 d32eaf8e0e29..a06c442ca531 100644 --- 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 63ded29fcb5e..5d65a4a59d3f 100644 --- 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 ) |