From 050d2bc17789f3ee1a09b01c20b2cfca774034f2 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 2 Apr 2021 13:02:06 +0100
Subject: 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/@v/v0.0.0-20161203194507-b8bc1bf76747.mod: 200 OK (0.229s)
 # get https://proxy.golang.org/gopkg.in/yaml.v2/@v/v2.0.0-20190319135612-7b8349ac747c.mod: 200 OK (0.230s)
 # get https://proxy.golang.org/github.com/russross/blackfriday/@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@gentoo.org>
---
 dev-vcs/hub/hub-2.14.2-r1.ebuild | 42 ++++++++++++++++++++++++++++++++++++++++
 dev-vcs/hub/hub-2.14.2.ebuild    | 37 -----------------------------------
 2 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 dev-vcs/hub/hub-2.14.2-r1.ebuild
 delete mode 100644 dev-vcs/hub/hub-2.14.2.ebuild

(limited to 'dev-vcs')

diff --git a/dev-vcs/hub/hub-2.14.2-r1.ebuild b/dev-vcs/hub/hub-2.14.2-r1.ebuild
new file mode 100644
index 000000000000..ca4e205866ae
--- /dev/null
+++ b/dev-vcs/hub/hub-2.14.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc README.md
+	doman share/man/man1/*.1
+
+	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/vim/vimfiles
+	doins -r share/vim/vimfiles/*
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
diff --git a/dev-vcs/hub/hub-2.14.2.ebuild b/dev-vcs/hub/hub-2.14.2.ebuild
deleted file mode 100644
index 6f8110005117..000000000000
--- a/dev-vcs/hub/hub-2.14.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
-HOMEPAGE="https://github.com/github/hub"
-SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-src_compile() {
-	emake bin/hub man-pages
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-	doman share/man/man1/*.1
-
-	newbashcomp etc/${PN}.bash_completion.sh ${PN}
-
-	insinto /usr/share/vim/vimfiles
-	doins -r share/vim/vimfiles/*
-	insinto /usr/share/zsh/site-functions
-	newins etc/hub.zsh_completion _${PN}
-}
-- 
cgit v1.2.3-65-gdbad