| 1 |
commit: 836fd3187a478452effc14bd3db092c8cf7d3345 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 26 17:46:15 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 26 17:46:34 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836fd318 |
| 7 |
|
| 8 |
dev-go/go-tools: revbump to 0_pre20150823-r1, fixing file collisions for bug 558818 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
...tools-0_pre20150823.ebuild => go-tools-0_pre20150823-r1.ebuild} | 7 ++++++- |
| 13 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/dev-go/go-tools/go-tools-0_pre20150823.ebuild b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild |
| 16 |
similarity index 93% |
| 17 |
rename from dev-go/go-tools/go-tools-0_pre20150823.ebuild |
| 18 |
rename to dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild |
| 19 |
index ac8982e..887effa 100644 |
| 20 |
--- a/dev-go/go-tools/go-tools-0_pre20150823.ebuild |
| 21 |
+++ b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild |
| 22 |
@@ -81,7 +81,12 @@ src_install() { |
| 23 |
cp -sR "$(go env GOROOT)" "${T}/goroot" || die |
| 24 |
|
| 25 |
GOROOT="${T}/goroot" golang-build_src_install |
| 26 |
- dobin bin/* "${T}/goroot/bin/godoc" |
| 27 |
+ |
| 28 |
+ # bug 558818: install binaries in $GOROOT/bin to avoid file collisions |
| 29 |
+ exeinto "$(go env GOROOT)/bin" |
| 30 |
+ doexe bin/* "${T}/goroot/bin/godoc" |
| 31 |
+ dodir /usr/bin |
| 32 |
+ ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die |
| 33 |
|
| 34 |
if has_version '<dev-lang/go-1.5'; then |
| 35 |
exeinto "$(go env GOTOOLDIR)" |
Archives