From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 5 Sep 2019 20:58:05 +0000 (-0700)
Subject: app-admin/consul: Fix compile with go-1.13
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=98af196037b6d7968f5ffb60bc74997c8f59055a;p=gentoo.git

app-admin/consul: Fix compile with go-1.13

Reported-by: William Hubbs <williamh@gentoo.org>
Closes: https://bugs.gentoo.org/693578
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---

diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
index 13ebbc13a381..913d62b917c2 100644
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -30,6 +30,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
 	sed -e 's:go get -u -v $(GOTOOLS)::' \
 		-e 's:vendorfmt dev-build:dev-build:' \
 		-i "src/${EGO_PN}/GNUmakefile" || die