gentoo auto-resync : 09:11:2024 - 03:03:12

11 files changed, 350 insertions, 6 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 8c360d5f66af..d3635a50f1de 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/b2/Manifest b/dev-build/b2/Manifest
index 4b339191fcd3..d55133a3ef5d 100644
--- a/dev-build/b2/Manifest
+++ b/dev-build/b2/Manifest
@@ -6,5 +6,5 @@ AUX site-config.jam 685 BLAKE2B b9f73808b6ca454c2220b9d296e7f131c01e6339f545b071
 DIST b2-5.0.0.tar.gz 1015818 BLAKE2B 87b6f34733002479f91f658aee4f776930ae6441f33b2540b82049e18c4199280e73047afafa90dc156cc75db8b587c5bb9e2ce65d93c493775ac4107ce3201b SHA512 37403f0bd863753c5313393405dd8514a4f8d9f0839ccd397ee1856e02af6116bd238d345e5b766512441ca1c0b09883386588e270bd982eca45235eef1b01b7
 DIST b2-5.2.1.tar.gz 1189393 BLAKE2B 26ddc5fa038e899c8e08a27cd79d9b3e39f7a7b6244ea77be4dbe2dff3a7d7309936898362759197850c38789a97c27ca2bf2995ceb14e223fc7045d645328c9 SHA512 5ff2f5735cb34159acc0f8b39a45787bb46731a819658d9374971e8a87e65997249d542c44fe7c7ee197d24ef380c4f523f8c946ac43a97a6ea7a86c91538a36
 EBUILD b2-5.0.0.ebuild 1962 BLAKE2B 5ef93e683056450f7769bc9c0a2caf321daee57850bd334e882629ff88f6a097494c06eca053a04ae4c587c999ffe137d484ce2b8257ffe8824fc44485ca7da1 SHA512 68bddb0e8a0175ee1dbf5b58263eee52e3925b072076c2de61007c0793c49629ffb11881a9a21a98c2a7e580b72cb6fbc5dd415c6de5375d34fdb52a7d5f92a1
-EBUILD b2-5.2.1.ebuild 1964 BLAKE2B 90786f0aa47135e54fb06498514bfc88cb445ce20ace9dc1302becc8820ae1fdf1bf24ca192b84e9c2738caac218f4dd04b95e04f9c2a63440704e4777dff514 SHA512 3166f412feb95c82c12941d1187398e57c1518b29c94d75981fa62f7cdcb4e3f97b30b9966ec465a1eaccae4a58f932ea4d0351a244a2f0e29b2e242e3e6ef65
+EBUILD b2-5.2.1.ebuild 1963 BLAKE2B 9cea5cbd73985f0bb658bd19302feae570acd24fac1867c0c3e4e0e1c44e123280abe23a056c546b01f60726e71a6be5ec94b9932e3d4130f7a7dbe922c01fca SHA512 c254bd7fa028997a4a65aec367842150f1f1463edde55aabb71c4f10d85e37e01075ddbc8e56c71d6f3b5d0cee5b63f4959c35addac00cecaa97aaff14f2fb31
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-build/b2/b2-5.2.1.ebuild b/dev-build/b2/b2-5.2.1.ebuild
index 264bedaf275f..399760d23745 100644
--- a/dev-build/b2/b2-5.2.1.ebuild
+++ b/dev-build/b2/b2-5.2.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-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"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-build/bazelisk/Manifest b/dev-build/bazelisk/Manifest
index 74a48e57e8b4..a01815138963 100644
--- a/dev-build/bazelisk/Manifest
+++ b/dev-build/bazelisk/Manifest
@@ -4,7 +4,10 @@ DIST bazelisk-1.22.0-deps.tar.xz 2495160 BLAKE2B 7f297c0e4d16c72981ff611bfd37f99
 DIST bazelisk-1.22.0.tar.gz 150380 BLAKE2B e96f0e125af18e72674804c2f9c0b039a33cab2e35135128e71ca70faf3e498bcef3b8e1bf1df4d44d3cdc9ca7f8cf90bd72075a288f608ac622450a1cfb02ef SHA512 436394751b00a57ee44eb8d4a13a47b2365a1abebe28da9529b42b71043805b18b5f2ce1f08e23b2472f2d9a173d85336c539231e768e594ac9226d8f9e88a31
 DIST bazelisk-1.22.1-deps.tar.xz 2499772 BLAKE2B 98d57705870d7bd7b8b9815237a51834e8ee63504d86478802ecd73c9ba6b15567cc44b351a75138fb3bc4c426742396918403f3f04b8b755b08a2b64335a1a8 SHA512 23d903a9d3016d82efcad7a6be0f9c807a4702092a2966df82d8cbabc92449123208b3d659aeb2f55403591d1b10a080d18aeb0d0b02405b3a6f889cf44b0790
 DIST bazelisk-1.22.1.tar.gz 150482 BLAKE2B e96a36886dfbade7b4611c7f9932997c3c37059bc67f69aeeccbf4db470735be31edd836e9833d40cdea02370f94b56a30437f6f5def963fc2962f26ff4f3c37 SHA512 37e52ff5e2ff9cd467a0794fc8febed87a0f20063f3f74459b7e7296fcc6543eeabad370b4cc8f59eeada32a978edaeee4409c5c7c3c51b803774af72fae5068
