Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/
Date: Mon, 23 Jan 2017 21:19:39
Message-Id: 1485206368.6b772bf4cab6d9a65e67519b9ee167e59331447c.soap@gentoo
1 commit: 6b772bf4cab6d9a65e67519b9ee167e59331447c
2 Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
3 AuthorDate: Mon Jan 23 14:52:08 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 21:19:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b772bf4
7
8 net-analyzer/netdata: version bump to 1.5.0
9
10 Closes: https://github.com/gentoo/gentoo/pull/3607
11
12 net-analyzer/netdata/Manifest | 1 +
13 .../{netdata-9999.ebuild => netdata-1.5.0.ebuild} | 17 ++++++++++-------
14 net-analyzer/netdata/netdata-9999.ebuild | 17 ++++++++++-------
15 3 files changed, 21 insertions(+), 14 deletions(-)
16
17 diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
18 index 80de796..10e5d74 100644
19 --- a/net-analyzer/netdata/Manifest
20 +++ b/net-analyzer/netdata/Manifest
21 @@ -1,3 +1,4 @@
22 DIST netdata-1.2.0.tar.xz 1254000 SHA256 5c1ff3fe0501b654cd92dbba3fe4c0fc125736b58d604340f138df80fb1de1ce SHA512 0c43e89c7cb52a5dde2aec13b06496ffb70fcb1952cf74156bd4400f3520b4136a94b5390077a4e5e3278a8e175dcc14505a456efafec5fdf0759af4846e03f4 WHIRLPOOL 211fabbecfd4b0ffe8f6fb5dbdc28cf08a743c4544e29dd500187547107500c1b42a95677d8de746cce367d4a59c17ff29328c47b0de65208004e6de65d63277
23 DIST netdata-1.3.0.tar.xz 1647708 SHA256 bad5d259467ae42ceb0cf5f03fc4b37d094a81f21a772477e6ccc5b8a778bf15 SHA512 0e96f12cbeb7aeecb07b885a0f10940022741633e5cfd76d9f79c9efe3bce2583d96ae18995831fc48d6724f65357929dc5a4220521230ecfb8517f15e779217 WHIRLPOOL 85b87fc6ec76a0255732613606fd4d3000870252c84dbd7be51a2b0132d4d1875d38b61085daeb3ea4e31e522b5e86e05bacf3eb57895ca718cd58501b995955
24 DIST netdata-1.4.0.tar.xz 1801440 SHA256 22e293aae156759d220b36ff02fa496548e7386cb4ee53df660fde57418e69ea SHA512 b5f60931372f0c6a437d1340bd9bb07557d8a9ffb478381715495c09c9b9bcf71f287c2e47be40945149a268e0f666289c75cc4eb1d1ab6fc73988f6b71daaf3 WHIRLPOOL ae70a9bca7bf107610e4a81b71f1728a5ffb0721e1c5d53bd2025b8897dbdd6c3569b58bd285e2961243f7d1b501b8ea69c258b5b266ee0bdf04092f62fee249
25 +DIST netdata-1.5.0.tar.gz 2257299 SHA256 8f66e40ba72ebf5c6e478197eaee3099823fd6380c0870b201f53b5423945338 SHA512 54477c0f9fe2c920580e2e6c3f6c12828f3be2c3dfc1fee47ad98cab51ae3652cb3f223413e9de9399487a35ce844d502ce12fbf615102c0e1962b7dc96a9d95 WHIRLPOOL 2a57636b8ddc6991b6ce18fdb4be73fbd4f658ae0e152eb3c50400c062df87931b3d43b04a31b3857753f7d9ae2ea1a0e62c5235088e20629df1b95abfaf8821
26
27 diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-1.5.0.ebuild
28 similarity index 83%
29 copy from net-analyzer/netdata/netdata-9999.ebuild
30 copy to net-analyzer/netdata/netdata-1.5.0.ebuild
31 index e2a78bc..ce0d866 100644
32 --- a/net-analyzer/netdata/netdata-9999.ebuild
33 +++ b/net-analyzer/netdata/netdata-1.5.0.ebuild
34 @@ -1,19 +1,19 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 +# Copyright 1999-2017 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38 # $Id$
39
40 EAPI=6
41 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
42
43 -inherit fcaps linux-info python-r1 systemd user
44 +inherit autotools fcaps linux-info python-r1 systemd user
45
46 if [[ ${PV} == "9999" ]] ; then
47 EGIT_REPO_URI="git://github.com/firehol/${PN}.git"
48 - inherit git-r3 autotools
49 + inherit git-r3
50 SRC_URI=""
51 KEYWORDS=""
52 else
53 - SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
54 + SRC_URI="https://github.com/firehol/netdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
55 KEYWORDS="~amd64 ~x86"
56 fi
57
58 @@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
59
60 LICENSE="GPL-3+ MIT BSD"
61 SLOT="0"
62 -IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs +python"
63 +IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs postgres +python"
64 REQUIRED_USE="
65 mysql? ( python )
66 python? ( ${PYTHON_REQUIRED_USE} )"
67 @@ -43,6 +43,9 @@ RDEPEND="
68 mysql? (
69 || ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
70 )
71 + postgres? (
72 + dev-python/psycopg:2[${PYTHON_USEDEP}]
73 + )
74 )
75 nfacct? (
76 net-firewall/nfacct
77 @@ -71,12 +74,12 @@ pkg_setup() {
78
79 src_prepare() {
80 default
81 - [[ ${PV} == "9999" ]] && eautoreconf
82 + eautoreconf
83 }
84
85 src_configure() {
86 econf \
87 - --localstatedir=/var \
88 + --localstatedir="${EPREFIX}"/var \
89 --with-user=${NETDATA_USER} \
90 $(use_enable nfacct plugin-nfacct) \
91 $(use_enable cpu_flags_x86_sse2 x86-sse) \
92
93 diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
94 index e2a78bc..ce0d866 100644
95 --- a/net-analyzer/netdata/netdata-9999.ebuild
96 +++ b/net-analyzer/netdata/netdata-9999.ebuild
97 @@ -1,19 +1,19 @@
98 -# Copyright 1999-2016 Gentoo Foundation
99 +# Copyright 1999-2017 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 # $Id$
102
103 EAPI=6
104 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
105
106 -inherit fcaps linux-info python-r1 systemd user
107 +inherit autotools fcaps linux-info python-r1 systemd user
108
109 if [[ ${PV} == "9999" ]] ; then
110 EGIT_REPO_URI="git://github.com/firehol/${PN}.git"
111 - inherit git-r3 autotools
112 + inherit git-r3
113 SRC_URI=""
114 KEYWORDS=""
115 else
116 - SRC_URI="https://firehol.org/download/${PN}/releases/v${PV}/${P}.tar.xz"
117 + SRC_URI="https://github.com/firehol/netdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
118 KEYWORDS="~amd64 ~x86"
119 fi
120
121 @@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
122
123 LICENSE="GPL-3+ MIT BSD"
124 SLOT="0"
125 -IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs +python"
126 +IUSE="+compression cpu_flags_x86_sse2 mysql nfacct nodejs postgres +python"
127 REQUIRED_USE="
128 mysql? ( python )
129 python? ( ${PYTHON_REQUIRED_USE} )"
130 @@ -43,6 +43,9 @@ RDEPEND="
131 mysql? (
132 || ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] )
133 )
134 + postgres? (
135 + dev-python/psycopg:2[${PYTHON_USEDEP}]
136 + )
137 )
138 nfacct? (
139 net-firewall/nfacct
140 @@ -71,12 +74,12 @@ pkg_setup() {
141
142 src_prepare() {
143 default
144 - [[ ${PV} == "9999" ]] && eautoreconf
145 + eautoreconf
146 }
147
148 src_configure() {
149 econf \
150 - --localstatedir=/var \
151 + --localstatedir="${EPREFIX}"/var \
152 --with-user=${NETDATA_USER} \
153 $(use_enable nfacct plugin-nfacct) \
154 $(use_enable cpu_flags_x86_sse2 x86-sse) \