From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-829833-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 A9F10139891
	for <garchives@archives.gentoo.org>; Sun, 23 Aug 2015 23:35:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E8F31E0653;
	Sun, 23 Aug 2015 23:35:27 +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 7FEF3E0653
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Aug 2015 23:35:27 +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 70A773406C2
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Aug 2015 23:35:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D0C416A
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Aug 2015 23:35:24 +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: <1440372904.7cea8530addccd91a30b0eefed171abc44e112f2.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: 7cea8530addccd91a30b0eefed171abc44e112f2
X-VCS-Branch: master
Date: Sun, 23 Aug 2015 23:35:24 +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: f4e32496-93b2-479e-9f7b-2b5fe0408c15
X-Archives-Hash: ae08483c90d0d5b6abb720e2c34986b0

commit:     7cea8530addccd91a30b0eefed171abc44e112f2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 23:33:10 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 23:35:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cea8530

dev-go/go-tools: fix live ebuild for go-1.5 and newer

In Go 1.5, cover and vet have moved back to the main Go repository, so
the ones in this package are deprecated.

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

diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 3e1bc87..63de13a 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -83,8 +83,13 @@ src_install() {
 	GOROOT="${T}/goroot" golang-build_src_install
 	dobin bin/* "${T}/goroot/bin/godoc"
 
-	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"
+	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} ||
+			die "unable to remove cover and vet"
+	fi
 }