dev-go/go-tools: sync live ebuild

Package-Manager: portage-2.2.20.1

dev-go/go-tools/go-tools-9999.ebuild

@@ -81,15 +81,20 @@ 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)"
 		exeopts -m0755 -p # preserve timestamps for bug 551486
 		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
 }