From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E13B258973 for ; Sun, 7 Feb 2016 22:23:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7C6A21C03D; Sun, 7 Feb 2016 22:23:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 556D721C03D for ; Sun, 7 Feb 2016 22:23:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07DD634092D for ; Sun, 7 Feb 2016 22:23:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 004588F7 for ; Sun, 7 Feb 2016 22:23:16 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1454883662.e25f4ad4353c24a597b06639c831474dd7d0110e.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/go/go-9999.ebuild X-VCS-Directories: dev-lang/go/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e25f4ad4353c24a597b06639c831474dd7d0110e X-VCS-Branch: master Date: Sun, 7 Feb 2016 22:23:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 57ed394e-7eed-49ca-aeea-00900316f109 X-Archives-Hash: 50f5ee550e9de2d36ce7bd703e4b4868 commit: e25f4ad4353c24a597b06639c831474dd7d0110e Author: William Hubbs gentoo org> AuthorDate: Sun Feb 7 22:21:02 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Feb 7 22:21:02 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25f4ad4 dev-lang/go: sync live ebuild dev-lang/go/go-9999.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 14d6b7a..86910ef 100644 --- 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