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

[William Hubbs]

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
 }