diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch
new file mode 100644
index 0000000000..6e9e670ba8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch
@@ -0,0 +1,26 @@
+linkers_detect: detect xtools (Apple ld64 derivative)
+
+xtools is in use on x86_64 and ppc based darwin Prefix installs.  Pick
+it up as a valid linker.
+
+Meson is the only thing known at this point to try and figure out what
+linker is in use exactly, so instead of changing the linker (xtools),
+just teach Meson about xtools.
+
+Author: Fabian Groffen <grobian@gentoo.org>
+Bug: https://bugs.gentoo.org/868516
+
+--- a/mesonbuild/linkers/detect.py
++++ b/mesonbuild/linkers/detect.py
+@@ -185,6 +185,11 @@
+             v = search_version(o)
+ 
+         linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
++    # detect xtools first, bug #868516
++    elif 'xtools-' in o.split('\n')[0]:
++        xtools = o.split(' ')[0]
++        v = xtools.split('-')[1]
++        linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+     # First might be apple clang, second is for real gcc, the third is icc.
+     # Note that "ld: unknown option: " sometimes instead is "ld: unknown options:".
+     elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option' in e:
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild
index affad54f23..e7cc675552 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild
index 016c524354..5443030fc8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild
index 280175c18c..8394dad757 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild
index 191b8ea6ea..f19775d1fd 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild
index 429bfd5ba7..2562b7ab02 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild
index 71e1bdb7dc..9c472cdd34 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild
index 1621828da1..63d6c0a176 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild
index af208ef34b..321c8279eb 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild
index 0ae70d8409..0f026f75c3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
@@ -54,6 +54,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+	"${FILESDIR}"/${PN}-1.3.1-xtools-support.patch
 
 	# backport fix for hiding compiler warnings (such as Modern C) in vala and cython
 	"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild
index 58946549b0..4e7497b5c8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig