commit:     59ef0b7eab4e17848a7e1a0810fc61fa48b86f6d
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Mon Aug 29 01:17:09 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 20:47:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ef0b7e

net-analyzer/netdata-1.3.0: version bump

Gentoo-bug: 592352
Closes: https://github.com/gentoo/gentoo/pull/2156

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-analyzer/netdata/Manifest                      |  1 +
 .../{netdata-9999.ebuild => netdata-1.3.0.ebuild}  | 22 ++++++++++++++++++----
 net-analyzer/netdata/netdata-9999.ebuild           | 22 ++++++++++++++++++----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index d69d88a..454863c 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1 +1,2 @@
 DIST netdata-1.2.0.tar.xz 1254000 SHA256 
5c1ff3fe0501b654cd92dbba3fe4c0fc125736b58d604340f138df80fb1de1ce SHA512 
0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4
 WHIRLPOOL 
211fabbecfd4b0ffe8f6fb5dbdc28cf08a743c4544e29dd500187547107500c1b42a95677d8de746cce367d4a59c17ff29328c47b0de65208004e6de65d63277
+DIST netdata-1.3.0.tar.xz 1647708 SHA256 
bad5d259467ae42ceb0cf5f03fc4b37d094a81f21a772477e6ccc5b8a778bf15 SHA512 
0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217
 WHIRLPOOL 
85b87fc6ec76a0255732613606fd4d3000870252c84dbd7be51a2b0132d4d1875d38b61085daeb3ea4e31e522b5e86e05bacf3eb57895ca718cd58501b995955

diff --git a/net-analyzer/netdata/netdata-9999.ebuild 
b/net-analyzer/netdata/netdata-1.3.0.ebuild
similarity index 73%
copy from net-analyzer/netdata/netdata-9999.ebuild
copy to net-analyzer/netdata/netdata-1.3.0.ebuild
index ad8fb33..f5951ec 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-1.3.0.ebuild
@@ -3,8 +3,9 @@
 # $Id$
 
 EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
-inherit linux-info systemd user fcaps
+inherit fcaps linux-info python-r1 systemd user
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="git://github.com/firehol/${PN}.git"
@@ -21,15 +22,28 @@ HOMEPAGE="https://github.com/firehol/netdata 
https://my-netdata.io/";
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="+compression nfacct nodejs"
-
+IUSE="+compression mysql nfacct nodejs +python"
+REQUIRED_USE="
+       mysql? ( python )
+       python? ( ${PYTHON_REQUIRED_USE} )"
 # most unconditional dependencies are for plugins.d/charts.d.plugin:
 RDEPEND="
        >=app-shells/bash-4:0
        net-misc/curl
        net-misc/wget
        virtual/awk
+       net-libs/libmnl
+       || ( net-analyzer/netcat6 net-analyzer/netcat )
+       net-analyzer/tcpdump
+       net-analyzer/traceroute
        compression? ( sys-libs/zlib )
+       python? (
+               ${PYTHON_DEPS}
+               dev-python/pyyaml[${PYTHON_USEDEP}]
+               mysql? (
+                       || ( dev-python/mysqlclient[${PYTHON_USEDEP}] 
dev-python/mysql-python[${PYTHON_USEDEP}] )
+               )
+       )
        nfacct? (
                net-firewall/nfacct
                net-libs/libmnl
@@ -74,7 +88,7 @@ src_install() {
        fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
        fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
 
-       chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || 
die
+       fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN}
 
        newinitd system/netdata-openrc ${PN}
        systemd_dounit system/netdata.service

diff --git a/net-analyzer/netdata/netdata-9999.ebuild 
b/net-analyzer/netdata/netdata-9999.ebuild
index ad8fb33..f5951ec 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -3,8 +3,9 @@
 # $Id$
 
 EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
-inherit linux-info systemd user fcaps
+inherit fcaps linux-info python-r1 systemd user
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="git://github.com/firehol/${PN}.git"
@@ -21,15 +22,28 @@ HOMEPAGE="https://github.com/firehol/netdata 
https://my-netdata.io/";
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="+compression nfacct nodejs"
-
+IUSE="+compression mysql nfacct nodejs +python"
+REQUIRED_USE="
+       mysql? ( python )
+       python? ( ${PYTHON_REQUIRED_USE} )"
 # most unconditional dependencies are for plugins.d/charts.d.plugin:
 RDEPEND="
        >=app-shells/bash-4:0
        net-misc/curl
        net-misc/wget
        virtual/awk
+       net-libs/libmnl
+       || ( net-analyzer/netcat6 net-analyzer/netcat )
+       net-analyzer/tcpdump
+       net-analyzer/traceroute
        compression? ( sys-libs/zlib )
+       python? (
+               ${PYTHON_DEPS}
+               dev-python/pyyaml[${PYTHON_USEDEP}]
+               mysql? (
+                       || ( dev-python/mysqlclient[${PYTHON_USEDEP}] 
dev-python/mysql-python[${PYTHON_USEDEP}] )
+               )
+       )
        nfacct? (
                net-firewall/nfacct
                net-libs/libmnl
@@ -74,7 +88,7 @@ src_install() {
        fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
        fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata
 
-       chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || 
die
+       fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN}
 
        newinitd system/netdata-openrc ${PN}
        systemd_dounit system/netdata.service

Reply via email to