commit:     27f41eac0ce429902e9550ada3f48ad46b642984
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 18:13:30 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 18:13:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f41eac

dev-lang/go: remove old versions for bug #632408

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-lang/go/Manifest        |   2 -
 dev-lang/go/go-1.8.3.ebuild | 227 --------------------------------------------
 dev-lang/go/go-1.9.ebuild   | 227 --------------------------------------------
 3 files changed, 456 deletions(-)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 6294b6a058f..04183f4e593 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -9,6 +9,4 @@ DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 SHA256 
19eb3674c07a17dacec9620bc5
 DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 SHA256 
4e05b8830a473756cfee3fc27a17e09b38ccfca4e2335a485b41d3fb9c342066 SHA512 
6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba
 WHIRLPOOL 
cdc392fc51b7bfdd28e1c29bffce88139b9447261c9dbffefb3910b9c7406505bd250309618bd6a8430dcfcecc9155f8d5fe94f9e848cc2e721776ba34c22c3a
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 SHA256 
70bb859e80268b3421587d85189a807b14449b8c5e7b23606b87dfab54189634 SHA512 
d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
 WHIRLPOOL 
d0475efcbc2c1cbb3c6db452dbeb2a5fe709fa56b65eba2fbbcce2296b6a04ba89b9e33579d6eab192cd63b45ad78a0d7afd458229e4b252e80bd2db260abf11
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 SHA256 
83053f333d56d72ddbe9a8f293f8afeff31739806d49ebaa144811a5438b17bc SHA512 
52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 WHIRLPOOL 
2d58085d88fa612a7dfb087df33d2c5ee6b6d4c0b0c0363d5dcef014a6e3e9703816e8a111d1348e1e1a4ebcdde58694a869a27ae42e0deec154529f1a794991
-DIST go1.8.3.src.tar.gz 15345996 SHA256 
5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 SHA512 
c6e67dd9e3acdf2aa776d920f91f3fb1802d624ba5d51e06b2c7c6b71bcfaf91f4024f7a442cecde69175c589f7f1163f0ae86d887e15ddde710e53ce0961284
 WHIRLPOOL 
918a13b5323c77093428890ac4759daa3f40bd9379df0b862f9ba0fcf7f0f99eb83e37294dec25329a792573b97ddccb417a43dc8cccbd41bf17df6b01ea77f2
 DIST go1.9.1.src.tar.gz 16377700 SHA256 
a84afc9dc7d64fe0fa84d4d735e2ece23831a22117b50dafc75c1484f1cb550e SHA512 
3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793
 WHIRLPOOL 
1cdfddfbe2b432a783d821bf6caf6615868de7eeb71667fd38d77a115b87c0d5321d6928f271bbe7edd6e05d56f5a0e05b6fceeec5dd025673c0a0ad9224ad3e
-DIST go1.9.src.tar.gz 16377363 SHA256 
a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 SHA512 
70c4b892b6883fb21fc1a547a2b8d174df8c7aca282a3906e3816b4442b16c5da578b69c19443122a4a45e66fc95d170528d826b70932af09f4afd2a46615d74
 WHIRLPOOL 
ffd7c37ac49ac55546f0712cdfae9eda83c6cbc10a6b495b021d7a5076bac1063f0a322622692f1b67142a995da2de7e297a43727502331788adac43163848a2

diff --git a/dev-lang/go/go-1.8.3.ebuild b/dev-lang/go/go-1.8.3.ebuild
deleted file mode 100644
index 6b538a0be4e..00000000000
--- a/dev-lang/go/go-1.8.3.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="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 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="https://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
-       einfo "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
-}

diff --git a/dev-lang/go/go-1.9.ebuild b/dev-lang/go/go-1.9.ebuild
deleted file mode 100644
index b22bdb39015..00000000000
--- a/dev-lang/go/go-1.9.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="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 ~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="https://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
-       einfo "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