Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus/
Date: Mon, 03 May 2021 21:06:54
Message-Id: 1620076006.64603e31ebfe443cc406a88b4347f5a96ff2d83e.zlogene@gentoo
1 commit: 64603e31ebfe443cc406a88b4347f5a96ff2d83e
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 21:03:26 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 21:06:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64603e31
7
8 app-metrics/prometheus: use promu for building (again)
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 ...ometheus-2.26.0-r1.ebuild => prometheus-2.26.0-r2.ebuild} | 12 +++++-------
14 1 file changed, 5 insertions(+), 7 deletions(-)
15
16 diff --git a/app-metrics/prometheus/prometheus-2.26.0-r1.ebuild b/app-metrics/prometheus/prometheus-2.26.0-r2.ebuild
17 similarity index 99%
18 rename from app-metrics/prometheus/prometheus-2.26.0-r1.ebuild
19 rename to app-metrics/prometheus/prometheus-2.26.0-r2.ebuild
20 index a8109672d3a..c6e3e6c9739 100644
21 --- a/app-metrics/prometheus/prometheus-2.26.0-r1.ebuild
22 +++ b/app-metrics/prometheus/prometheus-2.26.0-r2.ebuild
23 @@ -1356,6 +1356,8 @@ DEPEND="!app-metrics/prometheus-bin
24
25 RDEPEND="${COMMON_DEPEND}"
26
27 +BDEPEND=">=dev-util/promu-0.3.0"
28 +
29 RESTRICT+=" test"
30
31 src_prepare() {
32 @@ -1364,16 +1366,12 @@ src_prepare() {
33 }
34
35 src_compile() {
36 - # no need in promu here
37 -
38 - go build -mod=readonly -tags builtinassets ./cmd/prometheus || die
39 -
40 - go build -mod=readonly ./cmd/promtool || die
41 + promu build --prefix bin -v || die
42 }
43
44 src_install() {
45 - dobin "${S}"/prometheus
46 - dobin "${S}"/promtool
47 + dobin "${S}"/bin/prometheus
48 + dobin "${S}"/bin/promtool
49 dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
50 insinto /etc/prometheus
51 doins documentation/examples/prometheus.yml