From 8597835c40eb98aba3f921550053d6664abb821e Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Sat, 18 Apr 2020 13:15:55 -0500
Subject: [PATCH] dev-lang/go: sync live

Signed-off-by: William Hubbs <williamh@gentoo.org>
---
 dev-lang/go/go-9999.ebuild | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index f7c4c78376b8..3c87c2a4e5f0 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -22,12 +22,6 @@ case ${PV}  in
 	*_beta*|*_rc*) ;;
 	*)
 		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~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
@@ -43,17 +37,9 @@ BDEPEND="|| (
 		dev-lang/go-bootstrap )"
 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/*.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/.*/.*"
 
@@ -151,7 +137,7 @@ src_compile()
 	fi
 
 	cd src
-	./make.bash || die "build failed"
+	./make.bash -v || die "build failed"
 }
 
 src_test()
@@ -161,6 +147,9 @@ src_test()
 	cd src
 	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()
@@ -176,6 +165,8 @@ src_install()
 	#
 	# deliberately use cp to retain permissions
 	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
 	if go_cross_compile; then
 		bin_path="bin/$(go_tuple)"
 	else
-- 
2.26.2