commit:     03b1aa533e83d4382509bbbacaba7b32549bc853
Author:     William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Wed Apr 10 22:15:43 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 22:17:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b1aa53

dev-lang/go: 1.11.8 and 1.12.3 bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/go/Manifest         |   2 +
 dev-lang/go/go-1.11.8.ebuild | 238 +++++++++++++++++++++++++++++++++++++++++++
 dev-lang/go/go-1.12.3.ebuild | 238 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 478 insertions(+)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 155808adb43..e854b70f6f1 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,5 +11,7 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 
920a176b8f4fc3a816e724324
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 
0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab
 SHA512 
52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.11.6.src.tar.gz 21113406 BLAKE2B 
e7372e9bf6190295176c66a328b3e31f9201776f16f1165136e24bdaf5c514d7895dd5880514fa054ee958ed5ff96814de9a555e47b3f6dddd388d1e57c0d05f
 SHA512 
bc29df69a08a4e9e703de72b5eda5f2d63b78f18f3e7a1173eae5c6dd767f29f1b865a2fc3f692e15277df2d45e74ee17875b275eb3fc50aac2b88082e618bf5
 DIST go1.11.7.src.tar.gz 21113223 BLAKE2B 
e58a947a43e8dbabbe6d4dc1384239b01160e4d9cc88ed866c8d6e5a0ef66dd89203b9fb95c14c5fcc50ad47f75b17440cf1df34cb793a435d7744e630845307
 SHA512 
26bc2a3ab51ebe1179cd83897dae6ca17f30126189bf2c0b60060a25f3f22e72bcda383055825a9151948f074a103a177ab5550f5c2d088448bdf5455448061e
+DIST go1.11.8.src.tar.gz 21113433 BLAKE2B 
272ef36664a180640f14afba18d2f715d5a335134b33cea449d14fd3b568c2322bbbac7aab254987fbd7dcf3d486dc8b1f62f14577ae2e57b21de1720d0f29a7
 SHA512 
00b57b0ebbbf53f4de718bf40e5dfdaf57cafa9932917d22e9723b5a33a62d335013ab49753d98f8fe30c71daca95c7addd921825fe0c3885942b342773050cc
 DIST go1.12.1.src.tar.gz 21963082 BLAKE2B 
fd9c0ca19e6bd285c52034a88df1a58f96b957483362fac2e0c0f2a9dddde0543e7569d76fb93eff473774d152db361bfe9bdd354d80412c71ee5c4162010346
 SHA512 
b3fdfb874e6e0e0b50458085724fbd8e8b9be212df3f777b97db340aa3b80f32ee08d646a57a8a7d52ff6f19657d884dd25018c866c6173473aafa20a58f1975
 DIST go1.12.2.src.tar.gz 21965624 BLAKE2B 
9f4fbe62b37ccaf62517b2e5df3e1ada0155b7cb79067c2a74100df6d96ba89b0e372b5f1b1037b0cf98ea9f52623de00055793d011e5e39e92773a0cd87e41d
 SHA512 
f7b8ffe8d3de7b456ba595deece5b092db8645e95d901826c33428af0151731921437222dcb5d52c9d937da4ebeb3192c30aa17052aa88c9e425e96cac2d79bb
+DIST go1.12.3.src.tar.gz 21965718 BLAKE2B 
226b1028eb47cee8ccc0b72130a098a65211cf0e54030fe626b6b9cf1c16993e0a9677a443c07abd997e0f2bfbc1711c703a40869ae1ecbb8b8dfa0fbf31c0b2
 SHA512 
bd33e958f2e8550da14afc0576928d00d2b8ecac569ddcf3551e44a342ce78ad3934e36109cbe6c15d31c55448ccc092f6e1fbf82685d6702402ab67106a1424

