7 files changed, 13 insertions, 333 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 99d49380daaf..292690624bfb 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/bazel-buildtools/Manifest b/dev-build/bazel-buildtools/Manifest
index b2195a65a99b..de14f75793f8 100644
--- a/dev-build/bazel-buildtools/Manifest
+++ b/dev-build/bazel-buildtools/Manifest
@@ -5,7 +5,7 @@ DIST bazel-buildtools-8.0.0.tar.gz 332898 BLAKE2B 45a94e3bba1f0a4cc810f2e7f9b65c
 DIST bazel-buildtools-8.0.1.tar.gz 335114 BLAKE2B 264caaa59066e1a55bbcc053c64d65f68e6ecf72f483b1318bf7b9b56cda598cc09b58c6bdbac2f7aaf4e778e553b7c3b6b5d21127a3abe1267e4d00b070ccd8 SHA512 0d3f76d26d8c9b9b9d13cc777fc33c407f6802f1f3a88b306127edc40005e86acc8adb33160810ce187a2eb22d1890db1c3e51986059f3649386d412d75dcb79
 DIST bazel-buildtools-8.0.3.gh.tar.gz 337647 BLAKE2B 67826fc7ed1b21ff2148acdb96c64b000291af0ce69b5c2750920299b47ccd1b978628828895e875663d2ed6f7392a71f11c71b39f1b274c8022f534e642bef6 SHA512 1d28c409090b2be4de3f02735cf00673fb59e64cfb492e30af79a52a048ae43f3ace56df041bf4402e967e2bef8e71fde897ac8e1dbeeaed30f63a359924647c
 EBUILD bazel-buildtools-7.3.1.ebuild 1440 BLAKE2B 47e0042ebb84ffda3deb2004c3c6c88cc53915001f34523c0d4a8b5c1a48f325d45251f2c456bcc42797c80ad67d3828a10ace9dbdb20d1e0126cbeaad76b4a2 SHA512 6d35996333b75f8e84da948d694b56f1e00cf1dc06df7d36af041863c0a8f3af223e1a11ef4203e9d8e34308661495694524d6034bd9282f1ffcf93ef02d25ad
-EBUILD bazel-buildtools-8.0.0.ebuild 1442 BLAKE2B eb8697c61e936e7d3f80f7072167d13ff9390a132bad4c4d14961491a3efa29ceef5b0f47b4ebd5920fa7ca88b0197ec96790e965b65448f847a6979694209a2 SHA512 0ab7a19b97ebfa7464bbb0721c5d1f68325ddd99e28c4a87408670cf731f6b66856416bae85d590b8672d0b9e98e0e67576ce24fe6fa2b0320abd0fb30829c8c
+EBUILD bazel-buildtools-8.0.0.ebuild 1440 BLAKE2B 47e0042ebb84ffda3deb2004c3c6c88cc53915001f34523c0d4a8b5c1a48f325d45251f2c456bcc42797c80ad67d3828a10ace9dbdb20d1e0126cbeaad76b4a2 SHA512 6d35996333b75f8e84da948d694b56f1e00cf1dc06df7d36af041863c0a8f3af223e1a11ef4203e9d8e34308661495694524d6034bd9282f1ffcf93ef02d25ad
 EBUILD bazel-buildtools-8.0.1.ebuild 1447 BLAKE2B aaad36a8663d1c3808f4850deb32810ccf7025334867c08de0f21239d0bdd4dcc1a1c664c4f3d7c3cf07c784bdfea23afbace7b2b16049c9ad24aba6637a7cf5 SHA512 00a177596e46f64726d613f4a89fe4e2531a57ff330720303c924b5b2a985fd34de43d65e5e558ad7a8d0e95a271fb9d99663cd35ce4238174aa39356e5d49d9
 EBUILD bazel-buildtools-8.0.3.ebuild 1450 BLAKE2B d43e601b7a5ead401d114c933d3fc5ebeffce171e44cfe0a97b755bb94bbfe1864171f6135374f40763fb590b2103acc87df90ebead2d9485e810fbd331bddfd SHA512 21fbd216f40aa040eb4c1215d34c81229c7bd7f383256a6f979151fd7b98555e29140aaa07021b8f927b79a3b4448e13df5961fc9764cd5e92180c734441bb8e
 MISC metadata.xml 719 BLAKE2B 12b4496d75f6d7d139e28aad645477c8a4e4f72395b98859b7114d93cd3f3493b03faa79acdb34246faf11dc834cdb0ae1723a790449308a9e581b0c1eba18a9 SHA512 0be70ebe1ebd098018e7bb4d88e11b865267e3753b8bf392186a212d4d9e3ba10f4f05f0d262948d4d3a1672419fefee81b55246d86a6743308ae781c034070a
