9 files changed, 651 insertions, 6 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 90e62e988836..84f3b8cd15c3 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 0a0582814cd4..86e5d1655cb6 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -21,9 +21,13 @@ DIST cmake-3.31.0.tar.gz 11699894 BLAKE2B 9f9b5b15e5c9b19865cd00e3034fadf3a8ce4c
 DIST cmake-3.31.1-SHA-256.txt 1646 BLAKE2B 5574526bb53edfdca53903ca03c0963d47eee40d180a2433eedffcfd55bc4a954a5ce2f1199b4fc11f48aaee228da1295689033d5bd2cb2f60df5177f4ed6cac SHA512 0f6b3cdee4874c4f7a89fe60e5cdb63e9317e561d86997720f2bcba7f66eb7dd49dcac4acce3ce3827f7c8bf733936511e34f350dd8d161ae5984e87ea2f09b8
 DIST cmake-3.31.1-SHA-256.txt.asc 833 BLAKE2B 3ece95f1d5bf575417bd6e77b1b29a1aa2a8db04cb4707d181fe98c7da1a2b60a6af6ea3c9a497d1bdc995fe6c61eac14f60fec540e504a5b019506cf8c2db56 SHA512 a0904d0f25ba03a874ebe63c7a82176684574fedcf5e61d796248024cfb3d3a39b7d6c135802c3ece0da0e2fec04894215427646026a91d526d526e91c54e2be
 DIST cmake-3.31.1.tar.gz 11704421 BLAKE2B ff98ac838d670db8ec3bf289b8ca313cde73809770fb343d189c172ad0a9ed5b983f5a39a86fa966309ee262f7d108d8e3ad3887bc7fea45716a7e7d00487854 SHA512 9c4664792b32b1fa76aa66c5211e8a0a1fed380eb48ff605adb516d056ae3ab94859cf4103d86b83e220baba3ec5b763b454b6866d6bd606fc558fa3da75b146
+DIST cmake-3.31.2-SHA-256.txt 1646 BLAKE2B 98872e4f89c110baa008999af2bb8289d343b1802864330190dd5e3dbb859b499c4fd14ee98b0a3acf6963116326a73f6e2681f3d45b40bbb0a7a0b06074a61a SHA512 9c95c9d6d0d121e0f6e0e09d2e586d54482b4fc1b173173c181d3091005ac3735bac5a020898c63a086858ae9d42324d9cb8d2f49e519d36bc864eac02e37329
+DIST cmake-3.31.2-SHA-256.txt.asc 833 BLAKE2B 884e048d662c7c816d8e7b391a011762ae952952956aa1f9f5b88580ce6816abf716a60e31c881511d4bbe1a12e31ce28518ab0f28539932f1c44746a1991bc3 SHA512 1057e8f7d5164b99a6315620b4773f2a32fb51a1fddaf644fc3aa9927e4f8535bcad163d9e6513b398c08d8ba5952225989e87827f2ad5f8b50d09e6971c4bb4
+DIST cmake-3.31.2.tar.gz 11706141 BLAKE2B 99d498f77c0a7637af27883b1d6b43a01c35548d168e5746f171d32f377270bb8ce3102b4cef9937394d31c5dffe0229d458aac17e4450ff630f28db0a2431e2 SHA512 72ba95bfb514ed7aeb3fcb7ec086c95d00c38c50f06f07cc384f49589dc0c017e4cdb07a850db59c4d36f6f894b6924032236e3655ed751dc8b0b10e0ab21e23
 EBUILD cmake-3.30.5.ebuild 9177 BLAKE2B 19559d4c111e459929fbe5a59c730222468ab8fbead975782e3d5dbe5ca1e830415fcd1940bfc40c90e6334f827db3a7fce80d8298fb86cb81300b0a5f92387e SHA512 c40e018c4822014b840ce0097af17f1a0c580c4cf55b3584565a646e802e8f37bc17959325847ccb9ebf0306035a1a6d9443a93cd7aad8807da84bc62b61d959
 EBUILD cmake-3.30.6.ebuild 9179 BLAKE2B 1043cbade235c151cb58ed6e1931bac34f5f1d66965ba5e1e7a16b53aebc28a499e4819d4c0a3b64a04c234a83afb88fc8541cacc07d04b2d9bfa8e23bef10d2 SHA512 2b9dbb7eaa4712599b7d9f1322cb02997d610373418b457b4dfa3d186240db519be6ef43f94962962eae2aa4d76d9cba6c03a79c42e0730d5e3030d102ef2cf8
 EBUILD cmake-3.31.0.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
 EBUILD cmake-3.31.1.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
