1 |
commit: 59ef0b7eab4e17848a7e1a0810fc61fa48b86f6d |
2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
3 |
AuthorDate: Mon Aug 29 01:17:09 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 2 20:47:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ef0b7e |
7 |
|
8 |
net-analyzer/netdata-1.3.0: version bump |
9 |
|
10 |
Gentoo-bug: 592352 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2156 |
12 |
|
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
net-analyzer/netdata/Manifest | 1 + |
16 |
.../{netdata-9999.ebuild => netdata-1.3.0.ebuild} | 22 ++++++++++++++++++---- |
17 |
net-analyzer/netdata/netdata-9999.ebuild | 22 ++++++++++++++++++---- |
18 |
3 files changed, 37 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest |
21 |
index d69d88a..454863c 100644 |
22 |
--- a/net-analyzer/netdata/Manifest |
23 |
+++ b/net-analyzer/netdata/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST netdata-1.2.0.tar.xz 1254000 SHA256 5c1ff3fe0501b654cd92dbba3fe4c0fc125736b58d604340f138df80fb1de1ce SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4 WHIRLPOOL 211fabbecfd4b0ffe8f6fb5dbdc28cf08a743c4544e29dd500187547107500c1b42a95677d8de746cce367d4a59c17ff29328c47b0de65208004e6de65d63277 |
26 |
+DIST netdata-1.3.0.tar.xz 1647708 SHA256 bad5d259467ae42ceb0cf5f03fc4b37d094a81f21a772477e6ccc5b8a778bf15 SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217 WHIRLPOOL 85b87fc6ec76a0255732613606fd4d3000870252c84dbd7be51a2b0132d4d1875d38b61085daeb3ea4e31e522b5e86e05bacf3eb57895ca718cd58501b995955 |
27 |
|
28 |
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-1.3.0.ebuild |
29 |
similarity index 73% |
30 |
copy from net-analyzer/netdata/netdata-9999.ebuild |
31 |
copy to net-analyzer/netdata/netdata-1.3.0.ebuild |
32 |
index ad8fb33..f5951ec 100644 |
33 |
--- a/net-analyzer/netdata/netdata-9999.ebuild |
34 |
+++ b/net-analyzer/netdata/netdata-1.3.0.ebuild |
35 |
@@ -3,8 +3,9 @@ |
36 |
# $Id$ |
37 |
|
38 |
EAPI=6 |
39 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
40 |
|
41 |
-inherit linux-info systemd user fcaps |
42 |
+inherit fcaps linux-info python-r1 systemd user |
43 |
|
44 |
if [[ ${PV} == "9999" ]] ; then |
45 |
EGIT_REPO_URI="git://github.com/firehol/${PN}.git" |
46 |
@@ -21,15 +22,28 @@ HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/" |
47 |
|
48 |
LICENSE="GPL-3+ MIT BSD" |
49 |
SLOT="0" |
50 |
-IUSE="+compression nfacct nodejs" |
51 |
- |
52 |
+IUSE="+compression mysql nfacct nodejs +python" |
53 |
+REQUIRED_USE=" |
54 |
+ mysql? ( python ) |
55 |
+ python? ( ${PYTHON_REQUIRED_USE} )" |
56 |
# most unconditional dependencies are for plugins.d/charts.d.plugin: |
57 |
RDEPEND=" |
58 |
>=app-shells/bash-4:0 |
59 |
net-misc/curl |
60 |
net-misc/wget |
61 |
virtual/awk |
62 |
+ net-libs/libmnl |
63 |
+ || ( net-analyzer/netcat6 net-analyzer/netcat ) |
64 |
+ net-analyzer/tcpdump |
65 |
+ net-analyzer/traceroute |
66 |
compression? ( sys-libs/zlib ) |
67 |
+ python? ( |
68 |
+ ${PYTHON_DEPS} |
69 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
70 |
+ mysql? ( |
71 |
+ || ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] ) |
72 |
+ ) |
73 |
+ ) |
74 |
nfacct? ( |
75 |
net-firewall/nfacct |
76 |
net-libs/libmnl |
77 |
@@ -74,7 +88,7 @@ src_install() { |
78 |
fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata |
79 |
fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata |
80 |
|
81 |
- chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || die |
82 |
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN} |
83 |
|
84 |
newinitd system/netdata-openrc ${PN} |
85 |
systemd_dounit system/netdata.service |
86 |
|
87 |
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild |
88 |
index ad8fb33..f5951ec 100644 |
89 |
--- a/net-analyzer/netdata/netdata-9999.ebuild |
90 |
+++ b/net-analyzer/netdata/netdata-9999.ebuild |
91 |
@@ -3,8 +3,9 @@ |
92 |
# $Id$ |
93 |
|
94 |
EAPI=6 |
95 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
96 |
|
97 |
-inherit linux-info systemd user fcaps |
98 |
+inherit fcaps linux-info python-r1 systemd user |
99 |
|
100 |
if [[ ${PV} == "9999" ]] ; then |
101 |
EGIT_REPO_URI="git://github.com/firehol/${PN}.git" |
102 |
@@ -21,15 +22,28 @@ HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/" |
103 |
|
104 |
LICENSE="GPL-3+ MIT BSD" |
105 |
SLOT="0" |
106 |
-IUSE="+compression nfacct nodejs" |
107 |
- |
108 |
+IUSE="+compression mysql nfacct nodejs +python" |
109 |
+REQUIRED_USE=" |
110 |
+ mysql? ( python ) |
111 |
+ python? ( ${PYTHON_REQUIRED_USE} )" |
112 |
# most unconditional dependencies are for plugins.d/charts.d.plugin: |
113 |
RDEPEND=" |
114 |
>=app-shells/bash-4:0 |
115 |
net-misc/curl |
116 |
net-misc/wget |
117 |
virtual/awk |
118 |
+ net-libs/libmnl |
119 |
+ || ( net-analyzer/netcat6 net-analyzer/netcat ) |
120 |
+ net-analyzer/tcpdump |
121 |
+ net-analyzer/traceroute |
122 |
compression? ( sys-libs/zlib ) |
123 |
+ python? ( |
124 |
+ ${PYTHON_DEPS} |
125 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
126 |
+ mysql? ( |
127 |
+ || ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] ) |
128 |
+ ) |
129 |
+ ) |
130 |
nfacct? ( |
131 |
net-firewall/nfacct |
132 |
net-libs/libmnl |
133 |
@@ -74,7 +88,7 @@ src_install() { |
134 |
fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata |
135 |
fowners ${NETDATA_USER}:${NETDATA_GROUP} /var/cache/netdata |
136 |
|
137 |
- chown -Rc ${NETDATA_USER}:${NETDATA_GROUP} "${ED}"/usr/share/${PN} || die |
138 |
+ fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /usr/share/${PN} |
139 |
|
140 |
newinitd system/netdata-openrc ${PN} |
141 |
systemd_dounit system/netdata.service |