diff --git a/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
index 1f295e34f2cb..0cef290300be 100644
--- a/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
+++ b/dev-build/bazel-buildtools/bazel-buildtools-8.0.0.ebuild
@@ -19,7 +19,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${APP_PN}-${PV}"
 
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 ~x86"
 fi
 
 SRC_URI+="
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 3091dfb7fb00..b4b648d7ab17 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -19,20 +19,15 @@ DIST cmake-3.30.6-SHA-256.txt 1646 BLAKE2B 370ec5fecb60a7ee6bf36503553a7478b66cf
 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
 DIST cmake-3.31.0-docs.tar.xz 562756 BLAKE2B ef1d145658fd197ea515f05fbbad54b213bf458f3068829634242bc43bdb4f97bd45fcc45c9958919d2a78276ffc1d14d507822831f44fe9be5080ecc62e75fe SHA512 b4025633a0f42003005dfacdaea55c67e08d8f9082c8c6c564540b4d536246acedece41adb76cb00042d2f25f85b3817d23f70e393eb22a0857693d51ca60748
-DIST cmake-3.31.3-SHA-256.txt 1646 BLAKE2B ad01a76e00bb35a48b617ae343bf10ea4f64e5057c595715d22c086cd371775f6bebc70c763049d426dc85073c966b41a3fbc05155c912835d97252371c7efc4 SHA512 cd5b8c8ea2bdfcc19a0d34b8f2051f932fde931f89cb40b3111badc476e92def3724ac6867e90bba070ad288ef8f73da1eb00c76bd32509027b4cfa0c6c03e01
-DIST cmake-3.31.3-SHA-256.txt.asc 833 BLAKE2B 03b24dd074e8f518713b58d44394bff7b4d3c2150bb1204ae5ca37b2e06031b60a96e1494bc19d100e4da9be78f71b093f6e66ddd5190d30528a09b87084a4c6 SHA512 e4549a1680b7ecfb1801b3f09d1504df07f2d3d383f021e1ea007f3ec23e35eeb3494d05eff6bf100ef165ad0267a05595dcc550e85879d2dd2f17b5fbb59d9a
-DIST cmake-3.31.3.tar.gz 11708383 BLAKE2B ab2114133bb0821c236c5e742f5af6abce81b7efd4ab16cca74af9030aa0439f545a06d5fd407794733bff3728ed0419e81168382f43caa5abd4ca2bdba68cde SHA512 d7209c023ce7d45aa3fe4aee78271b89b3c4b1b71b183e978ba0b709255c8db0530d565e083e2dd881df3a18274d901930f70827614ee4df7bb6f4c7d50eae7e
-DIST cmake-3.31.4-SHA-256.txt 1646 BLAKE2B d9bcb6f0c0e47e9ae1e82082371fdc9d78c4207b0e85c465ff7c843fb6fd09072fbb36e0232d3bdae4238a33df6ef384c77077b7e5244dca15bdb4a8ad8c1d30 SHA512 cbaa3a5b48139d44c09e97f4c540e69988beab4fe0b9d70e0129e61ca9c42906a647fee48c703a0e066286b4afa99b98981922344250542b59c0510279b9a200
-DIST cmake-3.31.4-SHA-256.txt.asc 833 BLAKE2B 934ed510e0c8e5b49d5ae57bae1bc32cda5425b0d9a4f516fd452b9550b2b9ba43d5ac0dc09ad4ca6752cbbc88843965c19e3f12c461f3d4d2f5700e7d80fd0c SHA512 6d7e3f520828cadeb8d458f78cf317f3ee0106e46102d02dc31bcaa4d45a974f7a6447826856f5e60ad8d60f8b453c6f923e5b99f2ca72125aa722c741f305c5
-DIST cmake-3.31.4.tar.gz 11708192 BLAKE2B 7b51c138fdabec174de74319fa9cc5920973e96f46b8fa9859c95763180c3f29c8ba9401936afd23ccf72790bd0fa12c4236eff1c487e78898442c7dd0a295d6 SHA512 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82
 DIST cmake-3.31.5-SHA-256.txt 1646 BLAKE2B 45b9e829febf185ba9f532c208e6b49bcf56e6ffbdf2fb46fb8e6bc6cc58bb890a4a27cb00eb7acfc12b595aa20dcd1343142ab9e1fd42baee12af941cb786de SHA512 1b5a6f405cdb1cfaf52a5666b67d76261121ee66e6c9b73338da72af5f6eb6a27f87b642f657ab9d64bc491b9d8526cae4699e8f053e44550b2e01c3a0f3aa1a
 DIST cmake-3.31.5-SHA-256.txt.asc 833 BLAKE2B 0206a62c7816b4115e56e1f1519b6357610037f18949a3a5ce894bfd364de39918073fa267516ec4071eaf35fd641363cdaeeb0704de5918d2f6aace9e7bdfbe SHA512 016ec25b29b28845c1a2680e0b25f35b7ce89e466493caa99acaad4f8e32f9173a72afcecdddd90e89ea00ac10df3fa0dc37b3edc1de1923198e393f9f54e769
 DIST cmake-3.31.5.tar.gz 11706495 BLAKE2B 16375229d7344b10db40c76fe2fc8a3f90626683b3846a1d0ead22ae6312cc71c58ff4d4314216c0ea34f4c7c4bb8610c5923b875063d08bb247cc1c4ee1ceab SHA512 1981efafa8916371caf58b1fcbf9c9d73d365ec119279860ee2fa11f4ff72d87bb3a4570eb20a45fae95260bb8f565daf2f579a890b2dad588207b3fcc158e43
