commit:     10ef3cc28c1427c0e822714cbb693f2bd2e806cd
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 21:00:29 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 21:01:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ef3cc2

dev-lang/go: remove 1.9

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/go/Manifest        |   2 -
 dev-lang/go/go-1.9.6.ebuild | 228 --------------------------------------------
 dev-lang/go/go-1.9.7.ebuild | 228 --------------------------------------------
 3 files changed, 458 deletions(-)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index f5dff19392c..6b982a3eb97 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -14,5 +14,3 @@ DIST go1.10.3.src.tar.gz 18323736 BLAKE2B 
f07ea774378eb25e28fc29ce6d8d7ed84227d4
 DIST go1.10.4.src.tar.gz 18331174 BLAKE2B 
e16998d81d286f132894fefd31f4139f757b7da3dfc829c389e41ef770bed22b3c9ae7bcf190fb4c83da16cf8e8c34681cfdc5bbc786f9036710e821c9bbd483
 SHA512 
ead2c06d903670ff4530748aa2fa6a1140fdf32cf3b8d74cd7d6e046af73c79fd5f98d2188062e6845e5c0513c080ed7079a210720c30338cb8730b95aede9f5
 DIST go1.11.1.src.tar.gz 21097206 BLAKE2B 
12303f57a92ec64badffea9e98a0361f48b844d423f3ed454ba4bfdd367425e7b318de1cf9b3e7835585f6dbb01f5c07bfb43adbfcc90a590b35984752ef8d3c
 SHA512 
9c19f40b24f2180563705511a5692932c0db3585939053e6d78eea1f394902d37f05b0386f0e7d0c0266178de7e9bd7b003324ed232ce2e5050c9faafafdd979
 DIST go1.11.src.tar.gz 21091932 BLAKE2B 
029b1c43b6244ab320b24fccca2bac693a0df0f975da2880a24e85fafbd7d6c836f63c609f1df44fb3eacc1c66c3d147858b7a2b9c0c370bb8fdbc8614b35713
 SHA512 
2758b7924b4b8cffc30b56fbf039b8e23d1a3c42506ed4997bd64531ba742e2c60e95d1fa70cae2ccda45d1959fadccfd2404af87d962530e4b1d3556c4aaf43
-DIST go1.9.6.src.tar.gz 16397247 BLAKE2B 
36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd
 SHA512 
f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2
-DIST go1.9.7.src.tar.gz 16401688 BLAKE2B 
f6fa7b7171595f6bb2b1860c10a34c386b781504b772a37b60ccd613850f916a463bdb1e2bf299c3d8e78e38cbdf0b59e1ee8dfc3597ef888450efb3eb6afc49
 SHA512 
1ed3375870223a73c9cf94839bfd8894b92f44f9a3ba3b2bec1e9cd8d2212519344c8afcb87a516d6ad3e1ccdc74d9dba225a222bdc5e60f6d73cb474d5f7664

diff --git a/dev-lang/go/go-1.9.6.ebuild b/dev-lang/go/go-1.9.6.ebuild
deleted file mode 100644
index 503bf3c4a12..00000000000
--- a/dev-lang/go/go-1.9.6.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 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/escapeinfo.gox
-       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.7.ebuild b/dev-lang/go/go-1.9.7.ebuild
deleted file mode 100644
index a5edf13b59d..00000000000
--- a/dev-lang/go/go-1.9.7.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 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/escapeinfo.gox
-       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