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 7C0F81384B4 for ; Wed, 25 Nov 2015 17:48:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55E4021C09D; Wed, 25 Nov 2015 17:48:36 +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 DB42521C09D for ; Wed, 25 Nov 2015 17:48:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAE4B33D3CF for ; Wed, 25 Nov 2015 17:48:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE8E2A43 for ; Wed, 25 Nov 2015 17:48:31 +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: <1448473631.59d17bebd6f1f994e52ce79bea9d99ce98883416.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: 59d17bebd6f1f994e52ce79bea9d99ce98883416 X-VCS-Branch: master Date: Wed, 25 Nov 2015 17:48:31 +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: a32264eb-b7f7-4c40-9651-60e8a4420397 X-Archives-Hash: abcade0a482a913eb44465f5c82c7944 commit: 59d17bebd6f1f994e52ce79bea9d99ce98883416 Author: William Hubbs gentoo org> AuthorDate: Wed Nov 25 17:45:57 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Nov 25 17:47:11 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d17beb dev-lang/go: sync live ebuild dev-lang/go/go-9999.ebuild | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 8d4c715..ed766ec 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -54,6 +54,7 @@ go_arch() local portage_arch=$(tc-arch $@) case "${portage_arch}" in x86) echo 386;; + x64-*) echo amd64;; *) echo "${portage_arch}";; esac } @@ -150,28 +151,28 @@ src_test() src_install() { - local bin_path="${GOBIN}" - if go_cross_compile; then - bin_path="${GOBIN}/$(go_tuple)" - fi - dobin "${bin_path}"/* - dodoc AUTHORS CONTRIBUTORS PATENTS README.md + local bin_path f x - dodir /usr/lib/go /usr/lib/go/pkg /usr/lib/go/pkg/tool + dodir /usr/lib/go insinto /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 - doins -r doc lib src - - # Selectively install pkg directory to exclude the bootstrap build - insinto /usr/lib/go/pkg - doins -r pkg/include "pkg/$(go_tuple)" - insinto /usr/lib/go/pkg/tool - doins -r "pkg/tool/$(go_tuple)" - fperms -R +x /usr/lib/go/pkg/tool + doins -r bin doc lib pkg src + fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool + + if go_cross_compile; then + bin_path="bin/$(go_tuple)" + else + bin_path=bin + fi + for x in ${bin_path}/*; do + f=${x##*/} + dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} + done + dodoc AUTHORS CONTRIBUTORS PATENTS README.md } pkg_preinst()