Fix it to install godoc.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key FDE8EF85AE5719A3)

3 files changed, 34 insertions, 9 deletions

diff --git a/dev-go/go-tools/ChangeLog b/dev-go/go-tools/ChangeLog
index 94bb2f1cab42..c7f757fc91fc 100644
--- a/dev-go/go-tools/ChangeLog
+++ b/dev-go/go-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-go/go-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.5 2015/05/24 09:31:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/ChangeLog,v 1.6 2015/05/24 21:06:53 zmedico Exp $
+
+  24 May 2015; Zac Medico <zmedico@gentoo.org> go-tools-1.4.2_p20150520.ebuild,
+  go-tools-9999.ebuild:
+  Fix it to install godoc.
 
   24 May 2015; Zac Medico <zmedico@gentoo.org> go-tools-1.4.2_p20150520.ebuild,
   go-tools-9999.ebuild:
diff --git a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild b/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
index b4f0523b3a72..825dd73da229 100644
--- a/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
+++ b/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild,v 1.3 2015/05/24 09:31:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-1.4.2_p20150520.ebuild,v 1.4 2015/05/24 21:06:53 zmedico Exp $
 
 EAPI=5
 
@@ -64,11 +64,21 @@ src_test() {
 }
 
 src_install() {
+	local x
 	exeinto /usr/lib/go/bin
 	doexe "${WORKDIR}"/bin/*
+
+	# godoc ends up in ${GOROOT}/bin
+	while read -r -d '' x; do
+		doexe "${x}"
+		dosym ../lib/go/bin/${x##*/} /usr/bin/${x##*/}
+	done < <(find "${GOROOT}/bin" -type f -print0)
+
+	# cover and vet end up in ${GOROOT}/pkg/tool/linux_amd64
+	exeinto /usr/lib/go/pkg/tool/linux_amd64
+	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
+
 	insinto /usr/lib/go
 	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
 	doins -r "${WORKDIR}"/{pkg,src}
-	exeinto /usr/lib/go/pkg/tool/linux_amd64
-	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
 }
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 669c73e54218..7fab2a5f6338 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.3 2015/05/24 09:31:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.4 2015/05/24 21:06:53 zmedico Exp $
 
 EAPI=5
 inherit git-r3
 
 KEYWORDS=""
 DESCRIPTION="Go Tools"
-GO_PN=golang.org/x/${PN##*-}
+MY_PN=${PN##*-}
+GO_PN=golang.org/x/${MY_PN}
 HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+EGIT_REPO_URI="https://go.googlesource.com/${MY_PN}"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -57,11 +58,21 @@ src_test() {
 }
 
 src_install() {
+	local x
 	exeinto /usr/lib/go/bin
 	doexe "${WORKDIR}"/bin/*
+
+	# godoc ends up in ${GOROOT}/bin
+	while read -r -d '' x; do
+		doexe "${x}"
+		dosym ../lib/go/bin/${x##*/} /usr/bin/${x##*/}
+	done < <(find "${GOROOT}/bin" -type f -print0)
+
+	# cover and vet end up in ${GOROOT}/pkg/tool/linux_amd64
+	exeinto /usr/lib/go/pkg/tool/linux_amd64
+	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
+
 	insinto /usr/lib/go
 	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
 	doins -r "${WORKDIR}"/{pkg,src}
-	exeinto /usr/lib/go/pkg/tool/linux_amd64
-	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
 }