From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 6 Sep 2019 23:51:45 +0000 (-0700)
Subject: app-emulation/skopeo: Use GO111MODULE=on for -mod=vendor backward compat
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8b321ed35ee70fd661b5e29ac39d22d413d19db1;p=gentoo.git

app-emulation/skopeo: Use GO111MODULE=on for -mod=vendor backward compat

Use GO111MODULE=on together with -mod=vendor since otherwise -mod=vendor
fails with go-1.12 like this:

build flag -mod=vendor only valid when using modules

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---

diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
index 80e35c4d984b..3af894ea4f9a 100644
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild
@@ -30,9 +30,8 @@ RESTRICT="test"
 
 src_compile() {
 	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
-		go build $(has_version -b '>=dev-lang/go-1.13' && printf -- -mod=vendor) \
-		-ldflags "-X main.gitCommit=${COMMIT}" \
+	set -- env -u GOCACHE -u XDG_CACHE_HOME GO111MODULE=on GOPATH="${WORKDIR}/${P}" \
+		go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
 		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
 		-o skopeo ./cmd/skopeo
 	echo "$@"