commit:     050d2bc17789f3ee1a09b01c20b2cfca774034f2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 12:02:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 20:13:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050d2bc1

dev-vcs/hub: use vendored modules, not from network(!)

On platforms without network-sandbox (or with it disabled),
we get:
[...]
 # get https://proxy.golang.org/github.com/mitchellh/go-homedir/ <AT> 
v/v0.0.0-20161203194507-b8bc1bf76747.mod: 200 OK (0.229s)
 # get https://proxy.golang.org/gopkg.in/yaml.v2/ <AT> 
v/v2.0.0-20190319135612-7b8349ac747c.mod: 200 OK (0.230s)
 # get https://proxy.golang.org/github.com/russross/blackfriday/ <AT> 
v/v0.0.0-20180526075726-670777b536d3.mod: 200 OK (0.229s)
[...]

We need to explicitly re-give the upstream default for their
GOFLAGS as our default in the eclass is overriding it.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/hub/{hub-2.14.2.ebuild => hub-2.14.2-r1.ebuild} | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/hub/hub-2.14.2.ebuild b/dev-vcs/hub/hub-2.14.2-r1.ebuild
similarity index 69%
rename from dev-vcs/hub/hub-2.14.2.ebuild
rename to dev-vcs/hub/hub-2.14.2-r1.ebuild
index 6f811000511..ca4e205866a 100644
--- a/dev-vcs/hub/hub-2.14.2.ebuild
+++ b/dev-vcs/hub/hub-2.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,11 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND=">=dev-vcs/git-1.7.3"
 
 src_compile() {
+       # The eclass setting GOFLAGS at all overrides this default
+       # in the upstream Makefile. It'll *FALL BACK* to bundled/vendored
+       # modules but without this, it'll try fetching. On platforms
+       # without network-sandbox (or relying on it), this is not okay.
+       export GOFLAGS="${GOFLAGS} -mod=vendor"
        emake bin/hub man-pages
 }
 

Reply via email to