5 files changed, 327 insertions, 2 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 754a034a439d..89baaaca976f 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 0af77947d33d..52cbf044b609 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -22,11 +22,15 @@ DIST cmake-3.31.6.tar.gz 11710589 BLAKE2B ea1bee1a98568407dfc164f82bf0e3ab082124
 DIST cmake-4.0.0-rc4-SHA-256.txt 2099 BLAKE2B 9a902a5ceb3a4c8a1886fc2df05f5b229f76670781e77fc423be723f5455d0b323b5babd242f72bc737ea75e657bae1cbf67e54b50c2ecd385d0e8baa8812ece SHA512 0691a37482e90b27be913c925100c1485768221824e6e91f992671dacf18f6c318c7d2dc67551e391e6c7e0b1ee418ad9b88ed82309456b0bc3c86b53981173b
 DIST cmake-4.0.0-rc4-SHA-256.txt.asc 833 BLAKE2B a9118933d4daebe4afd8e0a54afbcdb32f961248fa70c9f468bcf5743a6aa5e30f6083d78b1b51550e6e1388e99926e0f0ef07a1853cf62d7d7d169430e73b3a SHA512 a4db155a0e3df77332420e806e333d9435f927b82a4b03eabb263346cb632f62a44168e45f5a7a0aa2e12ab54fd2edb049544be8796997898734f1ed7454a6f8
 DIST cmake-4.0.0-rc4.tar.gz 11825037 BLAKE2B cca7e01a79bedea65622754c1e920f621b4ce1e4637a11e7d3b880d26fc074d52766593c4441a32898ec9c61a1ed9fd27ac47c95985ec22e8c355bbbc3025e68 SHA512 a2325e22f23bd62a048b6e9e9c2b6c069260b510169686ee69e45fe1596b53947bef449b32c14471ecc94840d8275e5fe3de89dd63b2aa9e7bdcbd7972e5a457
+DIST cmake-4.0.0-rc5-SHA-256.txt 2099 BLAKE2B d88c7e938be55fa7a131ed3c28c000a3bd3ea457f7f38936548f7d3533e65dcfb38b8ed622cd314c50ea602865313cbaeef9b9ac43b27895dc6883c7ff534fe3 SHA512 8d1c553bfde2f93b68ad007a0bd8578368ef2d696f8b157f1482504079f7f5df38a513e9f491ee14038930e6d0bfc1c0e83d91dd78af506aacd7e93654ad124d
+DIST cmake-4.0.0-rc5-SHA-256.txt.asc 833 BLAKE2B c3b075305280bfd55170d036340da2eb39e94181cf220361d4670bfe4af17236a8c29bf42ec5f8cdea50d6ed549133e5a0b4ec55c59e3ae276ed8b14a16c8c8d SHA512 39e5dd3e4f47e93b842e10b69233ba53ae923f2b622b25f72b465b7b7379f6a5bf5a91e9c3524a958ed8f12c10ace44f3eecbe033bfc5d027457aee98293d133
+DIST cmake-4.0.0-rc5.tar.gz 11825372 BLAKE2B 0c3478e80eef65950d16457c036f0e92c03afdf005964764226afed9a140f6810ce674cd03086ad9967f252804e9d1010ef4b1be2ca2709dedb4e9645e00f247 SHA512 997a807769fb8066fd4a2edb154a4a1b235b0c1288116795a6f5090c52227a2fbe5d272fa0bcfb8748578358434d716511ea7b931100b60ccf3b84fbe9ecf3a3
 DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c
 EBUILD cmake-3.28.5.ebuild 8496 BLAKE2B fed797d7701c1c29eaba65ef98e6fad43dcc8602b5895c5be3355a8a279657dbee1b09e90d4c82a41e960ef4df29102ac59a2877f32dbda2b19163ed3a955685 SHA512 95eb2b178a25829be4d6ae7ded2f0c349ae48a5e034f8c1786df430718baa2eaa253f09b4e07527266470b35f796620454dc9c0f64b76f1df6048e5379cd869d
 EBUILD cmake-3.31.5.ebuild 9747 BLAKE2B ee45238a0d2df8151d070183aec708c432241c18a1f8a41d80c6e210cf056e4374cd7d7f0bb31b71dbe82093c67beebbb8585fd3d0b7002d3eab65fe5faf473c SHA512 7cdfe1cecebe0b5ac62acb9dcc3164c150bdea6e2b3e52d09e106bd8e2569902c6978a4f89a45a4ba9ec9343d18ebea6de58789fa9a91a5ebd323910b4fe2b07
 EBUILD cmake-3.31.6-r1.ebuild 9745 BLAKE2B d98da2054bc4924ebf393aebf82fbd95916328ec64550a367c9f028932efc3548e2fbc79fe9eb14c0619c759131cf3e750950bba136becb1451f7462dd730612 SHA512 9d0d7190d67d77a74e778ac309cef38a0dcbd25abae4cf894d5f9b2305e701d009a9eab316c5762edf235f8e83b4e02aba6c2726f07c7f846b9bd694587d59c1
 EBUILD cmake-3.31.6.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
 EBUILD cmake-4.0.0_rc4.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
+EBUILD cmake-4.0.0_rc5.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
 EBUILD cmake-9999.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-4.0.0_rc5.ebuild b/dev-build/cmake/cmake-4.0.0_rc5.ebuild
new file mode 100644
index 000000000000..41639c300a5d
--- /dev/null
+++ b/dev-build/cmake/cmake-4.0.0_rc5.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=4.0.0_rc1
+#CMAKE_DOCS_VERSION=${PV}
+#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
+	toolchain-funcs xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == *9999* ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+	inherit verify-sig
+
+	SRC_URI+=" verify-sig? (
+		https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt
+		https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc
+		https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt
+		https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc
+	)"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash:0=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	dap? ( dev-cpp/cppdap )
+	gui? ( dev-qt/qtbase:6[gui,widgets] )
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	# Cuda
+	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+
+	# Upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+pkg_pretend() {
+	if [[ -z ${EPREFIX} ]] ; then
+		local file
+		local errant_files=()
+
+		# See bug #599684 and  bug #753581 (at least)
+		for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+			if [[ -e ${file} ]]; then
+				errant_files+=( "${file}" )
+			fi
+		done
+
+		# If errant files exist
+		if [[ ${#errant_files[@]} -gt 0 ]]; then
+			eerror "Errant files found!"
+			eerror "The presence of these files is known to confuse CMake's"
+			eerror "library path logic. Please (re)move these files:"
+
+			for file in "${errant_files[@]}"; do
+				eerror " mv ${file} ${file}.bak"
+			done
+
+			die "Stray files found in /etc/, see above message"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# Disable system integration, bug #933744
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			Source/cmFindProgramCommand.cxx \
+			Source/CPack/cmCPackGeneratorFactory.cxx || die
+		sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
+			Source/cmMachO.cxx || die
+		sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
+			Source/CMakeLists.txt || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
+	## handle them as part of bootstrapping, sadly.
+
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	# 4.0.0_rc1 is missing this, fails to configure
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/26712
+	touch .clang-tidy Utilities/.clang-tidy || die
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_QtDialog=$(usex gui)
+	)
+
+	use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it?
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	local -x QT_QPA_PLATFORM=offscreen
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index a101c448b8f3..a22b8e1dda85 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -9,5 +9,5 @@ DIST scons-4.9.0-user.html 1713371 BLAKE2B bcb0a028a531d33b62df3b620b16cc103cba4
 DIST scons-4.9.0-user.pdf 3118902 BLAKE2B d610314b15164cdc4185d423ef5836c5e94a81b377c6befc487cc2c48fadd8037099daa8258c9d66b5d330f9565575f30fb618e650ad32e42abf0e5dad935c4f SHA512 9eb35b5862dc60ba268ced8a830a5dae48a7ca66dc8ae6139dc762808973bd3a0bb81c19ab4d9732c253d9a4fba5b60bc35cdf553f084a519c81b3abeed4b5fb
 DIST scons-4.9.0.gh.tar.gz 5957861 BLAKE2B 1d69245797470b398c623ed6f524783527336db93436792e3b947b898afb188a42c8d9198c7f3b91371da1b49ea7609872f0e8455c14749fb2a73d88d463c589 SHA512 64553794a8b78c9722b1c31eb934ffc6910968431f6a57c9f8d6d8b5ec9d343db8aa28a3f8d924f7a9c50d85edd76c02e08d5b82be2afbc45c32b560cfbc6106
 EBUILD scons-4.8.1.ebuild 4550 BLAKE2B 6e449ae1fc491ffd406744a6fe4224175a6637be325ebac41649f67e7e9bdde13ee28724361d5dee1e559413336676b33e7e7eafc5aae89156317b558b21233f SHA512 0a92587c5acf4ced46567dfdefb43315774dae6db4711594858a8c80c902792c5c0b23cc4acb1335e31bb9ad156f5514b2d36d1289b8b4b78b0ebd5d14f621ce
-EBUILD scons-4.9.0.ebuild 4557 BLAKE2B cd3b459fd2e31650263d6ad0d69f4e0fda021cc978d3f085a1aad1e6e59f03047ee6641bf64a9ccfce1389343b9d92ee1d820485da4a467ada061ffc6141eb7f SHA512 147b1c3895f027c7f130ad32e251467511ef8497d1bbb737f9b0f268b049c2ca6643bac118c564560103aaf8d6205843e11bf537d7c332b9644d6278444e4fe6
+EBUILD scons-4.9.0.ebuild 4552 BLAKE2B 24e6127657588282aee44991d24752e2c2dd9b09cb1b1d5ec2ec5a81bc3744f37c30ab6c882b66d5eb445d8c6f38906bb5d67d57799aebd90b31190272764b64 SHA512 9e58b68da1295ae486799c50e2318168e7b524b8d5de785efedffc88f8d375280e907c18f088e6d808a6e918e1b773d49d7ea9e45449823edacf776e8ded1c2a
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-build/scons/scons-4.9.0.ebuild b/dev-build/scons/scons-4.9.0.ebuild
index a1a78105c001..484e920efa90 100644
--- a/dev-build/scons/scons-4.9.0.ebuild
+++ b/dev-build/scons/scons-4.9.0.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"