commit: d3f9cee39166528480af4f4dcc33e02dd72cf124
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 19:22:56 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 19:25:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f9cee3
dev-lang/go: sync live
Package-Manager: portage-2.3.3
dev-lang/go/go-9999.ebuild | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 2be35844e5..b1ff4a97db 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,21 +12,21 @@ MY_PV=${PV/_/}
inherit toolchain-funcs
BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist";
-SRC_URI="!gccgo? (
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
ppc64? (
- ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz
- ${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-1.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap-1.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
-x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
+ ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
"
case ${PV} in
@@ -35,7 +35,7 @@ case ${PV} in
inherit git-r3
;;
*)
- SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz";
+ SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
S="${WORKDIR}"/go
case ${PV} in
*_beta*|*_rc*) ;;
@@ -50,6 +50,7 @@ case ${PV} in
;;
esac
esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
DESCRIPTION="A concurrent garbage collected and typesafe programming language"
HOMEPAGE="http://www.golang.org";
@@ -201,12 +202,17 @@ src_test()
src_install()
{
- einstalldocs
+ local bin_path f x
+
dodir /usr/lib/go
+
+ # There is a known issue which requires the source tree to be installed
[1].
+ # Once this is fixed, we can consider using the doc use flag to control
+ # installing the doc and src directories.
+ # [1] https://golang.org/issue/2775
+ #
# deliberately use cp to retain permissions
cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-
- local bin_path f x
if go_cross_compile; then
bin_path="bin/$(go_tuple)"
else
@@ -216,4 +222,5 @@ src_install()
f=${x##*/}
dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
done
+ einstalldocs
}
