From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2865C1382C5 for ; Sun, 7 Jun 2020 18:00:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A293E08AE; Sun, 7 Jun 2020 18:00:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30391E08AE for ; Sun, 7 Jun 2020 18:00:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8802B34ED0F for ; Sun, 7 Jun 2020 18:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A1531F9 for ; Sun, 7 Jun 2020 18:00:39 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1591552787.ffcf0ed0166a91e2e6f1bd5ea8ab7e39117ae38c.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/github-cli/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/github-cli/github-cli-0.9.0-r1.ebuild X-VCS-Directories: dev-util/github-cli/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ffcf0ed0166a91e2e6f1bd5ea8ab7e39117ae38c X-VCS-Branch: master Date: Sun, 7 Jun 2020 18:00:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7004b870-8bf4-4357-9abd-9c1b64bdf663 X-Archives-Hash: 5252c2f24e81fccee30e00bc9a17b14d commit: ffcf0ed0166a91e2e6f1bd5ea8ab7e39117ae38c Author: William Hubbs gentoo org> AuthorDate: Sun Jun 7 17:53:16 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Jun 7 17:59:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcf0ed0 dev-util/github-cli: drop patch and use "go run" for completions The makefile uses "go run" to generate the man pages, so we really don't need to build a gen-docs binary. Also, switch to using "go run" to generate the shell completions. Once we allow cross compiling, we can use the first emake to compile gh for the target and run everything else on the host. Signed-off-by: William Hubbs gentoo.org> dev-util/github-cli/github-cli-0.9.0-r1.ebuild | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dev-util/github-cli/github-cli-0.9.0-r1.ebuild b/dev-util/github-cli/github-cli-0.9.0-r1.ebuild index 9da2da770a1..a85b465b8d8 100644 --- a/dev-util/github-cli/github-cli-0.9.0-r1.ebuild +++ b/dev-util/github-cli/github-cli-0.9.0-r1.ebuild @@ -273,13 +273,6 @@ LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0" SLOT="0" RDEPEND=">=dev-vcs/git-1.7.3" -BDEPEND=">=dev-lang/go-1.13" - -unset GOBIN GOPATH GOCODE - -PATCHES=( - "${FILESDIR}/cli-0.9.0-manpage-build-gen-docs.patch" -) src_unpack() { if [[ ${PV} == *9999 ]]; then @@ -292,17 +285,19 @@ src_unpack() { src_compile() { [[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}" - # Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS + # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS unset LDFLAGS + # Once we set up cross compiling, this line will need to be adjusted + # to compile for the target. + # Everything else in this function happens on the host. + emake - emake bin/gh # default target - - einfo "Building manpage" + einfo "Building man pages" emake manpages - einfo "Building completion" - bin/gh completion -s bash > gh.bash-completion || die - bin/gh completion -s zsh > gh.zsh-completion || die + einfo "Building completions" + go run ./cmd/gh completion -s bash > gh.bash-completion || die + go run ./cmd/gh completion -s zsh > gh.zsh-completion || die } src_install() {