dev-lang/go: sync live ebuild

diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 14d6b7abceb62e065ae3ab143570a2afa8134c33..86910efccb5ab8aa66cda219b29e5a0a389acd26 100644 (file)
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -2,21 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
 
-inherit eutils toolchain-funcs
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
 
 if [[ ${PV} = 9999 ]]; then
        EGIT_REPO_URI="git://github.com/golang/go.git"
        inherit git-r3
 else
-       SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
+       SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
        # go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
        # Allowing other bootstrap options would enable arm64 and ppc64 builds.
-       KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+       case ${PV} in 
+               *9999*|*_rc*) ;;
+               *)
+                       KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+                       ;;
+       esac
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
@@ -107,11 +114,6 @@ pkg_pretend()
        fi
 }
 
-src_prepare()
-{
-       epatch_user
-}
-
 src_compile()
 {
        export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
@@ -159,6 +161,8 @@ src_install()
        doins -r bin doc lib pkg src
        fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
 
+       cp -a misc "${D}"/usr/lib/go/misc
+
        if go_cross_compile; then
                bin_path="bin/$(go_tuple)"
        else