Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
Date: Thu, 05 Sep 2019 21:02:24
Message-Id: 1567717331.98af196037b6d7968f5ffb60bc74997c8f59055a.zmedico@gentoo
1 commit: 98af196037b6d7968f5ffb60bc74997c8f59055a
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 5 20:58:05 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 5 21:02:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98af1960
7
8 app-admin/consul: Fix compile with go-1.13
9
10 Reported-by: William Hubbs <williamh <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/693578
12 Package-Manager: Portage-2.3.75, Repoman-2.3.17
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 app-admin/consul/consul-1.5.3.ebuild | 5 +++++
16 1 file changed, 5 insertions(+)
17
18 diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
19 index 13ebbc13a38..913d62b917c 100644
20 --- a/app-admin/consul/consul-1.5.3.ebuild
21 +++ b/app-admin/consul/consul-1.5.3.ebuild
22 @@ -30,6 +30,11 @@ pkg_setup() {
23 src_prepare() {
24 default
25
26 + # avoid network-sandbox violations since go-1.13
27 + rm src/${EGO_PN}/go.mod || die
28 + grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
29 + xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
30 +
31 sed -e 's:go get -u -v $(GOTOOLS)::' \
32 -e 's:vendorfmt dev-build:dev-build:' \
33 -i "src/${EGO_PN}/GNUmakefile" || die