+DIST bazelisk-1.23.0-deps.tar.xz 2499540 BLAKE2B 14d4b11348986a669b9b6ef1dabd14b778b5531eaaa4d6e6f18f7005d7c54b0a0ed1cc252cf9f6923dbf8103f0b555d408a8cc4e924bbb4f7be03602afde8bd2 SHA512 ad74e4333b0019676ed0b3017e0ee8ccd1e7893ad772f8a04c117cb62f7140d625ab08a0d2f1f909ad71ed27e0e0ecbe459a35de76dfde7337fee7257f63d5d1
+DIST bazelisk-1.23.0.tar.gz 150671 BLAKE2B 4328290d938c6af7b8eb27cc2555d7544eb8c06722f477af077150b20aac986830d766f87ce261d18474cfff14a95f014f21d4a19a6614def49bc92a1b52da29 SHA512 ac93598553d16651a6ab83dcbbfa15a870ba7cfbf99ae10ef9e3bff8038b121f84bdd765680c44f7d97e892f01cdf774a13ad3103f65303b26f490394eb1ce7e
 EBUILD bazelisk-1.21.0.ebuild 859 BLAKE2B 8e5d78870093804cce78908c6cc17559892033262846b96cf2f3237bc587060f2cbe97de52fa09d0f296864be5fe4fbba890ea86e4085e0996de16d22b1e731e SHA512 d562a6b3af001eb377ca01141d953f757657b8b517eb7e78a1c557368208c9ed0b2921daf03c29bc8e39a8a4efea7fe1a6b4930ae4a697f87f9f8583ac8e8d2a
 EBUILD bazelisk-1.22.0.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df
 EBUILD bazelisk-1.22.1.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df
+EBUILD bazelisk-1.23.0.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df
 MISC metadata.xml 894 BLAKE2B 4346989ace750cbf341d14c28db0814020ceac6f4b9e7786e4a62b38c363cea25b2ddf500fe1c37168aff957d0d0c5ce40491f4a5e5af9ad4e000581d5ef267d SHA512 7cf7302b01589c587325fffb5a9707b532189996342c3a90fc10949409cea29881a8e476c12fa3724c5b98f7296085d4fd25a1c0976b8074f43061157430d032
