gentoo auto-resync : 03:05:2024 - 00:00:22

3 files changed, 60 insertions, 3 deletions

diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 8ff969a913ee..6798c31a9619 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,4 +1,7 @@
 DIST go-tools-0.1.10-deps.tar.xz 16247548 BLAKE2B 7dc27e377eec3c7fa49d37614d2b7b826735228ae3b22b9481bcba4e344afd51145e98a885c33b5b732d9e6382a5f50a94efcd6f3a820088dd528e561bd5fae0 SHA512 a7bcb32b0393640dd603e07958dc70abba750d219b46f2de649d7e3644432364798c5227df5d764ab6e62d01b60f10d74668914ea09f469ce19134bc934d17ba
 DIST go-tools-0.1.10.tar.gz 3014465 BLAKE2B f3b6129ad00385539eab3426bc542a120bd41d3984174d5d8b91bee6435d7a179c0058f2a50de3235a07e5b67f6d9657288bd578591d61187447441bb6408e76 SHA512 9c817c98739a1788b7fb459728528b5c647226e64df495661c1b3027bfa571e884d6c28d8796558b65e2ba54774976897bddcd052568f33d4e30ce8ee5d883e1
-EBUILD go-tools-0.1.10.ebuild 3103 BLAKE2B 096345de8c552763953fc717fd891c5f12b477bbf322523cec1eab8eb0b7ad035745d25f33eed922a7a51190a5c807dad4ed2c0b7bbcd651577635ea3f3f8a80 SHA512 c00bcb7256c5add3b58e6ec93c77c606bdc8f93428107907d00155f0e50a16f3bbdbc35d64af511782900de4e7b70089fb0f693237d2ad007bffb9ef2834a277
+DIST go-tools-0.20.0-deps.tar.xz 383336 BLAKE2B 0bddd81087bae28c2d874a2ea647a5293b32895fded73351813c1542066d7ee1a0d3d8a0aaa5c13cea3e117c692b46690282f992293d83c8fbd2901adc71911f SHA512 eeaa8a85ec81eed757156f99d6bc99f69c89debf52eb862e870c7effb7a0b800736e04f507efa19be122a5246aed2519d4c33bd850bc790947f065ab8a87a323
+DIST go-tools-0.20.0.tar.gz 3779878 BLAKE2B 42175d921dfb5acb25c9eee224138675619860aefaca09db8e354481c146faa52b2fcc64d99953d8508a79ce8375ebcc42a1e7d20f4721e55b8c843989565fbc SHA512 c67706593d0a48f941955e40cadc1e39961b07ba51c9342b302ba99f93a1e55b9feec21d6171ee370f96293253be27b480274d48a16eff1055373f81b73f2dd9
+EBUILD go-tools-0.1.10.ebuild 3154 BLAKE2B f0d6ac6ed0c573aa7145f8720de2c132906345fbfef344ec4bfa07183157076319d6467d11be9fe082df5baaedfca136555596c670c05d0a309000f82295a584 SHA512 8a8f79cd76d417283d39756b473e65eccaa58ff2edd1563a98fa115a768f8b45ed4b6f08307773e6df4604102c53820c8c73ac0b4f7f89b877abcf3d9bb9850b
+EBUILD go-tools-0.20.0.ebuild 1582 BLAKE2B 48f60668a01a7efd6bc3eaef2a0f3db31455a34cf8566d35242535703e1e167123bd79173d916c2cdc709cba5932f9a3e7b05480616310cd8ac79505dfde08cc SHA512 6c0dc51aa5e935fa66d4b1072a5a05c5de759d1ca80043d468cf042e8617b37cf9043d2df12907335faea91245d9ccefc9b5d407cc3e72292f6ed5d667bddae7
 MISC metadata.xml 304 BLAKE2B eb25bd6c86489f23152684d6eddeabebeb5bf9b2988b386d43d163286b9f38c8f0fe58a9103c45843280cd089d735e73a30e80e0368c3fe53e7bc2b4717603e4 SHA512 81050d8cfe2a1d8f1212613f4a043f0207c192026390bf7abfb68ea6262c12e0f0cd9f4f8c2ed23e62c47666bdb8498cf8fa58e57be5e10a7cd567dfc59e47ed
diff --git a/dev-go/go-tools/go-tools-0.1.10.ebuild b/dev-go/go-tools/go-tools-0.1.10.ebuild
index f0cc27e54838..6b26c11d0b19 100644
--- a/dev-go/go-tools/go-tools-0.1.10.ebuild
+++ b/dev-go/go-tools/go-tools-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,14 @@ DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
 HOMEPAGE="https://godoc.org/golang.org/x/tools"
 SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+S=${WORKDIR}/${P#go-}
 
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-S=${WORKDIR}/${P#go-}
+# Many test failures (bug 904314).
+RESTRICT="test"
 
 src_prepare() {
 	default
diff --git a/dev-go/go-tools/go-tools-0.20.0.ebuild b/dev-go/go-tools/go-tools-0.20.0.ebuild
new file mode 100644
index 000000000000..fe369f14fa0a
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="https://github.com/golang/tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+S=${WORKDIR}/${P#go-}
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Many test failures.
+RESTRICT="test"
+
+GO_TOOLS_BINS=(
+	authtest benchcmp bisect bundle callgraph compilebench cookieauth deadcode
+	defers digraph eg fieldalignment file2fuzz findcall fiximports fuzz-driver
+	fuzz-runner gitauth go-contrib-init godex godoc goimports gomvpkg gonew
+	gopackages gorename gostacks gotype goyacc html2article httpmux ifaceassert
+	lostcancel netrcauth nilness nodecount play present present2md shadow
+	splitdwarf ssadump stress stringer stringintconv toolstash unmarshal
+	unusedresult
+)
+
+src_compile() {
+	local bin packages
+	readarray -t packages < <(ego list ./...)
+	GOBIN="${S}/bin" nonfatal ego install -work "${packages[@]}" || true
+	for bin in "${GO_TOOLS_BINS[@]}"; do
+		[[ -x ${S}/bin/${bin} ]] || \
+			die "File not found, check build log: ${S}/bin/${bin}"
+	done
+}
+
+src_test() {
+	ego test -work ./...
+}
+
+src_install() {
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	local goroot=$(go env GOROOT)
+	goroot=${goroot#${EPREFIX}}
+	exeinto "${goroot}/bin"
+	doexe bin/*
+	dodir /usr/bin
+	ln "${ED}/${goroot}/bin/godoc" "${ED}/usr/bin/godoc" || die
+}