1 |
commit: 050d2bc17789f3ee1a09b01c20b2cfca774034f2 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 2 12:02:06 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 20:13:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050d2bc1 |
7 |
|
8 |
dev-vcs/hub: use vendored modules, not from network(!) |
9 |
|
10 |
On platforms without network-sandbox (or with it disabled), |
11 |
we get: |
12 |
[...] |
13 |
# get https://proxy.golang.org/github.com/mitchellh/go-homedir/ <AT> v/v0.0.0-20161203194507-b8bc1bf76747.mod: 200 OK (0.229s) |
14 |
# get https://proxy.golang.org/gopkg.in/yaml.v2/ <AT> v/v2.0.0-20190319135612-7b8349ac747c.mod: 200 OK (0.230s) |
15 |
# get https://proxy.golang.org/github.com/russross/blackfriday/ <AT> v/v0.0.0-20180526075726-670777b536d3.mod: 200 OK (0.229s) |
16 |
[...] |
17 |
|
18 |
We need to explicitly re-give the upstream default for their |
19 |
GOFLAGS as our default in the eclass is overriding it. |
20 |
|
21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
22 |
|
23 |
dev-vcs/hub/{hub-2.14.2.ebuild => hub-2.14.2-r1.ebuild} | 7 ++++++- |
24 |
1 file changed, 6 insertions(+), 1 deletion(-) |
25 |
|
26 |
diff --git a/dev-vcs/hub/hub-2.14.2.ebuild b/dev-vcs/hub/hub-2.14.2-r1.ebuild |
27 |
similarity index 69% |
28 |
rename from dev-vcs/hub/hub-2.14.2.ebuild |
29 |
rename to dev-vcs/hub/hub-2.14.2-r1.ebuild |
30 |
index 6f811000511..ca4e205866a 100644 |
31 |
--- a/dev-vcs/hub/hub-2.14.2.ebuild |
32 |
+++ b/dev-vcs/hub/hub-2.14.2-r1.ebuild |
33 |
@@ -1,4 +1,4 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
+# Copyright 1999-2021 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI=7 |
39 |
@@ -16,6 +16,11 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
40 |
RDEPEND=">=dev-vcs/git-1.7.3" |
41 |
|
42 |
src_compile() { |
43 |
+ # The eclass setting GOFLAGS at all overrides this default |
44 |
+ # in the upstream Makefile. It'll *FALL BACK* to bundled/vendored |
45 |
+ # modules but without this, it'll try fetching. On platforms |
46 |
+ # without network-sandbox (or relying on it), this is not okay. |
47 |
+ export GOFLAGS="${GOFLAGS} -mod=vendor" |
48 |
emake bin/hub man-pages |
49 |
} |