From 836fd3187a478452effc14bd3db092c8cf7d3345 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Aug 2015 10:46:15 -0700 Subject: [PATCH] dev-go/go-tools: revbump to 0_pre20150823-r1, fixing file collisions for bug 558818 Package-Manager: portage-2.2.20.1 --- ...pre20150823.ebuild => go-tools-0_pre20150823-r1.ebuild} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) rename dev-go/go-tools/{go-tools-0_pre20150823.ebuild => go-tools-0_pre20150823-r1.ebuild} (93%) diff --git a/dev-go/go-tools/go-tools-0_pre20150823.ebuild b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild similarity index 93% rename from dev-go/go-tools/go-tools-0_pre20150823.ebuild rename to dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild index ac8982ed2b2e..887effab69f0 100644 --- a/dev-go/go-tools/go-tools-0_pre20150823.ebuild +++ b/dev-go/go-tools/go-tools-0_pre20150823-r1.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 '