summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2016-04-03 23:26:14 +0100
committerJames Le Cuirot <chewi@gentoo.org>2016-04-03 23:34:29 +0100
commitf39f8f41fffd09a995d6551a17203e8436f98e18 (patch)
tree7f6e4f37498c51587a11430c2162fd5e1c09153b /app-admin/collectd
parentdev-java/java-config: Remove old 2.2.0 (diff)
downloadgentoo-f39f8f41fffd09a995d6551a17203e8436f98e18.tar.gz
gentoo-f39f8f41fffd09a995d6551a17203e8436f98e18.tar.bz2
gentoo-f39f8f41fffd09a995d6551a17203e8436f98e18.zip
app-admin/collectd: Remove java-config-wrapper dependency (again)
I made this change for a reason and asked for feedback (bug #558310) before I did so. Please do me the same courtesy by at least asking before you undo my changes. java-config-wrapper is being masked so this has to change now. Package-Manager: portage-2.2.28
Diffstat (limited to 'app-admin/collectd')
-rw-r--r--app-admin/collectd/collectd-5.5.1-r3.ebuild (renamed from app-admin/collectd/collectd-5.5.1-r2.ebuild)4
1 files changed, 2 insertions, 2 deletions
diff --git a/app-admin/collectd/collectd-5.5.1-r2.ebuild b/app-admin/collectd/collectd-5.5.1-r3.ebuild
index 69290da9bfb3..81bf0c29c19d 100644
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r3.ebuild
@@ -76,11 +76,9 @@ COMMON_DEPEND="
collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2:= )
collectd_plugins_dbi? ( dev-db/libdbi )
collectd_plugins_dns? ( net-libs/libpcap )
- collectd_plugins_genericjmx? ( virtual/jre:= dev-java/java-config-wrapper )
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_log_logstash? ( dev-libs/yajl )
collectd_plugins_lvm? ( sys-fs/lvm2 )
collectd_plugins_memcachec? ( dev-libs/libmemcached )
@@ -133,6 +131,8 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_genericjmx? ( >=virtual/jre-1.6 )
+ collectd_plugins_java? ( >=virtual/jre-1.6 )
collectd_plugins_syslog? ( virtual/logger )
selinux? ( sec-policy/selinux-collectd )"