+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.3.ebuild 9854 BLAKE2B e96779d56bb03bd5b540365194d6f802cebd7ffef03e60f6617aa6e10141f879e3165ce7d1fdf731cfdd25aa48fdba0a6dd286e475e0da909bce16227b895ea8 SHA512 6ee346cdb4cc6a1b48ef87073eb6ee4a754b73cc8dc0965b4e18f2fa5a39d3f75e28c81556f7b1d969ffcf7c6da670d428dd3deccfe20c4dae3ce27c74ecc93a
-EBUILD cmake-3.31.4-r1.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
-EBUILD cmake-3.31.5.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
+EBUILD cmake-3.31.5.ebuild 9751 BLAKE2B 0b99dd412fe2b7be49168fa9375a4096e28f96ebcb25f58b6b7d8c5219371379d8312d300ab4561bdc623c4932129333b9b8d82d01579f69fd9da130a845d591 SHA512 b14d5247e1adacef911189e96d1ad4ebfb1fd5ed04ee617320d6ef95dd19474eef444a6a5d14b6beb6fecf75aae8d6f77d0a1146877e7f8ed4800b3d9ca895a1
+EBUILD cmake-4.0.0_rc1.ebuild 9935 BLAKE2B 820522f6d66ef54d05263c33fa4bbe52c7b45de3bef7410d59bf68d4d446b4f45d802f4a5d14d99ae7d3180808c36ab2c9f141e3b7c69f1dce1f71d813a21018 SHA512 8686cf05174ca02e393a30df41d1dee8c00903e86ddbc8eddf4eb132954d3e4810dc7e938af1dc610eb046637801048992ad9749c71625d7b8e1bc7b1e934b67
 EBUILD cmake-9999.ebuild 9823 BLAKE2B ad6c17d49ab8b6cce09488dca06ddad3fe8dc3904070c5ff2aea1cd83b55a6fee8bd579247a43959783ee885e7c2cf1eddfe9cb1002c29225ae7c42bd36ad4de SHA512 b467c07ec58780d59db1bd8848394a23c02690ece1725ff0bd97d848a7bf741cbeafb92dbbf65b7861daf84218881bab44ee367a547f411d08fdeb7329045158
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.3.ebuild b/dev-build/cmake/cmake-3.31.3.ebuild
deleted file mode 100644
index 35abe94a134d..000000000000
--- a/dev-build/cmake/cmake-3.31.3.ebuild
+++ /dev/null
@@ -1,320 +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"
-}
-
-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
-
-	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/cmake/cmake-3.31.5.ebuild b/dev-build/cmake/cmake-3.31.5.ebuild
index ad9d99bf2b8b..eb3ee0b74529 100644
--- a/dev-build/cmake/cmake-3.31.5.ebuild
+++ b/dev-build/cmake/cmake-3.31.5.ebuild
@@ -47,7 +47,7 @@ else
 			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"
+		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-20240902 )"
 	fi
diff --git a/dev-build/cmake/cmake-3.31.4-r1.ebuild b/dev-build/cmake/cmake-4.0.0_rc1.ebuild
index ad9d99bf2b8b..1a457fe0e9b5 100644
--- a/dev-build/cmake/cmake-3.31.4-r1.ebuild
+++ b/dev-build/cmake/cmake-4.0.0_rc1.ebuild
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+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"
@@ -217,6 +218,10 @@ src_prepare() {
 	# 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