[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/

[William Hubbs]

commit:     1ce7fbd7e260ad3e46c45cdb124029bd81a76df2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 15:02:06 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 15:02:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce7fbd7

dev-go/go-tools: sync live ebuild

Package-Manager: portage-2.2.20.1

 dev-go/go-tools/go-tools-9999.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-go/go-tools/go-tools-9999.ebuild 
b/dev-go/go-tools/go-tools-9999.ebuild
index ac8982e..030ff9e 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -81,7 +81,12 @@ src_install() {
        cp -sR "$(go env GOROOT)" "${T}/goroot" || die
 
        GOROOT="${T}/goroot" golang-build_src_install
-       dobin bin/* "${T}/goroot/bin/godoc"
+
+       # bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+       exeinto "$(go env GOROOT)/bin"
+       doexe bin/* "${T}/goroot/bin/godoc"
+       dodir /usr/bin
+       ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
 
        if has_version '<dev-lang/go-1.5'; then
                exeinto "$(go env GOTOOLDIR)"
@@ -89,7 +94,7 @@ src_install() {
                doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env 
GOARCH)/cover"
                doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
        else
-               rm "${D}"/usr/bin/{cover,vet} ||
+               rm "${D}"$(go env GOROOT)/bin/{cover,vet} ||
                        die "unable to remove cover and vet"
        fi
 }