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 A56351382C5 for ; Mon, 18 May 2020 15:48:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8A73E0875; Mon, 18 May 2020 15:48:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C16ADE0875 for ; Mon, 18 May 2020 15:48:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CF59C34F048 for ; Mon, 18 May 2020 15:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71DF4250 for ; Mon, 18 May 2020 15:48:05 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1589816844.eb031c43aea54ab098d243207066941478242c3e.floppym@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.8.0.ebuild dev-util/github-cli/github-cli-9999.ebuild X-VCS-Directories: dev-util/github-cli/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: eb031c43aea54ab098d243207066941478242c3e X-VCS-Branch: master Date: Mon, 18 May 2020 15:48:05 +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: d4e19332-9f9c-4b5e-9f73-f036451013e4 X-Archives-Hash: 7e9dcd979a027a0eca0345392c05a59e commit: eb031c43aea54ab098d243207066941478242c3e Author: Mike Gilbert gentoo org> AuthorDate: Sun May 17 16:47:28 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon May 18 15:47:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb031c43 dev-util/github-cli: fix live ebuild Closes: https://github.com/gentoo/gentoo/pull/15851 Signed-off-by: Mike Gilbert gentoo.org> dev-util/github-cli/github-cli-0.8.0.ebuild | 4 ++-- dev-util/github-cli/github-cli-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/github-cli/github-cli-0.8.0.ebuild b/dev-util/github-cli/github-cli-0.8.0.ebuild index ec3be96c343..61c48d3dee4 100644 --- a/dev-util/github-cli/github-cli-0.8.0.ebuild +++ b/dev-util/github-cli/github-cli-0.8.0.ebuild @@ -276,7 +276,7 @@ RDEPEND=">=dev-vcs/git-1.7.3" BDEPEND=">=dev-lang/go-1.13" src_unpack() { - if has live "${PROPERTIES}"; then + if [[ ${PV} == *9999 ]]; then git-r3_src_unpack go-module_live_vendor else @@ -285,7 +285,7 @@ src_unpack() { } src_compile() { - has live "${PROPERTIES}" || export GH_VERSION="v${PV}" + [[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}" # Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS unset LDFLAGS emake diff --git a/dev-util/github-cli/github-cli-9999.ebuild b/dev-util/github-cli/github-cli-9999.ebuild index ec3be96c343..61c48d3dee4 100644 --- a/dev-util/github-cli/github-cli-9999.ebuild +++ b/dev-util/github-cli/github-cli-9999.ebuild @@ -276,7 +276,7 @@ RDEPEND=">=dev-vcs/git-1.7.3" BDEPEND=">=dev-lang/go-1.13" src_unpack() { - if has live "${PROPERTIES}"; then + if [[ ${PV} == *9999 ]]; then git-r3_src_unpack go-module_live_vendor else @@ -285,7 +285,7 @@ src_unpack() { } src_compile() { - has live "${PROPERTIES}" || export GH_VERSION="v${PV}" + [[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}" # Golang LDFLAGS are not the same as GCC/Binutils LDFLAGS unset LDFLAGS emake