1 |
commit: 28efa0b57547e2784ae33d273b500fe4aab84e52 |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 19 18:42:29 2019 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 19 18:42:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28efa0b5 |
7 |
|
8 |
net-analyzer/netdata: Make xen and cups plugins optional |
9 |
|
10 |
Closes: https://bugs.gentoo.org/683838 |
11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
13 |
|
14 |
net-analyzer/netdata/metadata.xml | 1 + |
15 |
.../netdata/{netdata-9999.ebuild => netdata-1.14.0-r1.ebuild} | 9 ++++++++- |
16 |
net-analyzer/netdata/netdata-9999.ebuild | 9 ++++++++- |
17 |
3 files changed, 17 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml |
20 |
index 04af360a6e2..06a8ae53618 100644 |
21 |
--- a/net-analyzer/netdata/metadata.xml |
22 |
+++ b/net-analyzer/netdata/metadata.xml |
23 |
@@ -11,6 +11,7 @@ |
24 |
<flag name="nfacct">Enable the nfacct plugin</flag> |
25 |
<flag name="nodejs">Enable use of nodejs (which some plugins use)</flag> |
26 |
<flag name="tor">Enable monitoring of tor</flag> |
27 |
+ <flag name="xen">Enable monitoring of xen</flag> |
28 |
</use> |
29 |
<upstream> |
30 |
<remote-id type="github">netdata/netdata</remote-id> |
31 |
|
32 |
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild |
33 |
similarity index 91% |
34 |
copy from net-analyzer/netdata/netdata-9999.ebuild |
35 |
copy to net-analyzer/netdata/netdata-1.14.0-r1.ebuild |
36 |
index 59396a96cc0..54d150969d3 100644 |
37 |
--- a/net-analyzer/netdata/netdata-9999.ebuild |
38 |
+++ b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild |
39 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" |
40 |
|
41 |
LICENSE="GPL-3+ MIT BSD" |
42 |
SLOT="0" |
43 |
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor" |
44 |
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen" |
45 |
REQUIRED_USE=" |
46 |
mysql? ( python ) |
47 |
python? ( ${PYTHON_REQUIRED_USE} ) |
48 |
@@ -40,6 +40,7 @@ RDEPEND=" |
49 |
sys-apps/util-linux |
50 |
virtual/awk |
51 |
caps? ( sys-libs/libcap ) |
52 |
+ cups? ( net-print/cups ) |
53 |
compression? ( sys-libs/zlib ) |
54 |
ipmi? ( sys-libs/freeipmi ) |
55 |
nfacct? ( |
56 |
@@ -58,6 +59,10 @@ RDEPEND=" |
57 |
) |
58 |
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
59 |
tor? ( net-libs/stem[${PYTHON_USEDEP}] ) |
60 |
+ ) |
61 |
+ xen? ( |
62 |
+ app-emulation/xen-tools |
63 |
+ dev-libs/yajl |
64 |
)" |
65 |
DEPEND="${RDEPEND} |
66 |
virtual/pkgconfig" |
67 |
@@ -85,8 +90,10 @@ src_configure() { |
68 |
econf \ |
69 |
--localstatedir="${EPREFIX}"/var \ |
70 |
--with-user=${NETDATA_USER} \ |
71 |
+ $(use_enable cups plugin-cups) \ |
72 |
$(use_enable nfacct plugin-nfacct) \ |
73 |
$(use_enable ipmi plugin-freeipmi) \ |
74 |
+ $(use_enable xen plugin-xenstat) \ |
75 |
$(use_enable cpu_flags_x86_sse2 x86-sse) \ |
76 |
$(use_with compression zlib) |
77 |
} |
78 |
|
79 |
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild |
80 |
index 59396a96cc0..54d150969d3 100644 |
81 |
--- a/net-analyzer/netdata/netdata-9999.ebuild |
82 |
+++ b/net-analyzer/netdata/netdata-9999.ebuild |
83 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" |
84 |
|
85 |
LICENSE="GPL-3+ MIT BSD" |
86 |
SLOT="0" |
87 |
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor" |
88 |
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen" |
89 |
REQUIRED_USE=" |
90 |
mysql? ( python ) |
91 |
python? ( ${PYTHON_REQUIRED_USE} ) |
92 |
@@ -40,6 +40,7 @@ RDEPEND=" |
93 |
sys-apps/util-linux |
94 |
virtual/awk |
95 |
caps? ( sys-libs/libcap ) |
96 |
+ cups? ( net-print/cups ) |
97 |
compression? ( sys-libs/zlib ) |
98 |
ipmi? ( sys-libs/freeipmi ) |
99 |
nfacct? ( |
100 |
@@ -58,6 +59,10 @@ RDEPEND=" |
101 |
) |
102 |
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
103 |
tor? ( net-libs/stem[${PYTHON_USEDEP}] ) |
104 |
+ ) |
105 |
+ xen? ( |
106 |
+ app-emulation/xen-tools |
107 |
+ dev-libs/yajl |
108 |
)" |
109 |
DEPEND="${RDEPEND} |
110 |
virtual/pkgconfig" |
111 |
@@ -85,8 +90,10 @@ src_configure() { |
112 |
econf \ |
113 |
--localstatedir="${EPREFIX}"/var \ |
114 |
--with-user=${NETDATA_USER} \ |
115 |
+ $(use_enable cups plugin-cups) \ |
116 |
$(use_enable nfacct plugin-nfacct) \ |
117 |
$(use_enable ipmi plugin-freeipmi) \ |
118 |
+ $(use_enable xen plugin-xenstat) \ |
119 |
$(use_enable cpu_flags_x86_sse2 x86-sse) \ |
120 |
$(use_with compression zlib) |
121 |
} |