diff --git a/dev-build/bazelisk/bazelisk-1.23.0.ebuild b/dev-build/bazelisk/bazelisk-1.23.0.ebuild
new file mode 100644
index 000000000000..9b18306d7e1b
--- /dev/null
+++ b/dev-build/bazelisk/bazelisk-1.23.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A user-friendly launcher for Bazel written in Go"
+HOMEPAGE="https://github.com/bazelbuild/bazelisk/"
+SRC_URI="
+	https://github.com/bazelbuild/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+bazel-symlink"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_compile() {
+	mkdir -p bin || die
+
+	local go_ldflags="-X main.BazeliskVersion=${PV}"
+	local -a go_buildargs=(
+		-ldflags "${go_ldflags}"
+		-o bin
+	)
+	ego build "${go_buildargs[@]}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "bin/${PN}"
+
+	if use bazel-symlink ; then
+		dosym -r /usr/bin/bazelisk /usr/bin/bazel
+	fi
+
+	einstalldocs
+}
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 06eb0ac7a811..f8f758b1dc5c 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -21,9 +21,14 @@ DIST cmake-3.30.2.tar.gz 11500719 BLAKE2B 85873311000831d2a8acb2c9d7f107e7fcef9d
 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.31.0-SHA-256.txt 1646 BLAKE2B 3f82f31d598cf395574d858f219e50d9b611b83a2c08ec2f441f59466bd56190659391718184e2f68dd9fdbb33845814e65423fb75386f8648ba9f62c6dc1d73 SHA512 e9e71a48d58bf50febcb19432bee658f5b12594fe926c9bc732e7d408bb8258504734244a91f052e43948fa082cc065ca9d6e1c39c79d6f9b264498f17383de9
+DIST cmake-3.31.0-SHA-256.txt.asc 833 BLAKE2B 31bd06104df08c5117626c59c1acaca46b36af96e27491ec742cdc5cd3f34e29dea31bca43ff8156f1eca155ffe353c538eb081886cf12966083f6fb41187005 SHA512 c935472c4b5f99aa0a60bea9b0d691ae29a5d1ea5a9770cedd9c809fa463d2887984aa2e3fcfe46a953fd9258d20a1bb482aeb992c248183baebfeaacdb99b7a
+DIST cmake-3.31.0-docs.tar.xz 562756 BLAKE2B ef1d145658fd197ea515f05fbbad54b213bf458f3068829634242bc43bdb4f97bd45fcc45c9958919d2a78276ffc1d14d507822831f44fe9be5080ecc62e75fe SHA512 b4025633a0f42003005dfacdaea55c67e08d8f9082c8c6c564540b4d536246acedece41adb76cb00042d2f25f85b3817d23f70e393eb22a0857693d51ca60748
+DIST cmake-3.31.0.tar.gz 11699894 BLAKE2B 9f9b5b15e5c9b19865cd00e3034fadf3a8ce4c21985cd5c9ab89d2920815948471885831bc29141f3179f401ba100f0d3ca95f8b72e1b8c84d80504f28957fb4 SHA512 feea7e7e86cfbc228d83c96b84502146516d003a753a2daeeaabb4d2dedefae881c44de7e1e9b424680b0047568c12632472a0030c5ce8413033f94f9b361700
 EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
 EBUILD cmake-3.29.7.ebuild 8831 BLAKE2B a5585384c39ad4be7091f44950b1071a3e44fad0e2872c59be6ab55fbafe2c5bd711e48732db6febbf872881fc9e6daef1ca2a2df5c72420774d041a44ed35ac SHA512 ccbd9388c43c6faed0d4f8e2972b9bd462e24ef4d2527bb62e65d46b7ca0bbc092ce0ec580af872faee8af0bfd942d2137e41b94a23663088cf8c41b41188eb6
 EBUILD cmake-3.30.2.ebuild 9126 BLAKE2B 16a13d2433756e8a199dcf9f5405dfe988c67e8a200731d840ebca2fa925f6ddd9aaf9acac9966464736b744820a2116a91edb8581f7e46a7a95d706bf55ab6b SHA512 c2d52277e8adc957b578b2fe1c4fecfa58785e5d4a05b5f64a19242a8d0f54a7d1d0cbb638457abd5a835eee21d05761638396241fa58f355e3bffc9b40f1ac3
 EBUILD cmake-3.30.5.ebuild 9178 BLAKE2B bb262bf42e8f3eb39f8fb87ce35319847751bf76e6796c3b93f29b1b01c1b6c554983fa9d949183b1bb0e3b8f32ec278fea270afbead85f4b77f4830f1a806c1 SHA512 db3141911b2a62b226a06f43f35ed03cbd4f751d4ce06facfdcaab94dc18828a95e491ec168b51d298d8a963e130bf665977cc08d2c5e05ae96a72f4b85cd320