-EBUILD cmake-9999.ebuild 9185 BLAKE2B 200afbb67f73ce10c6904958dc5d044937327886ef3e2794d4c18b52168a7d321069cb6c82e38f81c1e5e2fe8cf978974382bcc552fc46a11a585e87cbfca717 SHA512 2b4fd6bcc5121dee04da852ab39df430f8d238096a8eaaaa987b7a34c11c97e4e9cef3ebd9654f0d9b2ba6771229b6a85cdff633efec2bb56a6ac5027880a791
+EBUILD cmake-3.31.2.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
+EBUILD cmake-9999.ebuild 9255 BLAKE2B 65be444ca8496cdefec833e7bc44084b37ed3a9cb1bc7ffe5a968d0b3a5e48707a604c3599e1296922e293b0fa931b3e68e388dae4f1796bf44e531e98337e56 SHA512 f82e5341bd9fda0842416c7ec7e5618e94387a4c619a1d3caf2447650ffc3a5abccfc3cc86fd653ad68eadb75cc4efb06ea161f5fee38e2e5e376731914bba3d
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.2.ebuild b/dev-build/cmake/cmake-3.31.2.ebuild
new file mode 100644
index 000000000000..e9982cd799b4
--- /dev/null
+++ b/dev-build/cmake/cmake-3.31.2.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/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index f565534c2cd6..57684e5cd229 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -229,12 +229,13 @@ src_test() {
 		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
 		|| die
 
-	unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+	# TODO: Still relevant after https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10070?
+	unset 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.
+	#    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
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 36f2ddf34e68..a9cf3ca494a2 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -1,6 +1,7 @@
 AUX 0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch 12301 BLAKE2B 44875bf6aa6e18de99e9c7202cd931f95a43dc29dac69a83cfa1cefbdf5442bc292920bd46b2479e39f150a534afe9f8db72022eb029c344b4c3e5f59a7274a6 SHA512 f106bf93bdedb82d079061715178bb0cbdf333113555ca0f61da0d0112ca6eff08135585d7e442d16a85b65232ff501a33e5ad208d230ea6d9fa10b30271f247
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08
+AUX meson-1.6.0-generate_git-both-libraries.patch 15642 BLAKE2B e8fcb1edd52d58d532096a8354b3c8e41df9bc5f82949825c73d539653fc51eed2758638f9c02c44207e77581938a268f45f6d30304c7fe2bbeb0d1040216b53 SHA512 a009b36fc8dba8fd5eaa504a69b88d19171b19e0dd5f28d62cecd475afabb9669c1b6db46a6670cbfe6eaf5598dd620c8470b7fe411603ae69ec77f2529e91e8
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
 DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
@@ -25,6 +26,6 @@ EBUILD meson-1.3.2.ebuild 3411 BLAKE2B 71d25e070379acab0e87c57fab8226afb5f7939e7
 EBUILD meson-1.4.2.ebuild 5079 BLAKE2B 71538d46f5f2d0f34ae4ae2082ff5fa1d37413b769642aa577211502792a234fbdda2c119adcc4e2bab81c64b86bdb9721050c64d2cb3db4083bf403d1e38354 SHA512 d19349b37b49c7c131e89ed3c6f17c52be298295cf9d99d2245cc50dc4d51707fe738b96bea13411f3c4b553c84c6af685c978377526ff3aab4c5706b9e06b3b
 EBUILD meson-1.5.1.ebuild 4924 BLAKE2B 47ed021c4efbd4192172b27ae7dba70df733f426d068e774e9b0552d26c5c8e6e41fb3e97d1282c3b3543e59225a18a468fb9902bae96efa329ec34955288612 SHA512 597247bf8102f8b8891e17a565c67a9edcb379b8db6bc05f097ae934d27342622474e2ae77ff26306684e7caec487429e57a4c236721dab000afeca7b21fde83
 EBUILD meson-1.5.2.ebuild 4927 BLAKE2B 187df2e74851a788fcda20d5d23751287644b3fcccd583101ce5fb2ce65757ad44d90766ee43781332517d6b4f7c6051068044871984262d3bd9aea68c7909f7 SHA512 03e0c192979ddbbbca9d43f6bcfb1cda6e6c1c81c8a50bb41b7468e107de2e66635176708a5b0962cd77c7b3bade9c37a14d5196d0f5cfd2b55b3dcb7a83da2c
-EBUILD meson-1.6.0.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
+EBUILD meson-1.6.0-r1.ebuild 4986 BLAKE2B ed603f35e0b81a00cbde98062752c4850590271d7543d96685e8764460b94379e7c79c87f6f4116dd6625a63c39a4a8bb69a98a3ea5d06196a2961d3b31861d3 SHA512 b8e71c9ed86f82de2645ccee830bb2b076f89d53dacfe58ad68f3f1c803b873f141e00b835099f38139290807efa5b4fa8bc48de52cf7a3a68a24554a32e8443
 EBUILD meson-9999.ebuild 4932 BLAKE2B bf5e036f3addab796648e9bdf5c7062103962530d10cd584a626a915ac10a32d12139504b47daf5e87e3bf7b63e7ded742f8cca0b4b01ec1e702c8ba41cd51e9 SHA512 80cff3afa1c0735ab06bc0747eace6d166286330fb599a090fc64397f772593df0f73540079170bc7956cab7795c696a1debcb7dd5adbb4ca37180c71fb6bdcc
 MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3
diff --git a/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch b/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch
new file mode 100644
index 000000000000..ed4d4ef7303f
--- /dev/null
+++ b/dev-build/meson/files/meson-1.6.0-generate_git-both-libraries.patch
@@ -0,0 +1,345 @@
+https://bugs.gentoo.org/945770
+https://bugs.gentoo.org/945769
+https://github.com/mesonbuild/meson/issues/13850
+https://github.com/mesonbuild/meson/commit/d8ea5c4d8875bf198f088c603868edf66a3c7c65
+
+From d8ea5c4d8875bf198f088c603868edf66a3c7c65 Mon Sep 17 00:00:00 2001
+From: Charles Brunet <charles.brunet@optelgroup.com>
+Date: Tue, 29 Oct 2024 16:51:36 -0400
+Subject: [PATCH] fix generate_gir with BothLibraries dependency
+
+Co-authored-by: Xavier Claessens <xclaesse@gmail.com>
+---
+ mesonbuild/build.py                           | 52 ++++++++++++-------
+ mesonbuild/interpreter/interpreter.py         | 22 ++++----
+ mesonbuild/interpreter/interpreterobjects.py  | 10 ++--
+ .../frameworks/38 gir both_libraries/bar.c    |  7 +++
+ .../frameworks/38 gir both_libraries/bar.h    |  1 +
+ .../frameworks/38 gir both_libraries/foo.c    |  6 +++
+ .../frameworks/38 gir both_libraries/foo.h    |  1 +
+ .../38 gir both_libraries/meson.build         | 42 +++++++++++++++
+ .../38 gir both_libraries/test.json           |  3 ++
+ 9 files changed, 111 insertions(+), 33 deletions(-)
+ create mode 100644 test cases/frameworks/38 gir both_libraries/bar.c
+ create mode 100644 test cases/frameworks/38 gir both_libraries/bar.h
+ create mode 100644 test cases/frameworks/38 gir both_libraries/foo.c
+ create mode 100644 test cases/frameworks/38 gir both_libraries/foo.h
+ create mode 100644 test cases/frameworks/38 gir both_libraries/meson.build
+ create mode 100644 test cases/frameworks/38 gir both_libraries/test.json
+
+diff --git a/mesonbuild/build.py b/mesonbuild/build.py
+index a00209ad45a8..35f1f24a42f8 100644
+--- a/mesonbuild/build.py
++++ b/mesonbuild/build.py
+@@ -774,6 +774,7 @@ def __init__(
+         }
+         self.pic = False
+         self.pie = False
++        self.both_lib: T.Optional[T.Union[StaticLibrary, SharedLibrary]] = None
+         # Track build_rpath entries so we can remove them at install time
+         self.rpath_dirs_to_remove: T.Set[bytes] = set()
+         self.process_sourcelist(sources)
+@@ -1740,16 +1741,20 @@ def process_vs_module_defs_kw(self, kwargs: T.Dict[str, T.Any]) -> None:
+     def extract_targets_as_list(self, kwargs: T.Dict[str, T.Union[LibTypes, T.Sequence[LibTypes]]], key: T.Literal['link_with', 'link_whole']) -> T.List[LibTypes]:
+         bl_type = self.environment.coredata.get_option(OptionKey('default_both_libraries'))
+         if bl_type == 'auto':
+-            bl_type = 'static' if isinstance(self, StaticLibrary) else 'shared'
+-
+-        def _resolve_both_libs(lib: LibTypes) -> LibTypes:
+-            if isinstance(lib, BothLibraries):
+-                return lib.get(bl_type)
+-            return lib
++            if isinstance(self, StaticLibrary):
++                bl_type = 'static'
++            elif isinstance(self, SharedLibrary):
++                bl_type = 'shared'
+ 
+         self_libs: T.List[LibTypes] = self.link_targets if key == 'link_with' else self.link_whole_targets
+-        lib_list = listify(kwargs.get(key, [])) + self_libs
+-        return [_resolve_both_libs(t) for t in lib_list]
++
++        lib_list = []
++        for lib in listify(kwargs.get(key, [])) + self_libs:
++            if isinstance(lib, (Target, BothLibraries)):
++                lib_list.append(lib.get(bl_type))
++            else:
++                lib_list.append(lib)
++        return lib_list
+ 
+     def get(self, lib_type: T.Literal['static', 'shared', 'auto']) -> LibTypes:
+         """Base case used by BothLibraries"""
+@@ -2204,6 +2209,14 @@ def is_linkable_target(self):
+     def is_internal(self) -> bool:
+         return not self.install
+ 
++    def set_shared(self, shared_library: SharedLibrary) -> None:
++        self.both_lib = shared_library
++
++    def get(self, lib_type: T.Literal['static', 'shared', 'auto']) -> LibTypes:
++        if lib_type == 'shared':
++            return self.both_lib or self
++        return self
++
+ class SharedLibrary(BuildTarget):
+     known_kwargs = known_shlib_kwargs
+ 
+@@ -2470,6 +2483,14 @@ def type_suffix(self):
+     def is_linkable_target(self):
+         return True
+ 
++    def set_static(self, static_library: StaticLibrary) -> None:
++        self.both_lib = static_library
++
++    def get(self, lib_type: T.Literal['static', 'shared']) -> LibTypes:
++        if lib_type == 'static':
++            return self.both_lib or self
++        return self
++
+ # A shared library that is meant to be used with dlopen rather than linking
+ # into something else.
+ class SharedModule(SharedLibrary):
+@@ -2506,7 +2527,7 @@ def get_default_install_dir(self) -> T.Union[T.Tuple[str, str], T.Tuple[None, No
+         return self.environment.get_shared_module_dir(), '{moduledir_shared}'
+ 
+ class BothLibraries(SecondLevelHolder):
+-    def __init__(self, shared: SharedLibrary, static: StaticLibrary, preferred_library: Literal['shared', 'static', 'auto']) -> None:
++    def __init__(self, shared: SharedLibrary, static: StaticLibrary, preferred_library: Literal['shared', 'static']) -> None:
+         self._preferred_library = preferred_library
+         self.shared = shared
+         self.static = static
+@@ -2914,23 +2935,14 @@ class AliasTarget(RunTarget):
+ 
+     typename = 'alias'
+ 
+-    def __init__(self, name: str, dependencies: T.Sequence[T.Union[Target, BothLibraries]],
++    def __init__(self, name: str, dependencies: T.Sequence[Target],
+                  subdir: str, subproject: str, environment: environment.Environment):
+-        super().__init__(name, [], list(self._deps_generator(dependencies)), subdir, subproject, environment)
++        super().__init__(name, [], dependencies, subdir, subproject, environment)
+ 
+     def __repr__(self):
+         repr_str = "<{0} {1}>"
+         return repr_str.format(self.__class__.__name__, self.get_id())
+ 
+-    @staticmethod
+-    def _deps_generator(dependencies: T.Sequence[T.Union[Target, BothLibraries]]) -> T.Iterator[Target]:
+-        for dep in dependencies:
+-            if isinstance(dep, BothLibraries):
+-                yield dep.shared
+-                yield dep.static
+-            else:
+-                yield dep
+-
+ class Jar(BuildTarget):
+     known_kwargs = known_jar_kwargs
+ 
+diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
+index 58385c58c5f7..10ca3e6bb2e8 100644
+--- a/mesonbuild/interpreter/interpreter.py
++++ b/mesonbuild/interpreter/interpreter.py
+@@ -31,7 +31,7 @@
+ from ..interpreterbase import Disabler, disablerIfNotFound
+ from ..interpreterbase import FeatureNew, FeatureDeprecated, FeatureBroken, FeatureNewKwargs
+ from ..interpreterbase import ObjectHolder, ContextManagerObject
+-from ..interpreterbase import stringifyUserArguments, resolve_second_level_holders
++from ..interpreterbase import stringifyUserArguments
+ from ..modules import ExtensionModule, ModuleObject, MutableModuleObject, NewExtensionModule, NotFoundExtensionModule
+ from ..optinterpreter import optname_regex
+ 
+@@ -681,7 +681,6 @@ def func_files(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwa
+         KwargInfo('version', (str, NoneType)),
+         KwargInfo('objects', ContainerTypeInfo(list, build.ExtractedObjects), listify=True, default=[], since='1.1.0'),
+     )
+-    @noSecondLevelHolderResolving
+     def func_declare_dependency(self, node: mparser.BaseNode, args: T.List[TYPE_var],
+                                 kwargs: kwtypes.FuncDeclareDependency) -> dependencies.Dependency:
+         deps = kwargs['dependencies']
+@@ -1906,15 +1905,12 @@ def func_jar(self, node: mparser.BaseNode,
+     @permittedKwargs(known_build_target_kwargs)
+     @typed_pos_args('build_target', str, varargs=SOURCES_VARARGS)
+     @typed_kwargs('build_target', *BUILD_TARGET_KWS, allow_unknown=True)
+-    @noSecondLevelHolderResolving
+     def func_build_target(self, node: mparser.BaseNode,
+                           args: T.Tuple[str, SourcesVarargsType],
+                           kwargs: kwtypes.BuildTarget
+                           ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary,
+                                        build.SharedModule, build.BothLibraries, build.Jar]:
+         target_type = kwargs['target_type']
+-        if target_type not in {'both_libraries', 'library'}:
+-            args, kwargs = resolve_second_level_holders(args, kwargs)
+ 
+         if target_type == 'executable':
+             return self.build_target(node, args, kwargs, build.Executable)
+@@ -2176,13 +2172,19 @@ def func_run_target(self, node: mparser.FunctionNode, args: T.Tuple[str],
+     @FeatureNew('alias_target', '0.52.0')
+     @typed_pos_args('alias_target', str, varargs=(build.Target, build.BothLibraries), min_varargs=1)
+     @noKwargs
+-    @noSecondLevelHolderResolving
+     def func_alias_target(self, node: mparser.BaseNode, args: T.Tuple[str, T.List[T.Union[build.Target, build.BothLibraries]]],
+                           kwargs: TYPE_kwargs) -> build.AliasTarget:
+         name, deps = args
+         if any(isinstance(d, build.RunTarget) for d in deps):
+             FeatureNew.single_use('alias_target that depends on run_targets', '0.60.0', self.subproject)
+-        tg = build.AliasTarget(name, deps, self.subdir, self.subproject, self.environment)
++        real_deps: T.List[build.Target] = []
++        for d in deps:
++            if isinstance(d, build.BothLibraries):
++                real_deps.append(d.shared)
++                real_deps.append(d.static)
++            else:
++                real_deps.append(d)
++        tg = build.AliasTarget(name, real_deps, self.subdir, self.subproject, self.environment)
+         self.add_target(name, tg)
+         return tg
+ 
+@@ -3286,16 +3288,18 @@ def build_both_libraries(self, node: mparser.BaseNode, args: T.Tuple[str, Source
+             # Keep only compilers used for linking
+             static_lib.compilers = {k: v for k, v in static_lib.compilers.items() if k in compilers.clink_langs}
+ 
++        # Cross reference them to implement as_shared() and as_static() methods.
++        shared_lib.set_static(static_lib)
++        static_lib.set_shared(shared_lib)
++
+         return build.BothLibraries(shared_lib, static_lib, preferred_library)
+ 
+     def build_library(self, node: mparser.BaseNode, args: T.Tuple[str, SourcesVarargsType], kwargs: kwtypes.Library):
+         default_library = self.coredata.get_option(OptionKey('default_library', subproject=self.subproject))
+         assert isinstance(default_library, str), 'for mypy'
+         if default_library == 'shared':
+-            args, kwargs = resolve_second_level_holders(args, kwargs)
+             return self.build_target(node, args, T.cast('kwtypes.StaticLibrary', kwargs), build.SharedLibrary)
+         elif default_library == 'static':
+-            args, kwargs = resolve_second_level_holders(args, kwargs)
+             return self.build_target(node, args, T.cast('kwtypes.SharedLibrary', kwargs), build.StaticLibrary)
+         elif default_library == 'both':
+             return self.build_both_libraries(node, args, kwargs)
+diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
+index a919102607be..f4a2b4107ed3 100644
+--- a/mesonbuild/interpreter/interpreterobjects.py
++++ b/mesonbuild/interpreter/interpreterobjects.py
+@@ -1001,8 +1001,6 @@ class SharedLibraryHolder(BuildTargetHolder[build.SharedLibrary]):
+ 
+ class BothLibrariesHolder(BuildTargetHolder[build.BothLibraries]):
+     def __init__(self, libs: build.BothLibraries, interp: 'Interpreter'):
+-        # FIXME: This build target always represents the shared library, but
+-        # that should be configurable.
+         super().__init__(libs, interp)
+         self.methods.update({'get_shared_lib': self.get_shared_lib_method,
+                              'get_static_lib': self.get_static_lib_method,
+@@ -1017,12 +1015,16 @@ def __repr__(self) -> str:
+     @noPosargs
+     @noKwargs
+     def get_shared_lib_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> build.SharedLibrary:
+-        return self.held_object.shared
++        lib = copy.copy(self.held_object.shared)
++        lib.both_lib = None
++        return lib
+ 
+     @noPosargs
+     @noKwargs
+     def get_static_lib_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> build.StaticLibrary:
+-        return self.held_object.static
++        lib = copy.copy(self.held_object.static)
++        lib.both_lib = None
++        return lib
+ 
+ class SharedModuleHolder(BuildTargetHolder[build.SharedModule]):
+     pass
+diff --git a/test cases/frameworks/38 gir both_libraries/bar.c b/test cases/frameworks/38 gir both_libraries/bar.c
+new file mode 100644
+index 000000000000..4cb41f798294
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/bar.c	
+@@ -0,0 +1,7 @@
++#include "bar.h"
++#include "foo.h"
++
++int bar_func(void)
++{
++    return foo_func() + 42;
++}
+diff --git a/test cases/frameworks/38 gir both_libraries/bar.h b/test cases/frameworks/38 gir both_libraries/bar.h
+new file mode 100644
+index 000000000000..d22827b837f7
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/bar.h	
+@@ -0,0 +1 @@
++int bar_func(void);
+diff --git a/test cases/frameworks/38 gir both_libraries/foo.c b/test cases/frameworks/38 gir both_libraries/foo.c
+new file mode 100644
+index 000000000000..b88aa91dabb4
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/foo.c	
+@@ -0,0 +1,6 @@
++#include "foo.h"
++
++int foo_func(void)
++{
++    return 42;
++}
+diff --git a/test cases/frameworks/38 gir both_libraries/foo.h b/test cases/frameworks/38 gir both_libraries/foo.h
+new file mode 100644
+index 000000000000..2a0867249307
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/foo.h	
+@@ -0,0 +1 @@
++int foo_func(void);
+diff --git a/test cases/frameworks/38 gir both_libraries/meson.build b/test cases/frameworks/38 gir both_libraries/meson.build
+new file mode 100644
+index 000000000000..cb9cdd31f3ed
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/meson.build	
+@@ -0,0 +1,42 @@
++project('gir both libraries', 'c')
++
++gir = dependency('gobject-introspection-1.0', required: false)
++if not gir.found()
++  error('MESON_SKIP_TEST gobject-introspection not found.')
++endif
++
++if host_machine.system() == 'cygwin'
++  # FIXME: g-ir-scanner seems broken on cygwin:
++  # ERROR: can't resolve libraries to shared libraries: foo++
++  error('MESON_SKIP_TEST g-ir-scanner is broken on cygwin.')
++endif
++
++gnome = import('gnome')
++
++# Regression test simulating how GStreamer generate its GIRs.
++# Generated gobject-introspection binaries for every GStreamer libraries must
++# first call gst_init() defined in the main libgstreamer, which means they need
++# to link on that lib.
++# A regression caused by https://github.com/mesonbuild/meson/pull/12632 made
++# Meson not link the binary generated for bar with libfoo in the case it uses
++# both_libraries().
++
++libfoo = both_libraries('foo', 'foo.c')
++foo_gir = gnome.generate_gir(libfoo,
++  namespace: 'foo',
++  nsversion: '1.0',
++  sources: ['foo.c', 'foo.h'],
++)
++foo_dep = declare_dependency(
++  link_with: libfoo,
++  sources: foo_gir,
++)
++
++libbar = both_libraries('bar', 'bar.c', dependencies: foo_dep)
++gnome.generate_gir(libbar,
++  namespace: 'bar',
++  nsversion: '1.0',
++  sources: ['bar.c', 'bar.h'],
++  extra_args: '--add-init-section=extern void foo_func(void);foo_func();',
++  dependencies: foo_dep,
++)
+diff --git a/test cases/frameworks/38 gir both_libraries/test.json b/test cases/frameworks/38 gir both_libraries/test.json
+new file mode 100644
+index 000000000000..82ac42a293b3
+--- /dev/null
++++ b/test cases/frameworks/38 gir both_libraries/test.json	
+@@ -0,0 +1,3 @@
++{
++    "expect_skip_on_jobname": ["azure", "macos", "msys2", "cygwin"]
++}
+\ No newline at end of file
+
diff --git a/dev-build/meson/meson-1.6.0.ebuild b/dev-build/meson/meson-1.6.0-r1.ebuild
index 70a2f51176dd..22ac4ec4621b 100644
--- a/dev-build/meson/meson-1.6.0.ebuild
+++ b/dev-build/meson/meson-1.6.0-r1.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+	"${FILESDIR}"/${P}-generate_git-both-libraries.patch
 )
 
 src_unpack() {
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index adb483488234..d46ac41160a0 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -4,6 +4,6 @@ DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4 SHA512 d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b321111b806aa7efa1061f031a1319b074391db61b0cbdccf096954c
 EBUILD ninja-1.11.1-r5.ebuild 2445 BLAKE2B e29dfa6952cbec0783bd1d894faf740230b60eb4b09c8828677691d424a41a7cf9f72a8983ad9f89d24d15493025d9e7519bf1be3d774298e7016e5a77d74447 SHA512 7ef8a7c949e5db033fac8e49c2d71392c27f672b889de7534a422ca4bbc7b0d53fde83be0d34fef5ce3023fc90dc2d98d98d7bca5cddbd700fea3dcba1a9ebec
-EBUILD ninja-1.12.1.ebuild 2704 BLAKE2B 39bc6ac04a54ab901fd16e1b709b7ea9b32d11da7911c35d5ab27ca7e1a49ae9f04101b013d17b0aa440d7ae1ad02f66b96688f18c187db999cd5e10b65ae9a3 SHA512 75bd46ff65501a2fc0266b4c265edfcdaab489f5b1f1234d8658ca4befa6231e126489c192d314a6117f03bc3392eb05a29671a28badf5df675bf37f81440668
+EBUILD ninja-1.12.1.ebuild 2703 BLAKE2B 47eef6aa19fd016b47e69580f6926167f8035290be76892c382433f6a730becaceb238073a7ce961499b2f2d740fd2c8cdfaf31e46f15f755ab513e76e988f09 SHA512 054e4c9ae6d140bbc18ba886cb5f10c4efb3d989872037652241a4e9cdb0dc67dee1e78ccea95eea881f9009cd442a079ddc1f59cf85209de0160116791ebda5
 EBUILD ninja-9999.ebuild 2660 BLAKE2B 29e3f7fd44e6d9de78d84ea871662aa13552ea0c8654e9cf4d7034cad3018c1b82d53f45190b34dead7c1448336f00988b4958278764a63cc50f91691675e2ea SHA512 d221ceeee9a93acb16f572a258dec7e4a4bc5f787c4196af85612df8e386e39a1e863ff57d3c7bde591eac7e6c0b2efb8b3a797602b56160ef09cebf8571d863
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 6411c72d4323..b8fff02af692 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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
 
 GTEST_VER=1.14.0