From ea4d97bae88695501ff5f5c646a57e2e0488e423 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Aug 2023 21:36:58 +0100 Subject: gentoo auto-resync : 18:08:2023 - 21:36:58 --- dev-lang/go/Manifest | 8 +- dev-lang/go/go-1.20.5.ebuild | 208 ------------------------------------------- dev-lang/go/go-1.20.7.ebuild | 2 +- dev-lang/go/go-1.21.0.ebuild | 5 +- dev-lang/go/go-9999.ebuild | 2 +- 5 files changed, 6 insertions(+), 219 deletions(-) delete mode 100644 dev-lang/go/go-1.20.5.ebuild (limited to 'dev-lang/go') diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index 7fb1b5e48e91..619a2f729f1c 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,10 +1,8 @@ AUX go-never-download-newer-toolchains.patch 368 BLAKE2B 0c90f46492af80622f430b2d506b143f3b553b5276085f78f41b93fee8219745179038302462603b5b1677554d92911eb4865084d0488aaa4c71ae1abc307f71 SHA512 b5acf97ccf96c6a353fcb7bd97113c38562defd82338828124fcc72c71334feda9c4e839d2aae5b66b809bc8a692eac96396c54a478e17a7ffd8d2c68fea95e6 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315 -DIST go1.20.5.src.tar.gz 26192951 BLAKE2B 13ab06a45a7b13eb5cf8886594343bc169df3c4ff0062ac89c0997283686563edccb7d39423457947f945782bef418ab1a1f3b8712aa8817a8f4c61b54e8574c SHA512 94cecb366cd9d9722b53e52ea3b0a5715a9e9dc21da0273dd3db9354557f71b9501b018125ef073dacc2e59125335f436cea1151cd8df0d60e2ad513f841905c DIST go1.20.7.src.tar.gz 26192928 BLAKE2B 89a1b2bde472c22534e63585cd8fcff6076a16a7f1d15e90ec5cf5277225ae3bf53805531b256d0090cb170ed7e1bd1ed494cffcf5b3777f435bbb3591906612 SHA512 c3dae709d0db8ab32a68bda2d260ffe86ee77c703bdbf34eefd0e1f745dd0aa04e3d17833877e7f06aa066686da501a85361591e510a341affc0244dde2b9946 DIST go1.21.0.src.tar.gz 26942359 BLAKE2B ba04a8b20d4ea35cd6f32e5975a347c9359b9e9d2bf77196afb50b6f527d69623cdc7900c74abe5315e53589e0be20aef5eb4a5faa0efa836ed22db12d041203 SHA512 da629fee156de6abbc5195f746e2fe4172a31b97eccd3871283c60452e81ac740533cc28ca68762ebc0ce48fb791dc527d3b7ebe7e1aee0f0b68868de736ed42 -EBUILD go-1.20.5.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba -EBUILD go-1.20.7.ebuild 5386 BLAKE2B 2497a54dce26d0c588657198fa9635a770637b44cece808377e9e7b498862f4be70b78f7d70435418720bf301620c3c3c30f51869cb5a18c8d23dc9614bec2d1 SHA512 6437aa598ac8326d93bae18441c429aaa855a30953b6e72873787e22c5a0bf8feba11b5087925200572e1e5a2a5cc622f2f9d8bcd0bc4fd446e195ac950e1be6 -EBUILD go-1.21.0.ebuild 5274 BLAKE2B 1e74a60e9de0b342e779bea1907c7c83c0a3ffe4ecab199d1467898afaf16dbbdcb52655907c8e89e0680a18161a0be7135363c31124ca4ccb24521390df6740 SHA512 511bb883ddec424909084425de81a5524ffc25f6b6b3ac207b7d531e6fa7350a1d8e88dd624f42632fc186a16bcc43f562da3f5d00e1c2adad4ea4ced48360c7 -EBUILD go-9999.ebuild 5271 BLAKE2B 35ccee875f857c6eff53f8a89b950e7c67194b7b67469b271b7096ff217d640d7ef4b5368e13b844517d5a10ec8addce01ec4cfbf50bfd93ebcb7073a14b64f6 SHA512 13cd678e3ccff6f0d9db63436ac98579f79bfc327e992efc9f67f5ef4039bfe7f580943e17acb23af2a1116a1834b5ebbefad49100467f28802aad31c4a21fce +EBUILD go-1.20.7.ebuild 5385 BLAKE2B 161e5bcf4c08a899a90237983cfdd35724057f933ca12d171d0a2b036ff8770ed25f52da4b403299203e6de1ac6bcd876651f8569f55f1ef93bbe7920c107ae5 SHA512 65cab89cd5e8a26020b6d55bcc1e98ec1bda8d7f1f964cde416d77a531c2b46ca797e9893e7d8811750e0b3e2129698aa830ca6d0b49e8ab2a8cbcbd283adf5e +EBUILD go-1.21.0.ebuild 5208 BLAKE2B cb10da15a0798d5b7f6c0138e5003f7ee913c5899b72fa77f4eaeae7130249a4c807330abb590c13df242fa8404a4f369862c3c028a95dc4fa44065d8b6f53ab SHA512 f0728ed7ad0fbfb8b83a725766af0c53cb7ee4ef62120eed90f84c61e9f6faa76cf5250bf9b5d0d81ef904c91dc811bc05afe4b62bac35f79870884c990698ab +EBUILD go-9999.ebuild 5274 BLAKE2B 1e74a60e9de0b342e779bea1907c7c83c0a3ffe4ecab199d1467898afaf16dbbdcb52655907c8e89e0680a18161a0be7135363c31124ca4ccb24521390df6740 SHA512 511bb883ddec424909084425de81a5524ffc25f6b6b3ac207b7d531e6fa7350a1d8e88dd624f42632fc186a16bcc43f562da3f5d00e1c2adad4ea4ced48360c7 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b diff --git a/dev-lang/go/go-1.20.5.ebuild b/dev-lang/go/go-1.20.5.ebuild deleted file mode 100644 index b6862ea87040..000000000000 --- a/dev-lang/go/go-1.20.5.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2023 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 - -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 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - ;; - esac -esac - -DESCRIPTION="A concurrent garbage collected and typesafe programming language" -HOMEPAGE="https://go.dev" - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2" - -RDEPEND=" -arm? ( sys-devel/binutils[gold] ) -arm64? ( sys-devel/binutils[gold] )" -BDEPEND="|| ( - dev-lang/go - dev-lang/go-bootstrap )" - -# the *.syso files have writable/executable stacks -QA_EXECSTACK='*.syso' - -# Do not complain about CFLAGS, etc, since Go doesn't use them. -QA_FLAGS_IGNORED='.*' - -# The tools in /usr/lib/go should not cause the multilib-strict check to fail. -QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" - -# This package triggers "unrecognized elf file(s)" notices on riscv. -# https://bugs.gentoo.org/794046 -QA_PREBUILT='.*' - -# Do not strip this package. Stripping is unsupported upstream and may -# fail. -RESTRICT+=" strip" - -DOCS=( - CONTRIBUTING.md - PATENTS - README.md - SECURITY.md -) - -go_arch() { - # By chance most portage arch names match Go - local tc_arch=$(tc-arch $@) - case "${tc_arch}" in - x86) echo 386;; - x64-*) echo amd64;; - loong) echo loong64;; - mips) if use abi_mips_o32; then - [[ $(tc-endian $@) = big ]] && echo mips || echo mipsle - elif use abi_mips_n64; then - [[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le - fi ;; - ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;; - riscv) echo riscv64 ;; - s390) echo s390x ;; - *) echo "${tc_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) ]] -} - -src_compile() { - if has_version -b dev-lang/go; then - export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" - elif has_version -b dev-lang/go-bootstrap; then - export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" - else - eerror "Go cannot be built without go or go-bootstrap installed" - die "Should not be here, please report a bug" - 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) - use arm && export GOARM=$(go_arm) - use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat') - - cd src - bash -x ./make.bash || die "build failed" -} - -src_test() { - go_cross_compile && return 0 - - cd src - - # https://github.com/golang/go/issues/42005 - rm cmd/link/internal/ld/fallocate_test.go || true - - PATH="${GOBIN}:${PATH}" \ - ./run.bash -no-rebuild || die "tests failed" - cd .. - rm -fr pkg/*_race || die - rm -fr pkg/obj/go-build || die -} - -src_install() { - # 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. - # The use of cp is deliberate in order to retain permissions - # [1] https://golang.org/issue/2775 - dodir /usr/lib/go - cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go - einstalldocs - - # testdata directories are not needed on the installed system - rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print) - - local bin_path - if go_cross_compile; then - bin_path="bin/$(go_tuple)" - else - bin_path=bin - fi - local f x - for x in ${bin_path}/*; do - f=${x##*/} - dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} - done - - # install the @golang-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/go-sets.conf go.conf -} - -pkg_postinst() { - [[ -z ${REPLACING_VERSIONS} ]] && return - elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild" - elog "all packages compiled with previous versions of ${CATEGORY}/${PN}" - elog "due to the static linking nature of go." - elog "If this is not done, the packages compiled with the older" - elog "version of the compiler will not be updated until they are" - elog "updated individually, which could mean they will have" - elog "vulnerabilities." - elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages" - elog "See https://bugs.gentoo.org/752153 for more info" -} diff --git a/dev-lang/go/go-1.20.7.ebuild b/dev-lang/go/go-1.20.7.ebuild index 5287411061d6..ff581b99e355 100644 --- a/dev-lang/go/go-1.20.7.ebuild +++ b/dev-lang/go/go-1.20.7.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/go/go-1.21.0.ebuild b/dev-lang/go/go-1.21.0.ebuild index 56317b3b9f06..f89ba97d1fff 100644 --- a/dev-lang/go/go-1.21.0.ebuild +++ b/dev-lang/go/go-1.21.0.ebuild @@ -161,13 +161,10 @@ src_test() { cd src # https://github.com/golang/go/issues/42005 - rm cmd/link/internal/ld/fallocate_test.go || true + rm cmd/link/internal/ld/fallocate_test.go || die PATH="${GOBIN}:${PATH}" \ ./run.bash -no-rebuild -k || die "tests failed" - cd .. - rm -fr pkg/*_race || die - rm -fr pkg/obj/go-build || die } src_install() { diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 68b33c5e0315..56317b3b9f06 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -164,7 +164,7 @@ src_test() { rm cmd/link/internal/ld/fallocate_test.go || true PATH="${GOBIN}:${PATH}" \ - ./run.bash -no-rebuild || die "tests failed" + ./run.bash -no-rebuild -k || die "tests failed" cd .. rm -fr pkg/*_race || die rm -fr pkg/obj/go-build || die -- cgit v1.2.3