+EBUILD cmake-3.31.0.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
 EBUILD cmake-9999.ebuild 9185 BLAKE2B 200afbb67f73ce10c6904958dc5d044937327886ef3e2794d4c18b52168a7d321069cb6c82e38f81c1e5e2fe8cf978974382bcc552fc46a11a585e87cbfca717 SHA512 2b4fd6bcc5121dee04da852ab39df430f8d238096a8eaaaa987b7a34c11c97e4e9cef3ebd9654f0d9b2ba6771229b6a85cdff633efec2bb56a6ac5027880a791
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.0.ebuild b/dev-build/cmake/cmake-3.31.0.ebuild
new file mode 100644
index 000000000000..e9982cd799b4
--- /dev/null
+++ b/dev-build/cmake/cmake-3.31.0.ebuild
@@ -0,0 +1,293 @@
+# 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/make/Manifest b/dev-build/make/Manifest
index 100dccab7336..f1be930fc31e 100644
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
@@ -2,6 +2,6 @@ AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b7
 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-r1.ebuild 2027 BLAKE2B e8850d4ecbbeb6ce8355a2eccad231499edbe8a3fe472f67eb87e3b9f8a2bc7512625f0714de255c6e120baaa4ee20562a13aef182f9565e7f0f71d208cf1cd0 SHA512 85bdb0eb26121dc788686bb070d82745dd14eeef9683d93c60f864f819ce99579c0daf94552e29c577f8915a67102f4b08554383c35e4ed5199d4382de20fa7c
-EBUILD make-4.4.1-r100.ebuild 2247 BLAKE2B f19045ddebbedcee39e8871f1b0d39d7758dec643c3f0cad0030a3830ad2a9236b5741978b9594fb4eb669ef928f41262093615b99fe9f252a3d7cb1cd3f0f31 SHA512 cc35412cdf71d804f43089db58340b9a2e5b2a4c6a7479163a2093cadbb5d01fa02b7313a647316501e4eb7542fdd780461abf4c9abd9657453fa822b9c12ee2
+EBUILD make-4.4.1-r100.ebuild 2243 BLAKE2B aa7ba9cace0e6878e860cff6a27e6b3db54d1b9eac60ac389c28d0966070abade79dbcc1067fe6dae86c75909fccce56570c933c075428a85e67d12c1b1e66ac SHA512 29363a426f027dacc5dc7dbd3dd16e88446d8d290bc682b501cc858345940540c0defdb1f84e94c0cd8bbd6858be701a32bb9edb93477b642c5aaef756ddf59c
 EBUILD make-9999.ebuild 2225 BLAKE2B 0946e0513b526a9e30b06293c6886c7919d019d5b902d1aa3cf35b0d0294fdaed9fb77cfaaa2f4ba283fbdec703cc35833c227afd34b54e7b0c074d806b7bf80 SHA512 277829b8f33c6e24c590044991537d0b44de1597c4279715d93dd389f10480491086cdeceb92ba08e22cc6d4f166f7cc9931199abf92b504fc64db42a5e84e87
 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 c711910ab5e1..be2e5247a4ef 100644
--- a/dev-build/make/make-4.4.1-r100.ebuild
+++ b/dev-build/make/make-4.4.1-r100.ebuild
@@ -18,7 +18,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.lz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )"
-	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
 
 LICENSE="GPL-3+"
