From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-830776-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id BFC1413989A
	for <garchives@archives.gentoo.org>; Thu, 27 Aug 2015 15:03:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BFAA71418A;
	Thu, 27 Aug 2015 15:03:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 72C451418A
	for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2015 15:03:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5AFB034092A
	for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2015 15:03:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A022D121
	for <gentoo-commits@lists.gentoo.org>; Thu, 27 Aug 2015 15:03:07 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1440687753.1ce7fbd7e260ad3e46c45cdb124029bd81a76df2.williamh@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-9999.ebuild
X-VCS-Directories: dev-go/go-tools/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 1ce7fbd7e260ad3e46c45cdb124029bd81a76df2
X-VCS-Branch: master
Date: Thu, 27 Aug 2015 15:03:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f9e1a127-3e0c-431a-816c-92c2a26839cb
X-Archives-Hash: 437360c58cdd380613cb9cd11cf74705

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
 }