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 AC72213832E for ; Fri, 19 Aug 2016 16:13:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F098B21C080; Fri, 19 Aug 2016 16:13:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7B6A21C080 for ; Fri, 19 Aug 2016 16:13:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8921340688 for ; Fri, 19 Aug 2016 16:13:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1CF88F4 for ; Fri, 19 Aug 2016 16:12:59 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1471623174.ea9127983a43baf746f5bb72fe2ed4fd84bbc429.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-go/go-tools/go-tools-0_pre20160220.ebuild X-VCS-Directories: dev-go/go-tools/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ea9127983a43baf746f5bb72fe2ed4fd84bbc429 X-VCS-Branch: master Date: Fri, 19 Aug 2016 16:12:59 +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-Archives-Salt: d93fd7b5-0337-4859-893c-0bf83b40741a X-Archives-Hash: 18fc6b2afaa5fa7e56deb11206dd9400 commit: ea9127983a43baf746f5bb72fe2ed4fd84bbc429 Author: Zac Medico gentoo org> AuthorDate: Fri Aug 19 16:12:13 2016 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Aug 19 16:12:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea912798 dev-go/go-tools: fix godoc doexe failure, bug 591656 Package-Manager: portage-2.3.0 dev-go/go-tools/go-tools-0_pre20160220.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-go/go-tools/go-tools-0_pre20160220.ebuild b/dev-go/go-tools/go-tools-0_pre20160220.ebuild index 8254910..599c669 100644 --- a/dev-go/go-tools/go-tools-0_pre20160220.ebuild +++ b/dev-go/go-tools/go-tools-0_pre20160220.ebuild @@ -95,7 +95,10 @@ src_install() { # bug 558818: install binaries in $GOROOT/bin to avoid file collisions exeinto "$(go env GOROOT)/bin" - doexe bin/* "${T}/goroot/bin/godoc" + doexe bin/* + # godoc location varies depending on whether or not it's + # installed on the system (bug 591656) + [[ -e bin/godoc ]] || doexe "${T}/goroot/bin/godoc" dodir /usr/bin ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die