diff --git a/dev-build/remake/Manifest b/dev-build/remake/Manifest
index e0fb1f98805b..9f4c563da8fe 100644
--- a/dev-build/remake/Manifest
+++ b/dev-build/remake/Manifest
@@ -3,6 +3,6 @@ AUX remake-4.3.1.1.6-configure.patch 730 BLAKE2B 36bd4bfda1b458c877319d67c4bc2a6
 DIST remake-4.3+dbg-1.5.tar.gz 2546056 BLAKE2B c5c1b254d0533e0d9787d408f79e8aba93cab5185de76519dabef7ddca5c9d2021671099f9ff80df345732552f859ce31d1131b89cd56fb185bae4cee676b412 SHA512 90aa9674ed5d88b72fda5a99a103d0b1a643d10b18c1de1186478b026f6b4da73628bff75a180df880157b5cbfff1bfd782f4ee81880e0635d79113fcc0f7497
 DIST remake-4.3+dbg-1.6.tar.gz 2596911 BLAKE2B 4d4e90bc9b6e0c36eea3b8b2c419ea1af8e37b3dc575969fe853f683da983e0ea73a0a3668adf448dfdf4b2dffc079f197fcb66139cac382df551cf34ea4d813 SHA512 d4f0ed0afa0bebf49e0cf6ef3fcfb0915fd457477424b6ffb5f06c6d2faf8d79bbdc9119a736c24c0787b23ceaeccf072e03a654dc01d05c08c88e030ae33539
 EBUILD remake-4.3.1.1.5.ebuild 1078 BLAKE2B e057c03f63ab0a2592bf1d93028b0816ff1c3e630e22913a878000569af6883e702a1b3f15b7b9c18ce27d63836dda13f0114c36a1d5ab642eb32ed057f37ae7 SHA512 85fc4f7ba72007ddac00aa6708a14c9315cbbbb1e361121887eb520fd6c0a92c60eedc0a758fd0f724b0b4e77b280b89d556b6806d3be5783ab7bdf969da8760
-EBUILD remake-4.3.1.1.6-r100.ebuild 1370 BLAKE2B 67a5120d3447a2fe5af3476eca7fe630047bf532d1bfe52882586d0bca7c1a08f78a31eb3bd382af91ab6aec238c67f92b3b2cec84557582f51b8b03f22b2d3e SHA512 d7bcee49e1bf79881afe56d4f3a3e08b8fcffc736a2a7764a2940bbb8ac6c3350f850bd2e21a4f18559bf89262bfe51b574a0510f16dd83dabf2b7eb68e08001
+EBUILD remake-4.3.1.1.6-r100.ebuild 1368 BLAKE2B e36a7c1a353dcfc098c623ecd0b8e42b35835b740ed28f40a731dde6b021def6110280ea9ddd648972572ff9270b7b5695ab4718f3d25ea2b617afee5a56d124 SHA512 d180a0f264f87910a42927109f8a1fa8746ff16d76500c07770585479ccc08761601f0ea6ad2d33b7d253bc9c01039b185467bbe658d51d5c1d48e0ef244a99b
 EBUILD remake-4.3.1.1.6.ebuild 1184 BLAKE2B 13d5ce7df3a8bfa5133c6271f9f03c0db227ebcd511cb8efa5a5e9627a392af05c50cbff4d2e77cd0138055b402688ce44a376307354a5aef8a2e929e193cc74 SHA512 bbd93c9625419292b3818e7b9c75eaadeb0be5d2c86c96fe265a59d0a8b9d7d679390d177f26a72b529aa6e70d3da72e26ab768638e80d5dbfe8d41a806e6b64
 MISC metadata.xml 296 BLAKE2B e3146e98a4240740fa3d3089a7e15fa9833e60ec13e6f158b5db2d5ac6f59f98bd5d1c34554d87759eabf4d42376bc3cbfeaab9c5f6e8faed40520cb1e82804d SHA512 e5d3192b7c2ec0bd9e81b3c83449addd1e6cf240637c0ac2dbacadb0d0896d46691b55ad4337a90f35b79649366db012698932b71b0bfd2670eac50d84066d89
diff --git a/dev-build/remake/remake-4.3.1.1.6-r100.ebuild b/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
index 498d47dd04a8..5429a3bf0d09 100644
--- a/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
+++ b/dev-build/remake/remake-4.3.1.1.6-r100.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="guile readline"
 
 REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )"