15 files changed, 180 insertions, 315 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index e506b7dfe578..e10bac6a648f 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index ab46b8312fe7..b2c155fcbe37 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -12,9 +12,6 @@ DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b2
 DIST cmake-3.28.5-SHA-256.txt.asc 833 BLAKE2B bde735a577b556bc30ae1a5de0df8533243c955cc5d222537b3323e7108900af2f01799a4bfa843d953b141cc76a19aed77bfba15cf4e2c3cc36a0e7e844e853 SHA512 d495afd2ce4e16f8d3ecc0b319d59c3634aae71c26110d14225f9dd628bfe173cdd94818c69c930ef5cfff3b331445e192db0082188e0822155184e3f6f80e7d
 DIST cmake-3.28.5.tar.gz 11076017 BLAKE2B 7da653e42fca4848362a97e80320ffcc85ced4951dfe475f48f1619a40dc674d2828a78df2ef09589868f41f1da86970074186f730e675851cd9e7c1b099ba4c SHA512 d8f1c056e94c835c2078a5e68b23a3918f0e2cc40ef9dacaf5df4f2c26106149d85364c01528fcc2d6a4b6c2182ba420d938c519fa98757a5fc375cf152c7f82
 DIST cmake-3.30.0-docs.tar.xz 572276 BLAKE2B 0c258f8dd0a518bb7bf97d35a778d8e406c986e123fc8acafb174a750ad0883d346254d12e8134dd9d030faefddc13b8260e7b43e405272157ada742c75b5fc2 SHA512 9d534b0efc30829f1144fb32c4f10ba25749e238c8ceeb4399b6d1eb8421b9fb1363972a497757ef84689bb987840619cbb4333ae95fd2397eea07eebed112c1
-DIST cmake-3.30.5-SHA-256.txt 1646 BLAKE2B a91c0663dd11a6f854a4acdc5902b67811a311fd5161dc86140f1a39fb1f3aadce0df348e27569936c6e51def096ab6572635e00ce3d2b7554fadea4a3d4287f SHA512 a5a2285049fae435f53d0dfdfaea9a740d2f6e08dd1b149ab1f0d5e3ddc8afb2c3fac4a8018a7eb24ec90155535362160abe5ca2681808a96d19d191a3aa3713
-DIST cmake-3.30.5-SHA-256.txt.asc 833 BLAKE2B cb7db2d0263d77cbc6798aa916a4584ccc7e7e9724c362c1471cda4b87c53ed1d1cbacf84573768844d16c3356ad32dae4500a6704fc22b8b1e824e2be6a0435 SHA512 fdd31e5b872c3dba1c66dd2ae077721f7054f6df9f261548fce86f9d4d4d403130511c4ce7ce57bcb3501abd87ab506177b513d160592db6e09d70d34e4a24e5
-DIST cmake-3.30.5.tar.gz 11502354 BLAKE2B 47eb5abcd9d634b10053b2052dae11fc85e74f78ca2489d72088eba8ca84ecaf22a248b27a92bf50666b76e8cba40ba9b952d3d76d8e57112d136e26087f5696 SHA512 968ad4769e869378049b1d82ace98db25a6cb234b6362a51737f0d2978b8914ad42967ba112741850b23631e73b8a8876cd4f99dd0285b9da1c2bb5ea4c4ee4e
 DIST cmake-3.30.6-SHA-256.txt 1646 BLAKE2B 370ec5fecb60a7ee6bf36503553a7478b66cfabbd48ea2ab17ae44841b371f5892c33bc9c64388ac84ea07e86f3bee9a82b9dc378ff4624f3a7c5025716b82bf SHA512 6049a237f0904a48c4658352ea0f0fb007bccd30886a1eb9e026ba85d15d892502e2ed6763023c61712e370d68b209f83e7e6c7d236f169603fc85e0f8c286ef
 DIST cmake-3.30.6-SHA-256.txt.asc 833 BLAKE2B 73b841a2eb1d476696506706d95f371e5c46c2b777c012bf1d930f072c242bb431cde282ab371bf62a7845c92ba014270e3599d3c30d8503335ce249aa3ecb5c SHA512 34374445ecb012c4607fcf65fc6719dda16af189c0d2d38898a5cd506fc6c24462437556810c693ca45773cb8824cd0a03445ee07b69e010d1b7c509e32c617d
 DIST cmake-3.30.6.tar.gz 11503061 BLAKE2B a381bea86b7cedb5dfae3598a4a243e74b0b34e78c105fe7ee17343593700c30f1dc42b06cbd872894a043f68e23853e7b1fdc6cb2161584f57e4aa89515e23a SHA512 8349d522ae098d72df625ef44700b672a5f85e7bd6c44ee9c0c3ba3f07561348f715f4d5a6f4a9b0e92bd9984e590473bc684160841f94842b5ee128fcc0bb07
@@ -28,7 +25,6 @@ DIST cmake-3.31.6.tar.gz 11710589 BLAKE2B ea1bee1a98568407dfc164f82bf0e3ab082124
 DIST cmake-4.0.0-rc1.tar.gz 11822440 BLAKE2B 644177b912908bf54861aae9b01c14512ab02a99a7699e95dd775d9661abff556400dbedd841258211baf86bef68271e019052470a13d06ce8392104eab245a8 SHA512 7b08a425907e5eef820ca4db8732825bbd7880ac8a4566c103b9ebfe8d3407aa048213e2c4bd685c5f728d5aa975f4a46fc4f76509b7484a0e9cd604e2b81973
 DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c
 EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
-EBUILD cmake-3.30.5.ebuild 9177 BLAKE2B 19559d4c111e459929fbe5a59c730222468ab8fbead975782e3d5dbe5ca1e830415fcd1940bfc40c90e6334f827db3a7fce80d8298fb86cb81300b0a5f92387e SHA512 c40e018c4822014b840ce0097af17f1a0c580c4cf55b3584565a646e802e8f37bc17959325847ccb9ebf0306035a1a6d9443a93cd7aad8807da84bc62b61d959
 EBUILD cmake-3.30.6.ebuild 9178 BLAKE2B 56a8101652aecb0687b770339dac6bca0331965cd5688f5b7f59c8e479c33bca9c4e4d5609471b1db94233e98786904f304cd53f9dafdc5520f2820739d64e95 SHA512 ac3a52e8bec3985b476c3603e2dd026fc552a92f670ccfa48f4411dcbf480737d85d6c0c0b7b6d61d4bfe9a9f1752b59c964928ad450219bef830ce5c803b792
 EBUILD cmake-3.31.5.ebuild 9748 BLAKE2B 6e767e9066c0dd193beafd11a90cc42be4550abe43b38cb19065e3b8e95feddf45bc5b49de925775e849be282ddec3a49d0ac20f7216ec10f3333ff171b6db4c SHA512 c4c81277e5e2bc1daa2bdeb15208be68ce441ac2cf0fda308977ce6b119fbc45a201994c1656ba68b9a98ba7f1f16eb67437c5ea8559d2d550b9b8852b126fb1
 EBUILD cmake-3.31.6.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
diff --git a/dev-build/cmake/cmake-3.30.5.ebuild b/dev-build/cmake/cmake-3.30.5.ebuild
deleted file mode 100644
index 72c321e1fcd3..000000000000
--- a/dev-build/cmake/cmake-3.30.5.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2024 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=$(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
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		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"
-
-		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 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? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( 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.27.0_rc1-0003-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"
-}
-
-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
-
-	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=$(usex qt6 6 5) )
-
-	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 actualy 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/kbuild/Manifest b/dev-build/kbuild/Manifest
index 22c70108d096..b4663aacd45f 100644
--- a/dev-build/kbuild/Manifest
+++ b/dev-build/kbuild/Manifest
@@ -14,10 +14,10 @@ AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae2
 DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10da6fe675eec72392fe6bcc318d1d8728363b9e855d10e11d0b7189f875cd2d496bf4871f87b96ed2ad6775e6968e044cc107dad23f5fcab SHA512 8f11355f0bfdda431dba4cb4dcd73c5bf0b10d2380495fe91292846b57fb7f80711d711b0b229fb4a865512d90010a181d1e1ab7d2b57d1a1751ce79440b02dc
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b
-DIST kbuild-0.1.9998.3660-fix-clang-16.patch.bz2 11762 BLAKE2B 48c083a8c008da3cac4e0e175b65d487f4c2ed49bd46baa7fca8d847f8894b52bb5e21d5c99bab8d06141a2de0924e69b61930e63fb8061d54d291469d28afb7 SHA512 cc45721a69b970062a24c95e1426865c097df190c63bfe9cc86ebb76ba66a7f892c30e76d33298ec0d9e0a24ba81ac22e99de3eb5f0b6da3d53b95f4334b5820
+DIST kbuild-0.1.9998.3660-r1-fix-clang-16.patch.bz2 11810 BLAKE2B a9f8c084a8b1b7fd76531ad882d5f29ca6bb8e287634e5eef194670dd7716781dc87a105f7765336cae6864864fe08ad9a71a4c608444d0662ebab808e383a10 SHA512 b76ed04f438058618e39748e8243cea98097bc478fe64d3faa4f3ffda8efe30d2bb75f9e9fb1ae0b1b5dac5428a07927095db37af77225dd8448b96866804e57
 DIST kbuild-0.1.9998.3660-src.tar.xz 5281800 BLAKE2B 6c8ca902efddbbdce4588a046edc243ad76bd56cc319c94b4ffb7c25dad7c3ad9e5f816c960c6d80a13374995469d6f1d4c91a20860321a2d12b2456c21ba26f SHA512 d993de9a481a30aef7f4db2bbd6c19ffbeba6e5e505ae2ea63e7479007198d3eb89308860b90a5df8728997fb239ff5e553e6050c136468522c780a2a1e593e2
 EBUILD kbuild-0.1.9998.3499-r4.ebuild 2178 BLAKE2B 897369bb29eb47cb2b704aeff61fefdc7f17de9a6a085a9789aea9a8be37757e082ccd85106ed8c8727111ec4b7480d8da136b9175e672f785f58ac0c35e0b9b SHA512 bab0600078b428472b9825506eefdf4d31a5afd2dd2551455aa0eba20b1643e9d5cb2572e10af58779ccf36b47adf1e97833a8a59224e4ed3c56337161abd0c3
 EBUILD kbuild-0.1.9998.3592.ebuild 2128 BLAKE2B 7b05945eaa6bb1afd241652bc1da82759c668d5fb15d2f23b574ccf8ace9e9a11b64e4c9081779d81f174805ff6d2ac73d87f510cedeeb83b69a72beb7c64a77 SHA512 0a9d9c9668108a42c107e8a1a5f611052aa09aa4c34de3c927c385ef30c512aaadc9d1ab7d2bd57375f01f657e43b175a7fa4f3a34e7a81cf7f51b756e5bc175
-EBUILD kbuild-0.1.9998.3660.ebuild 2082 BLAKE2B dcc3354edf6bb375944832c81af6d81d1ecede54649a785b35490a93fb360eec5158ac0eeb8201357da95fe67983979dfee67878430deb5a4f79e20a4cbb3a25 SHA512 2c745d35eb63d16cb2131f53cfb5ff02f735c56f87af3b2c4202b1446a722aabbbf4421b7a8d8b38fa228f1c6efa4c7a59fc8edc701a91e7521b6df1e7268634
+EBUILD kbuild-0.1.9998.3660-r1.ebuild 2088 BLAKE2B fe0f04f3eb80b8f5f3611e00a3b184162bf0adbc871ea91d69dbdc800771b6054d455d38b1f800751fe9feb32062802a27146745c22410bbbc3b51ac0b82563b SHA512 d5a3b25360d7297c2e6f523f3ed8acd26484bcfba0bcdc772dfa9341d77c8b25919a6e65524bd2dc31f96530f2627c5b812b79a6c44ec4cf6e9033716b640de1
 EBUILD kbuild-9999.ebuild 1815 BLAKE2B fe42fec4355cd7c7f95541db1d82435645b06f2dd6f381fc52782ef5a1d755ee21d469400e96f6f577ae92c4479b37951e8c381d2bc3662a64d1be7c80645c6e SHA512 0694478c5e08e1c5b61e703cbc2363ed4340b937a396c92202a18e6650a2becd0aa5076901fc9b6cef884d19d9d50ec210bc92fb2e2d59e1593056306a53f0c1
 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild
index 36fda5b3b52b..004c44ac8ea1 100644
--- a/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild
+++ b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks
 HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
 SRC_URI="
 	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz
-	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3660-fix-clang-16.patch.bz2
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3660-r1-fix-clang-16.patch.bz2
 "
 
 LICENSE="GPL-3+"
@@ -34,7 +34,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch"
 
-	"${WORKDIR}/${PN}-0.1.9998.3660-fix-clang-16.patch"
+	"${WORKDIR}/${PN}-0.1.9998.3660-r1-fix-clang-16.patch"
 )
 
 pkg_setup() {
diff --git a/dev-build/make/Manifest b/dev-build/make/Manifest
index f8c5c5d79088..707cab369690 100644
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
@@ -1,6 +1,6 @@
 AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b755cd988054464275c5ae255a9c77a507d9772f2124614569a858c820c533a46d859e11813591a6cdea636d74f2a SHA512 f569ebd924d64c95e0d3d7c61daaedb7780cccded83bd73036d56f1ef658497056f95a65c463fe347b14b1d12205507173eaab8cb74205cbcf32bf1a25531f9d
 DIST make-4.4.1.tar.lz 1305648 BLAKE2B b0c62a85a99b15e38ee9e08c38be9b1c4c6d81a01bc8ea94f83e7f1a93968b9c8c8b69c92bb4112646a58e38bb9d2effdd461fb2a82b1360681351e07c123a26 SHA512 591e9fab2f807bfda908f3376fdbf304c3377a6b15d13f3029456722972e361d205b692855de8ddbce64ff3f404873cbfb65f4097ca4a3b81029dc83bafcc67c
 DIST make-4.4.1.tar.lz.sig 833 BLAKE2B f72d2afaec6f21f4c731a42408200c05ed56532cbee16c1f1a4db2f1d641d27fb3c41ff2becd717e94ded7d079e683ff320c795e5073a95aed731d99666173cd SHA512 a6e4d3ef63456031c357277f0867652776afd0bd801c3be67a3f81b03103dddc5c6471ce50a89a4fd379a535163f22758cadab25a5c2192a2332124bcbbe8d74
-EBUILD make-4.4.1-r100.ebuild 2239 BLAKE2B 4ea4099fbdb944203a6dd90302d5e4053c212446eb4c2f229fdfc11b809a048824f4c54474fcfac6559e590022825e69e3ad5e76a1d247973b2fefd74b11f962 SHA512 51d4588f75ca5c75a3d38a8c56739d5138d349e7c48b366bd27cc7b913fc5708015534c3f020c24b4daa3672c932abef51c06649d5e912c6d578f4451abb1dbd
-EBUILD make-9999.ebuild 2225 BLAKE2B 0946e0513b526a9e30b06293c6886c7919d019d5b902d1aa3cf35b0d0294fdaed9fb77cfaaa2f4ba283fbdec703cc35833c227afd34b54e7b0c074d806b7bf80 SHA512 277829b8f33c6e24c590044991537d0b44de1597c4279715d93dd389f10480491086cdeceb92ba08e22cc6d4f166f7cc9931199abf92b504fc64db42a5e84e87
+EBUILD make-4.4.1-r100.ebuild 2241 BLAKE2B 0997707138833b2b5d0a31fcc52ca757a6de372cd5d782839cca99217be89995d6aed6e7aee39f856ed5541c01f0cceacd134c363d31eda80adb77d9acc23c4b SHA512 71dbb0260800696a5a0aa25d973c407308704c54bf922ef68022f590f045984ad493bc51448ffd38b9c2550e1e38d01ab835ef2ebca3eaac00d032573fdda379
+EBUILD make-9999.ebuild 2227 BLAKE2B 02ef9f0a5ec0fcaa6b75587451ebe11ebdc1ce06729c3d7faf8ebb3e0de1d79e20899d6fcbbcd24d694ed68faa475fb194921ca5ef269e9c3d44882f8570bc44 SHA512 90ba1cd7db91b97c688817ab220b25b14eea49b317d4efe0fdede3c2b8a66bb1bc8ee39d02b4fad97ca06545aaddea0d73071c45cad3b60b3984bfc2e3eeefac
 MISC metadata.xml 381 BLAKE2B 867fd4a045ef622ccb62c72b7198e205293501d075ec0dca7daf702bacbe2df21ea23aadb4150e42fdc0914a95cab0f48d439c1f7073acf2302bdaf48fa18688 SHA512 66494f08f599035728fa7f87b3f7ca093e3c50dbb694aed8214d1dbbb3d1e03441e6e159b1453709fa8c7da8cc8d73ab2c972517a3506b1fb671533d459c4418
diff --git a/dev-build/make/make-4.4.1-r100.ebuild b/dev-build/make/make-4.4.1-r100.ebuild
index 816b06304626..6c103414ba97 100644
--- a/dev-build/make/make-4.4.1-r100.ebuild
+++ b/dev-build/make/make-4.4.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -93,7 +93,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
+	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="${DOCS} doc/make.pdf"
 	default
 
 	dosym gmake /usr/bin/make
diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild
index 274fa4a9c4ab..f23c2c0c3786 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -93,7 +93,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf"
+	use doc && HTML_DOCS=( doc/make.html/. ) DOCS="${DOCS} doc/make.pdf"
 	default
 
 	dosym gmake /usr/bin/make
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 5226e16951a9..efd97542fb0e 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -34,6 +34,6 @@ EBUILD meson-1.5.1.ebuild 4924 BLAKE2B 47ed021c4efbd4192172b27ae7dba70df733f426d
 EBUILD meson-1.5.2.ebuild 4924 BLAKE2B a3598d55c0e9b01de353d65c3ad38b6eaf24fa925d63cf5a139384110fc51166f7e7775bd28f0c0744aa24b02f832d28622f66cb0c4240862db9fa5dc38bbe11 SHA512 8454f814170720760d82d0e3ad9e6b23932f011518e53ad3f6da19d17007a2e7437d0c75339c0dc811dc699987d588f35d8be5d717f5853ae8d1202200e16a83
 EBUILD meson-1.6.0-r1.ebuild 4986 BLAKE2B ed603f35e0b81a00cbde98062752c4850590271d7543d96685e8764460b94379e7c79c87f6f4116dd6625a63c39a4a8bb69a98a3ea5d06196a2961d3b31861d3 SHA512 b8e71c9ed86f82de2645ccee830bb2b076f89d53dacfe58ad68f3f1c803b873f141e00b835099f38139290807efa5b4fa8bc48de52cf7a3a68a24554a32e8443
 EBUILD meson-1.6.1.ebuild 5640 BLAKE2B 2278f11e6ca37b019bbc96871d84685fa9908a2ef310bc8fd20d4dc6b768ae3a17de9405ef18fd32a59ae0394e3861212ede251c0d6201f74e64d8c5576f9371 SHA512 0d60ddf0684cd70af11f42189d02fd36044112a8b9c9c708982003b33517ddd57308a240f18892e6bb15bec7965b9733bd07fc1a4a50af13fe99d9aaf8c3a6a6
-EBUILD meson-1.7.0.ebuild 5644 BLAKE2B 3278838684c75ad03e84d44278965713144b6e5481863256ca654e09b7051923671c596a6dc5d77dea7701f96164299ec2c0fda0c79063b37da4f57d7e7ffec7 SHA512 f629388bc4da93e701698f271b28e7a2206cb82beba6149e316a643b9b2740ceba208163a7cbffb50f0fd1e102fbdcd08be9f7159edaef5859921c84586fa73a
-EBUILD meson-9999.ebuild 5644 BLAKE2B 3278838684c75ad03e84d44278965713144b6e5481863256ca654e09b7051923671c596a6dc5d77dea7701f96164299ec2c0fda0c79063b37da4f57d7e7ffec7 SHA512 f629388bc4da93e701698f271b28e7a2206cb82beba6149e316a643b9b2740ceba208163a7cbffb50f0fd1e102fbdcd08be9f7159edaef5859921c84586fa73a
+EBUILD meson-1.7.0.ebuild 5651 BLAKE2B 6c75f0930a402cc5c91523d6b37984a835b63fcd216ba467f724f2d844345baa9a9b385b7e81c9d0f65d367eb6ac91c13fc0a28e832e939fa93ae8d942657ae0 SHA512 37deb93f15f7be32ffe446547d6bb3e12262542bb9124f539e5a7803d6476bec2dde3b1c097ad84f6ee3fed44167823d532aa666d52e8585a9debb733833c5e1
+EBUILD meson-9999.ebuild 5653 BLAKE2B 3e798e7da36d5eaf4eabfd18a6f6afbfb671f493373c395fad3bc167f063b3ce5194606e7483fcdf976394ab86bcf78044c3de3738273b2028f0a66aaf8ec4d8 SHA512 5de5de66e1ffbb48eec59b9c86f0a8a069a31ef7e06c1b7f9a5e3220fc224d8359d7c7b0cb2e7149bd4d30cfc75cd21b502c0375b2bc195367e905888e28d1d2
 MISC metadata.xml 542 BLAKE2B 9d1667f9893c64c33e7a86a7b92c9dd85007d3e513608ec615c217e6ca58b3161c789f816e89d25f75d2ef17ed9336b4640d058bfd0e5c574d0d386755debb1d SHA512 2ab3497c1509db6687f250344eabf49dd09062b69bceda96f3e61c1cbb26f9c2ed0c7c9366dc3ea7b64df1e35214b486656af85b96b7100ce856cc1eb41df6c2
diff --git a/dev-build/meson/meson-1.7.0.ebuild b/dev-build/meson/meson-1.7.0.ebuild
index d668b8b5513b..bec1d446b850 100644
--- a/dev-build/meson/meson-1.7.0.ebuild
+++ b/dev-build/meson/meson-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
@@ -33,7 +33,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	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"
+		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
 fi
 
diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild
index d668b8b5513b..05aa3dd4f8d0 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest
index 349900f79506..e56931f729bf 100644
--- a/dev-build/muon/Manifest
+++ b/dev-build/muon/Manifest
@@ -5,5 +5,5 @@ DIST muon-v0.3.0.tar.gz 688544 BLAKE2B 6f5e9f91c1221135d8452b54bd781fb4324586d88
 DIST muon-v0.4.0.tar.gz 3435753 BLAKE2B 0eb685ebd22a6314cfa02ab716ae8a1899363d1ce4dc6fd0b42a3fab1ff62358d21abd6c6d2682a78df1fffd2d6cc72abaacfa7eb5174a10d50bdd5dbbf0825c SHA512 2ab817bfe886fff5a9cd00935f19c7c73cc4556aa11a538ca496bdad4cced4dc1608efd05d58b6971640d0543bd7d4486185ed93a26522690cf2e1d348342bb8
 EBUILD muon-0.2.0-r2.ebuild 1055 BLAKE2B f02431d85724eee02653bc7f439717687320a88a4d24fff757fa9140dc06dccb2a42d39931dc56ffc7419e370115807b6502753779e119a8e02e5b0f0e3f073f SHA512 dcb0e044e5899ca63b1d421d4e4874ded32a73c792b2f4861781a9d0a17687d57b6a8663f427526bf378c9b7fd31e365d358cf6d33673fd35a0e39159d76d8f6
 EBUILD muon-0.3.0.ebuild 1536 BLAKE2B d4d31874a139e3ed3a44746bd04f08169e693e9297fde56be7ac35d5d83a128736d4f4f20d711326cbb1434bca921bb1a0212cce6e28bc403eaa860eda498de1 SHA512 329ca2b94832507d91825fba071f7946ab25f9ac512085f547da45e98af4f34e461fe2e3b7bd2e99d4cebbcf8ec215933c1c2e159eec5305e1a29bdf040f096a
-EBUILD muon-0.4.0.ebuild 1473 BLAKE2B a9bf946c37397e112cae9da3c84bcf8eb561b43be02e591dcb77b50e0f85d68e9c99bc3154390ec0805fc3bc2d2e36792e7240a3457ff95af3f93c313d690cc5 SHA512 333119390c1ce7cfa306cfae4e54e6f0ba046085c482b62e62c6687efa2e6f81d63c18cd61a7d73fa538880769a9aac5ec0cfe34d8cd0a57cfa775890f704b95
+EBUILD muon-0.4.0.ebuild 1487 BLAKE2B 57aad39c501cf5c25f4029358438444f31b5ae614193011b044d6b6f6507932ad250ffc53c6cc087996c6a0dabb9f240f2b654f3de9ae9383f40acd730e8a1ee SHA512 6f7f37ed217bf9b4959f3275fd8d6df0e9b63f26c8febd396d1cd4bb74b7cb106864a265a46c8fab1e236afac6644980c2c15d2c0427fb7c8085d3227973ef16
 MISC metadata.xml 569 BLAKE2B 8712259e11150e15ad3e4db4291bb9091fab91cfa0901a9457e8538d13ef83fa3da0f0506257f47d4b43b160b1ac9088fe7dab1cd749300cdcd22a27917801ab SHA512 93910e7b6bff19ff5ca1a5987adfcc90eab1b90434c4003622b416a1a035d379ef0561f81f7be4edadcaf07fdbd491dcf0c52952f940d8545e79d4bb3c7c67e0
diff --git a/dev-build/muon/muon-0.4.0.ebuild b/dev-build/muon/muon-0.4.0.ebuild
index b9d58a6aa311..f9171959b9f2 100644
--- a/dev-build/muon/muon-0.4.0.ebuild
+++ b/dev-build/muon/muon-0.4.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~sparc"
 IUSE="+archive +curl +libpkgconf test"
 
 DEPEND="
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 2bc2c06ca2b4..a101c448b8f3 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,8 +1,13 @@
 AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683
 AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750afc14650fef564997d250ed63f0d9b1c91361872a8816cab9ba1f0ecae46711414ccac921ded954eff7c51e4161532030e5f SHA512 ce8690a126255047c8efbcad4e75b91fca07b0afac55d818d4f5467a41795394cae8f5d47484519c482bccfdae9c3df1b040689a656098f349629f1f609adbce
 DIST SCons-4.8.1.tar.gz 3244423 BLAKE2B 31441e16ca96b844b1bcc388cd430a4a087bb5f09a8951166fc44b7422611d416fc6311d79370d768b52a93ad417369682e2a77ada3fe77e82d59c81bfd7b4dd SHA512 dad76d7f16b4cc1d9e25c9d8969773604e23accbb4e94451f0fc725919bf223cf04265f5d2b64a1b7e96cc63496cba574df3a634fd6779f2eb5fb7246fded120
+DIST SCons-4.9.0.tar.gz 3251689 BLAKE2B fafce07d3e6f946344298f66d8530f79dce08e221ccd9957d29fbea9f23c7048f651c1c6735ac3dd51dd2c07f1540d77f16301e9c253a9f3087446a2a4856666 SHA512 74d3d782433394fbdd1010c2a6c4a4026431753f72be1e6f61c7c00ad37ff1cb4c5e149c4418a7d7325b5553e3f827b32bf0f8f1727b08def5a8f90e54ff3439
 DIST scons-4.8.1-user.html 1696975 BLAKE2B 5c34754daa149f49b35a06ae1ab0264649004cdd94106eb70965c0f89aef80268ee6b138aa0beaac1451222888ccd11ec34f2872006702c36460f719fc90a3c7 SHA512 dadfc79a441de6d882e18d3fbf82e668d8a7eca6fa449aaebac9d3edd518d91e208342b7203c5e74ed4651fa5cf5d2d453055e4805407a18aad5349a9e1ea92f
 DIST scons-4.8.1-user.pdf 3093300 BLAKE2B 84752a76fba302ab6ae1bbd6c960680e94144f0c9d7b1292096fb7df40a090848aede0b3c309271089ab6bbfd8ff89265496c71e970a9b2b6c5789e04ea4954e SHA512 11776a6f0ca475633a85673fb2347358f45e3c20465424aefe4c12f3037e22199ffdc2ae921d002a67f4edee204961f405aef172ca93a77452e25eb9cab33445
 DIST scons-4.8.1.gh.tar.gz 5931602 BLAKE2B 702252622bc9dd97417cb3db09caebd8732cabe3627e8539475f2177a15bf9cfa8dae9863c462796a6ebf079db2c1609089f1a6d1a0e0ffa220cc69f905beff1 SHA512 b9f39634b36876fa15e2db968a38693745ce3f0f14e838e97f69e2a6762d8f78c04e52843e2ce50900000833854c90ee2bd9d3d84bb48d9acfbf41f94af02775
+DIST scons-4.9.0-user.html 1713371 BLAKE2B bcb0a028a531d33b62df3b620b16cc103cba4cf949a78d69dad38c834c6a7596e20a150011235441f3b79604552e9f9c1f57cc2760cb97ff954301827056d0c5 SHA512 3ef7c3baabdddd12abf093449d36dc7b2059600335939dd77f89793bdf7cd16fb09fe83187967a0ea82a8b055c996faa90326016fc0a6b61d99c7d738b16a5b3
+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
 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
new file mode 100644
index 000000000000..a1a78105c001
--- /dev/null
+++ b/dev-build/scons/scons-4.9.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing
+
+MY_P="SCons-${PV}"
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="
+	https://www.scons.org/
+	https://github.com/SCons/scons/
+	https://pypi.org/project/SCons/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
+			-> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
+			-> ${P}-user.html
+	)
+	test? (
+		https://github.com/SCons/scons/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	)
+"
+
+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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	# use the git directory structure, then unpack the pypi tarball
+	# on top of it to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}" || die
+	fi
+
+	tar -C "${P}" --strip-components=1 --no-same-owner \
+		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# TODO: rebase the patches <4.5.1-r2 is gone
+	# support env passthrough for Gentoo ebuilds
+	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+
+	if use test; then
+		local remove_tests=(
+			# TODO: does not respect PATH?
+			test/Clang
+			# broken
+			test/DVIPDF/DVIPDFFLAGS.py
+			test/Java/swig-dependencies.py
+			test/Java/multi-step.py
+			test/TEX/newglossary.py
+			test/TEX/variant_dir_newglossary.py
+			test/Configure/option--config.py
+			test/D/HSTeoh/sconstest-linkingProblem_gdc.py
+			# broken by commas in date, sic!
+			test/option/option-v.py
+			test/Interactive/version.py
+			# warnings from new binutils?
+			test/AS/as-live.py
+			test/AS/nasm.py
+			# hangs
+			test/KeyboardInterrupt.py
+			# requires f77 executable
+			test/Fortran/F77PATH.py
+			test/Fortran/FORTRANPATH.py
+			test/Fortran/gfortran.py
+			# TODO, these seem to be caused by our patches
+			test/Repository/include.py
+			test/Repository/multi-dir.py
+			test/Repository/variants.py
+			test/virtualenv/activated/option/ignore-virtualenv.py
+			# broken by CC being set? *facepalm*
+			test/LINK/applelink.py
+			test/ToolSurrogate.py
+			# no clue but why would we care about rpm?
+			test/packaging/option--package-type.py
+			test/packaging/rpm/cleanup.py
+			test/packaging/rpm/internationalization.py
+			test/packaging/rpm/multipackage.py
+			test/packaging/rpm/package.py
+			test/packaging/rpm/tagging.py
+			# apparently fragile to... limits?
+			# https://bugs.gentoo.org/908347#c7
+			test/builderrors.py
+		)
+
+		if ! use amd64 && ! use x86 ; then
+			# These tests are currently broken on arm and other non-amd64/x86 platforms
+			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
+			# better plumb up the MSVC tests for alternative arches.
+			# Try again after 4.2.0.
+			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
+			# bug #757534
+			remove_tests+=(
+				test/MSVS/vs-7.0-scc-files.py
+				test/MSVS/vs-7.0-scc-legacy-files.py
+				test/MSVS/vs-7.1-scc-files.py
+				test/MSVS/vs-7.1-scc-legacy-files.py
+				test/MSVS/vs-scc-files.py
+				test/MSVS/vs-scc-legacy-files.py
+			)
+		fi
+
+		rm -r "${remove_tests[@]}" || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+
+	# sigh
+	rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman *.1
+	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
+}