summaryrefslogtreecommitdiff
path: root/dev-go
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2015-08-27 10:02:06 -0500
committerWilliam Hubbs <williamh@gentoo.org>2015-08-27 10:02:33 -0500
commit1ce7fbd7e260ad3e46c45cdb124029bd81a76df2 (patch)
treeed5d3f403ca03d53d5ed7ddee5a28af1407ea4ca /dev-go
parentsci-chemistry/pymol: React on subslot changes (diff)
downloadgentoo-1ce7fbd7e260ad3e46c45cdb124029bd81a76df2.tar.gz
gentoo-1ce7fbd7e260ad3e46c45cdb124029bd81a76df2.tar.bz2
gentoo-1ce7fbd7e260ad3e46c45cdb124029bd81a76df2.zip
dev-go/go-tools: sync live ebuild
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-go')
-rw-r--r--dev-go/go-tools/go-tools-9999.ebuild9
1 files 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 ac8982ed2b2..030ff9e2a48 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
}