commit:     ea9127983a43baf746f5bb72fe2ed4fd84bbc429
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 16:12:13 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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
 

Reply via email to