diff --git a/dev-lang/go/go-1.11.8.ebuild b/dev-lang/go/go-1.11.8.ebuild
new file mode 100644
index 00000000000..4cb21b53d19
--- /dev/null
+++ b/dev-lang/go/go-1.11.8.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist";
+BOOTSTRAP_URI="
+       ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+       EGIT_REPO_URI="https://github.com/golang/go.git";
+       inherit git-r3
+       ;;
+*)
+       SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+       S="${WORKDIR}"/go
+       case ${PV} in
+       *_beta*|*_rc*) ;;
+       *)
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+               # The upstream tests fail under portage but pass if the build is
+               # run according to their documentation [1].
+               # I am restricting the tests on released versions until this is
+               # solved.
+               # [1] https://golang.org/issues/18442
+               RESTRICT="test"
+               ;;
+       esac
+esac
+
+# If gccgo is not being used to build Go, there is no way to know the
+# architecture or operating system of the build machine, so we need to
+# download all of our bootstrap archives to allow this ebuild to work
+# under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+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
+       usr/lib/go/src/*.gox
+       "
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+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/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+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;;
+               ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+               s390) echo s390x ;;
+               *)              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_unpack()
+{
+       if [[ ${PV} = 9999 ]]; then
+               git-r3_src_unpack
+       fi
+       default
+}
+
+src_compile()
+{
+       export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch 
${CBUILD})-bootstrap
+       if use gccgo; then
+               mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+               local go_binary=$(gcc-config 
--get-bin-path)/go-$(gcc-major-version)
+               [[ -x ${go_binary} ]] || go_binary=$(
+                       find 
"${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+                               sort -V | tail -n1)
+               [[ -x ${go_binary} ]] ||
+                       die "go-$(gcc-major-version): command not found"
+               ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+       fi
+       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
+
+       # 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
+       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
+       einstalldocs
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # fix install_name for test object (binutils_test) on Darwin, it
+               # is never used in real circumstances
+               local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+                     
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+               install_name_tool -id "${libmac64}" "${D}${libmac64}"
+       fi
+}

diff --git a/dev-lang/go/go-1.12.3.ebuild b/dev-lang/go/go-1.12.3.ebuild
new file mode 100644
index 00000000000..4cb21b53d19
--- /dev/null
+++ b/dev-lang/go/go-1.12.3.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist";
+BOOTSTRAP_URI="
+       ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+       ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+       EGIT_REPO_URI="https://github.com/golang/go.git";
+       inherit git-r3
+       ;;
+*)
+       SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+       S="${WORKDIR}"/go
+       case ${PV} in
+       *_beta*|*_rc*) ;;
+       *)
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+               # The upstream tests fail under portage but pass if the build is
+               # run according to their documentation [1].
+               # I am restricting the tests on released versions until this is
+               # solved.
+               # [1] https://golang.org/issues/18442
+               RESTRICT="test"
+               ;;
+       esac
+esac
+
+# If gccgo is not being used to build Go, there is no way to know the
+# architecture or operating system of the build machine, so we need to
+# download all of our bootstrap archives to allow this ebuild to work
+# under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+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
+       usr/lib/go/src/*.gox
+       "
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+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/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+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;;
+               ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+               s390) echo s390x ;;
+               *)              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_unpack()
+{
+       if [[ ${PV} = 9999 ]]; then
+               git-r3_src_unpack
+       fi
+       default
+}
+
+src_compile()
+{
+       export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch 
${CBUILD})-bootstrap
+       if use gccgo; then
+               mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+               local go_binary=$(gcc-config 
--get-bin-path)/go-$(gcc-major-version)
+               [[ -x ${go_binary} ]] || go_binary=$(
+                       find 
"${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+                               sort -V | tail -n1)
+               [[ -x ${go_binary} ]] ||
+                       die "go-$(gcc-major-version): command not found"
+               ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+       fi
+       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
+
+       # 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
+       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
+       einstalldocs
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # fix install_name for test object (binutils_test) on Darwin, it
+               # is never used in real circumstances
+               local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+                     
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+               install_name_tool -id "${libmac64}" "${D}${libmac64}"
+       fi
+}

Reply via email to