2025-07-13 05:41:03+00:00

4 files changed, 130 insertions, 5 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7d498ff0a9dbc..fe64409a07361 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 0d963d5b51802..f98bad57f92f9 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -14,6 +14,7 @@ EBUILD go-1.23.11.ebuild 4186 BLAKE2B dd59406985942656cfaa3b36930276bcfd08bd6857
 EBUILD go-1.23.9-r1.ebuild 4181 BLAKE2B 1a003518d838c380d5953b1c0c8cd5f6a7d509f08d22d41075044eff7eff1c92dec816fe9ce26319d84eb9b5da7300a426a01c0637c39aa373d31a1d63a20d1d SHA512 01a72f7ab34e282cae93133abeecdb799d08cb228cb0fa90fcb4bc30b35099ebe881f2eec51f4f039e121c264a6752f13e3a80038f48ab54d8e262dc61c1d5f7
 EBUILD go-1.24.3.ebuild 3363 BLAKE2B eb353c22500b50c29b58f6d32b55a9d02417c95de0c466dd29aa0e33329088a7031c6c71cda8e9a8e13e29b4b3417eb08531e3b074cf0bfc16e72577fd5c7c9f SHA512 d75c919d92722241b7ef2116c67fd4c8c6988a9af78fc59342090b0e4d3cef9629b446e66cdd7a7bc537c6bc82c4fe818ee3e6b235a95d800025bccc60bead2c
 EBUILD go-1.24.4.ebuild 3364 BLAKE2B ace8d91300a388526475b2e55e188d936867e2330647fb4503a7c75f3822657a0b3513431ab651c6b0dac6003997368e32cf6791e74dde04a385b2983c1093df SHA512 f88c5ec1a318ff11c4bbcfb284223e58c95a9c1a316ab321b91d39014c36cfe31220b1c55a923daa8ec0b94cd13d213f20e3f7d86e4e68e825a043d6d0451074
+EBUILD go-1.24.5-r1.ebuild 3270 BLAKE2B af76349ff6c0eb8738c37fbad038dd4f02419544818042db2884e46355b37124e7e227c2f494d9b47f039d8de0b2bc9e48f1b384c810e297f49c711bd4cc7719 SHA512 802327b699d17862e1433fe3e52e06ded948e4b5eb403f78704ec0fdf043a1b83ece40a1fdb2ebe144ade3af75923a2b9051bad7a95ca828531116118b966ceb
 EBUILD go-1.24.5.ebuild 3368 BLAKE2B 4124a02284437def9edfe9daea363d64c96d1943713aab0449a290740cdb9f98162c5fd54890e12575fb4bf2200eedb417d369822b381b1810796902e75fec3b SHA512 1a735e35d2d3bada964a1cfe2d0ad40dec00e82c3b665d72b96f3f7a015f9b6bbd09a13f31458f14f4d3354378cc76937ed3c8843076ca32808dc72e59e146d2
-EBUILD go-9999.ebuild 3325 BLAKE2B 44e91a7a333928cf9776903747221b227951d35cafee81b4df3ce8cc3fc847b21503cd34b339cdade49de5a4c810aee5a2f00698542615a42efb189b9bf26208 SHA512 f7cb4aa003edf37bfc89ebd3269e16049a1a33345d2aa779a32029c6c7fbdff3e6d051e499676dbaee0eb061fccc27de9d5e5413b8ffb676ee6a8f237955d858
+EBUILD go-9999.ebuild 3227 BLAKE2B c667156acc8215fdd0ba0b42f6633b15bd4846d131d2244364c9c822a0499ab490c2fc9c029ecf6cc161ccf60953ec26090b480b7fb94c8f7ef17b48b3f424b5 SHA512 703e82334da0c98a2c963808f84a0e5aedd1b517d7635de611fb07e3f95325bd2f7a5db2f554047ac919f442336e5d0a7a0c62e2c57675b762098aa6fefd63f9
 MISC metadata.xml 589 BLAKE2B 341e4c0e91d73ca668c1795035e1223eed60f85c724afd989ef1f8fb69649f7f6eaaf8a5228f6c8f587ffcc40a438c47d332fbe6866839f5a0829872a983f642 SHA512 fe58ddddfbd4d0d060516cb035592a80c0f48e125bb59c95d3c6fac0c182271e2a9ec9bd055b9cc8e6cb8c449e6c483bff4a23c362f532c24255febfdefc273a
diff --git a/dev-lang/go/go-1.24.5-r1.ebuild b/dev-lang/go/go-1.24.5-r1.ebuild
new file mode 100644
index 0000000000000..73979ffd66270
--- /dev/null
+++ b/dev-lang/go/go-1.24.5-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.22.12
+MY_PV=${PV/_/}
+
+inherit go-env 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
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	;;
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+		>=dev-lang/go-${GO_BOOTSTRAP_MIN}
+		>=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )"
+
+# 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='.*'
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_tuple() {
+	echo "$(go-env_goos $@)_$(go-env_goarch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+PATCHES=(
+	"${FILESDIR}"/go-1.24-skip-gdb-tests.patch
+	"${FILESDIR}"/go-1.24-dont-force-gold-arm.patch
+	"${FILESDIR}"/go-never-download-newer-toolchains.patch
+)
+
+src_compile() {
+	if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; 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
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go-env_goarch ${CBUILD})
+	export GOHOSTOS=$(go-env_goos ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go-env_goarch)
+	export GOOS=$(go-env_goos)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go-env_goarm)
+	use x86 && export GO386=$(go-env_go386)
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild -k || die "tests failed"
+}
+
+src_install() {
+	dodir /usr/lib/go
+	# The use of cp is deliberate in order to retain permissions
+	cp -R . "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	# The other files we remove are installed by einstalldocs
+	rm -r $(find "${ED}"/usr/lib/go -iname testdata -type d -print) || die
+	rm "${ED}"/usr/lib/go/{CONTRIBUTING.md,PATENTS,README.md} || die
+	rm "${ED}"/usr/lib/go/{SECURITY.md,codereview.cfg,LICENSE} || die
+
+	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
+}
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 923732906b23c..5f202931d0de4 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -48,10 +48,6 @@ QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
 # 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