commit:     70696bd4d0d3e435bbfc0ced542355f2d25951b2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 21:57:15 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 22:04:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70696bd4

dev-lang/go: remove unstable versions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-lang/go/Manifest        |   1 -
 dev-lang/go/go-1.7.4.ebuild | 221 ------------------------------------------
 dev-lang/go/go-1.8.ebuild   | 227 --------------------------------------------
 3 files changed, 449 deletions(-)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e48f3fd01c9..c04d3006682 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -20,7 +20,6 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 SHA256 
70bb859e80268b3421587d8518
 DIST go-linux-s390x-bootstrap.tbz 49809007 SHA256 
80a87bc5ac2239c99f8d7425fbc6f4fefba63f549b0835505c25378c08114656 SHA512 
1b7500e6c42508b6cb07214620070065262349d2cd3698deeac0638d0bf0bfeb89c59c2d72a284af34f3071b4cfb9ce543c5fdec7add4a46adc9580295909439
 WHIRLPOOL 
d3782cb515ab67720105224e02d96ab1ca86518db661719b2d0f7c48aa1f4f896a7cc5fed5b6ddc032c8206e8a10c6262646be0e59def61723936044d6ceb143
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 SHA256 
83053f333d56d72ddbe9a8f293f8afeff31739806d49ebaa144811a5438b17bc SHA512 
52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 WHIRLPOOL 
2d58085d88fa612a7dfb087df33d2c5ee6b6d4c0b0c0363d5dcef014a6e3e9703816e8a111d1348e1e1a4ebcdde58694a869a27ae42e0deec154529f1a794991
 DIST go-solaris-amd64-bootstrap.tbz 48367195 SHA256 
92ebdbf001f243a78a6c2d8ee30e929ba2cecbedf8e0fc07e129b04b107453ad SHA512 
cf8725db0d001d61badee71624799a3c9e75f61f77ab090c1f6c490d694c4be367019b28d88306045d877ab5a324a1f9b0674293caf3acb19c193fc3746a48f2
 WHIRLPOOL 
672c6642e340b6d4f38b633f67fdc3202e3725022a8a61e2129276fccd6c42ddc24ed06c1d57eb31a25ea8056b79686619cbb36431b9c23b6d4be5bcb715bd89
-DIST go1.7.4.src.tar.gz 14198817 SHA256 
4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc SHA512 
dc9950c3ea7100e536ad58fd93505d584276b7c50d4b8fe2ba7f20fd043dcf0d315b735c48945302055e91517594cc2b0061ccec9478a8ab48f1f2836c20afb3
 WHIRLPOOL 
054f496555dd30e0ba6a3c449b915ea048d5f85f1cf6d2ef6e8aa84939b6e9674b30cfccee99d050c5d75d028cf43d83bf0267703ffb02dfc5bc780fd0a1706f
 DIST go1.7.5.src.tar.gz 14204325 SHA256 
4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 SHA512 
2dda0780a8b24d71fec4ddeb6858c58a42845f51d9afc171d924a7b763101878cc7f29ae1dd35f129b4ee45b84d45211093a1d20639745fed36b49fb7fe1ba07
 WHIRLPOOL 
b28ab10558d9f8fba87d5db2c839a84eab0b61244d75f4b3d42b443365ca8a1ae1c60c2e1073ef2b4a854d957c26111fcc286b7caae4be892e6cba0e4b24e21d
 DIST go1.8.1.src.tar.gz 15331455 SHA256 
33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 SHA512 
f01fe7b35ac23101610f6fc169b88dafe2edc49b3b044d5d0aff771b05dcb2c8d2e7a5090ed6dbe67f861e78e792ace32e209ed464399ca02dcd186b13ec8037
 WHIRLPOOL 
c358ca23740183afac4ecf83a6b7daeeef3e6481f29cb5f98b911cb1d661921db2e16ac2528f0ec59633920f1484e7fa777275e46313e20cc8b32baed9054d24
 DIST go1.8.src.tar.gz 15320083 SHA256 
406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596 SHA512 
9742dd8ec0364793e44a55207238c7339236a4da3a6e7cbb3b4eca45e957c7c0cb725e7d7430b9a04630285468d32dac686facfc57f3f58885b80bbb3d333ada
 WHIRLPOOL 
62d7b1729d3a192142b7b1af20c797736ae631bb87e7c82487601e669d69547212669c216e66d0d64ad83884d348ed3dacf2f9fd9d923f85c673adadd0ff4aae

diff --git a/dev-lang/go/go-1.7.4.ebuild b/dev-lang/go/go-1.7.4.ebuild
deleted file mode 100644
index dab3574573c..00000000000
--- a/dev-lang/go/go-1.7.4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist";
-SRC_URI="!gccgo? (
-kernel_Darwin? (
-       x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
-)
-kernel_FreeBSD? (
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap-1.tbz )
-)
-kernel_linux? (
-       amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
-       arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
-       arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
-       ppc64? (
-               ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz
-               ${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap.tbz
-       )
-       s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap.tbz )
-       x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-1.tbz )
-)
-kernel_SunOS? (
-       x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
-)
-)
-"
-
-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${MY_PV}.src.tar.gz";
-       case ${PV} in
-               *9999*|*_rc*) ;;
-               *)
-                       KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd 
~x86-fbsd ~x64-macos ~x64-solaris"
-                       ;;
-       esac
-fi
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="http://www.golang.org";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-DEPEND="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"
-
-# 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/.*/.*"
-
-# 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;;
-               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)-$(go_arch)-bootstrap
-       if use gccgo; then
-               mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-               local go_binary=$(gcc-config --get-bin-path)/go-5
-               [[ -x ${go_binary} ]] || go_binary=$(
-                       find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V 
| tail -n1)
-               [[ -x ${go_binary} ]] || die "go-5: 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
-       elog "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-       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
-
-       cp -a misc "${D}"/usr/lib/go/misc
-
-       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
-}

diff --git a/dev-lang/go/go-1.8.ebuild b/dev-lang/go/go-1.8.ebuild
deleted file mode 100644
index 1137d737fef..00000000000
--- a/dev-lang/go/go-1.8.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist";
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_URI="
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
-ppc64? (
-       ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-       ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
-x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
-"
-
-case ${PV}  in
-*9999*)
-       EGIT_REPO_URI="git://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 ~x86 ~amd64-fbsd 
~x86-fbsd ~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
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="http://www.golang.org";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-DEPEND="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/go/internal/gccgoimporter/testdata/unicode.gox
-       usr/lib/go/src/go/internal/gccgoimporter/testdata/time.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)-$(go_arch)-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
-       elog "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-       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
-}

Reply via email to