From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-857530-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id B0DA61388BF
	for <garchives@archives.gentoo.org>; Fri, 15 Jan 2016 18:42:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4022121C00B;
	Fri, 15 Jan 2016 18:42:39 +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 C106F21C00B
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jan 2016 18:42:38 +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 6BBD9340AF7
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jan 2016 18:42:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C810A91
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jan 2016 18:42:35 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
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" <williamh@gentoo.org>
Message-ID: <1452882855.e02e97c7c537c534a8b7fed00f366f8991c1cd25.williamh@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/files/, dev-lang/go/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/go/Manifest dev-lang/go/files/go-1.5.3-assume-amd64-on-osx.patch dev-lang/go/go-1.5.3.ebuild
X-VCS-Directories: dev-lang/go/files/ dev-lang/go/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: e02e97c7c537c534a8b7fed00f366f8991c1cd25
X-VCS-Branch: master
Date: Fri, 15 Jan 2016 18:42:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 28a5032b-6ffb-4334-8e69-8821a7f0e822
X-Archives-Hash: 56d713c2b48ac730e475a93692a35ccf

commit:     e02e97c7c537c534a8b7fed00f366f8991c1cd25
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 18:31:43 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 18:34:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02e97c7

dev-lang/go: version bump

 dev-lang/go/Manifest                               |   1 +
 .../go/files/go-1.5.3-assume-amd64-on-osx.patch    |  13 ++
 dev-lang/go/go-1.5.3.ebuild                        | 213 +++++++++++++++++++++
 3 files changed, 227 insertions(+)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e3b07a1..0bdca46 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,3 @@
 DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
 DIST go1.5.1.src.tar.gz 12049701 SHA256 a889873e98d9a72ae396a9b7dd597c29dcd709cafa9097d9c4ba04cff0ec436b SHA512 a3e92058c79502cfcb7d67143db67fef97393a416322b6f8b6c52b70879e7ab56e3cec94a9ca8046cc13b134845cc1e4b53c70d7208850092bf4edf04bf439ff WHIRLPOOL 3e9941af9bb0717e0c4deae53a0290250da8f88962aef67b856baf089369fdff786aa95cec3564812dc2f48b8c388c810b7568c669ee8a1103e03c6ed0b75893
+DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8

diff --git a/dev-lang/go/files/go-1.5.3-assume-amd64-on-osx.patch b/dev-lang/go/files/go-1.5.3-assume-amd64-on-osx.patch
new file mode 100644
index 0000000..d568889
--- /dev/null
+++ b/dev-lang/go/files/go-1.5.3-assume-amd64-on-osx.patch
@@ -0,0 +1,13 @@
+--- src/cmd/dist/util.go	2016-01-15 11:27:49.092713185 -0600
++++ src/cmd/dist/util.go	2016-01-15 11:29:50.616721387 -0600
+@@ -404,9 +404,7 @@
+ 	switch gohostos {
+ 	case "darwin":
+ 		// Even on 64-bit platform, darwin uname -m prints i386.
+-		if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") {
+-			gohostarch = "amd64"
+-		}
++		gohostarch = "amd64"
+ 	case "solaris":
+ 		// Even on 64-bit platform, solaris uname -m prints i86pc.
+ 		out := run("", CheckExit, "isainfo", "-n")

diff --git a/dev-lang/go/go-1.5.3.ebuild b/dev-lang/go/go-1.5.3.ebuild
new file mode 100644
index 0000000..de05f52
--- /dev/null
+++ b/dev-lang/go/go-1.5.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+inherit eutils 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"
+	# 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"
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=dev-lang/go-bootstrap-1.4.1"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped. The test data objects should also be left alone and unstripped.
+STRIP_MASK="/usr/lib/go/pkg/*.a
+	/usr/lib/go/src/debug/elf/testdata/*
+	/usr/lib/go/src/debug/dwarf/testdata/*
+	/usr/lib/go/src/runtime/race/*.syso"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/${P}-assume-amd64-on-osx.patch
+	epatch_user
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go1.4
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	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 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
+
+	dodir /usr/lib/go/misc
+	insinto /usr/lib/go/misc
+	doins -r misc/trace
+
+	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+}
+
+pkg_preinst()
+{
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
+
+pkg_postinst()
+{
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${EROOT}"usr/lib/go -type f \
+		-exec touch -r "${EROOT}"${tref} {} \;
+	eend $?
+
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
+		${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "Release notes are located at http://golang.org/doc/go${PV}"
+	fi
+
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
+	fi
+}