gentoo auto-resync : 30:06:2024 - 08:00:50

12 files changed, 0 insertions, 551 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 87a3607ea077..e114530ee11e 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index f444fccd2889..5bff9832c63c 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -1,16 +1,6 @@
-AUX 0001-Only-convert-boolean-values-for-cmake-formats.patch 1094 BLAKE2B 3c65ba28fab604a1c63e195650a88a9ae7539a04d373e46d48fb742f372efdcebcb68977a669e7d6ceacec98db02c21b6daec45c1fea569c9cec29728ef83e6f SHA512 b6e4ee780969f858f5bd8a92998b012988df5aa6deba4666108dbed8bc77012c224499a3b09ce5278e67c41f7eaabe2cfa1452ece8877509f05241a3d5e2d7c2
-AUX 0001-Revert-clike-Deduplicate-rpath-linker-flags.patch 2283 BLAKE2B e90a39bcfbdb5695eafce58d4e2a458d61377228a8b37352862fee7e15c14137ea508d325e76eff8ca65bbba13c5d1fdbb5d51064299d8652394d79a34b85560 SHA512 095a9fd8960616a12aa1bbc3a89ff2792eb18c5c7e9b482e50fe2d39d825d073128aa77d56745ac98cefbb8de72d8f125972503ef3377bd743a6b296308951e7
 AUX 0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch 12301 BLAKE2B 44875bf6aa6e18de99e9c7202cd931f95a43dc29dac69a83cfa1cefbdf5442bc292920bd46b2479e39f150a534afe9f8db72022eb029c344b4c3e5f59a7274a6 SHA512 f106bf93bdedb82d079061715178bb0cbdf333113555ca0f61da0d0112ca6eff08135585d7e442d16a85b65232ff501a33e5ad208d230ea6d9fa10b30271f247
-AUX 1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch 1547 BLAKE2B 4a61642466aa4ed4eee39fce2e796832b8325938f8ca15ea86a5d4f255dbe65be837ccbcf82ebb1a766d0ff5e7d8a69e93b7676f3af421bbc6907fec0e6ca231 SHA512 efdd2b0cb9fac0188b5c21cb3f98152d488c5299820a055031f2f75598bc0a8811988511091dfc7f99440b48defdf7e80a783cb7c374ccbba2a1e4d20a9065e3
-AUX 1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch 2799 BLAKE2B 1806655c247c4f009b41062e5ae5c90cb7ea3150c311bbdbc768e37a1d6e4a4599568584c1cd00a06315159422150ea953cda2325e97aae761bf6c7fb8b4b89e SHA512 3654092cd93f54af7ec7ea89f396c0e947d00b6a626037b827be589926502f37ecf3795c01d514b97a9990d95c6b5050f1304ba1de2ae867a86b3ca73a163893
-AUX 1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch 1295 BLAKE2B 5422ac19ec0e44e2f773851895e0fee95d71a8c2c76b904779af04d36f1e59b457f7378a2898496b24873be2262cb24a17216d1d3bbd13ced864b55047ca16e6 SHA512 5c2e389dc313fb0ac7d2a717eeda602839c610120e1251b110201e75fdd2b1e65a1870229fb327c5947ccb5ebc9f6165bb301ab6c20468943ba91dc5e6a6b36c
-AUX 1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch 3030 BLAKE2B f0e8e914799e2cc1ddd76ba70acbbaf3d6de113a8259c2910cd2fd2fe73d2c4f003314bffffd1db3ccb6338faa9a932bed43fa26b60b48d6dde89d6bbd3e2111 SHA512 97ebb84f2b76a0b08b1fafd4e7e537960d3f2c547eb03389b83f35f27f82135ae3fdba0002ae9871c0ca0b90afbea42ebb7e3a4947500d51af74536aa7acaa7e
-AUX 1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch 1313 BLAKE2B d1555c748afcc9a77252ce72e3fe95311584f8c33802a203cbe3b5777bda03a282afcf24a45cb8ec977a99bbcdad4538a124443f8ff837a2f47d3ee6da31a5c3 SHA512 3f25299c21ab967d860a3845a75d77fc032ee5b63ce6de14cec5fb21dbc826f27923409a02d685d73a9b04ac6ab74b1b92caab7f064087bc809fc93de9609a5e
-AUX 1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch 1092 BLAKE2B 21fd1a0edec2de670d58eab734bf5d86159c73df3016baa7c2c863a5a65b312129aaa90b26e9c64943fba5798ab87090076426f1feb4e67b590a4ed66fca8b6d SHA512 f0f56ce827ced24135d1b571cc0e28a26a21826f3a964ec59fecc16495d9fe69d7f104e53ab05c8555e6d4fc249f4c5c09e9404784aff65a0015c8ea863a74a4
-AUX 1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch 4822 BLAKE2B 4746bbb6ddc587df50f1fdff039115aab0715dac5413af495fc4ccf0dc98f4d87e5eb79349ad9b26a365794ea0532f8fdd5bdb3a13257417038f7127a64c3b0b SHA512 03394dab9ca6e777cc7d41cc339da6857bf7728b8c503522948a3c67c257353063159f2bf12d652ace90761d8bae3edeaac5b1c6b125ff4781b6a99fe1a75d79
 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.3.1-xtools-support.patch 1783 BLAKE2B 8feb8af8c26d4c9b250e2784398f108933140a3a9ec32f281c4d8d0569da2061e0ba7af8826d45695e00e544170131442c0ea900186a99be3e292334aa916b7a SHA512 35ce809d56446fa34e45e18b4d0ac8253d103840aa1820cdff8b5d7959714220b034c2db0654a2d49e622421686d2d27a7e5a7b81faee69f9a6818f056f7eb8f
 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
diff --git a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
deleted file mode 100644
index 394b1bbb7c1b..000000000000
--- a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 21 Nov 2023 08:42:56 +0100
-Subject: [PATCH] Only convert boolean values for cmake formats
-
-This caused a regression with mesondefine where
-  `conf_data.set("FOO", true)`
-turned into
-  `#define FOO 1`
-instead of
-  `#define FOO`
----
- mesonbuild/utils/universal.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
-index 26194628c..93e64c0a2 100644
---- a/mesonbuild/utils/universal.py
-+++ b/mesonbuild/utils/universal.py
-@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str,
-                 var, _ = confdata.get(varname)
-                 if isinstance(var, str):
-                     var_str = var
--                elif isinstance(var, bool):
-+                elif variable_format.startswith("cmake") and isinstance(var, bool):
-                     var_str = str(int(var))
-                 elif isinstance(var, int):
-                     var_str = str(var)
--- 
-2.41.0
-
diff --git a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
deleted file mode 100644
index 3d40616fec1f..000000000000
--- a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2fbc7b5ce3aced483b196dd10ca9eee1713b7494 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 26 Dec 2023 15:06:12 -0500
-Subject: [PATCH] Revert "clike: Deduplicate rpath linker flags"
-
-This reverts commit 53ea59ad8455277797117d225f326851fe7d369c.
-
-This breaks at least:
-- frameworks/17 mpi
-- frameworks/30 scalapack
-
-The problem is that openmpi's pkg-config emitted link arguments
-includes:
-
-```
--Wl,-rpath -Wl,/path/to/libdir
-```
-
-The deduplication logic in meson doesn't contain sufficient information
-to tell when the compiler is passing an argument that requires values,
-and definitely cannot tell when that argument is split across argv. But
-for arguments that *can* do this, it is not possible to deduplicate a
-single argument as standalone, because it is not standalone.
-
-The argument for deduplicating rpath here was that if you have multiple
-dependencies that all add the same rpath, the Apple ld64 emits a
-non-fatal warning "duplicate -rpath ignored". Since this is non-fatal,
-it's not a major issue. A major issue is when builds fatally error out
-with:
-
-```
-FAILED: scalapack_c
-cc  -o scalapack_c scalapack_c.p/main.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,--start-group /usr/lib64/libscalapack.so /usr/lib64/liblapack.so /usr/lib64/libblas.so -Wl,-rpath -Wl,/usr/lib64 -Wl,/usr/lib64 -Wl,--enable-new-dtags /usr/lib64/libmpi.so -Wl,--end-group
-/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: /usr/lib64: read: Is a directory
-```
----
- mesonbuild/compilers/mixins/clike.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
-index b3fc96cec..76c8e0413 100644
---- a/mesonbuild/compilers/mixins/clike.py
-+++ b/mesonbuild/compilers/mixins/clike.py
-@@ -54,7 +54,7 @@ class CLikeCompilerArgs(arglist.CompilerArgs):
- 
-     # NOTE: not thorough. A list of potential corner cases can be found in
-     # https://github.com/mesonbuild/meson/pull/4593#pullrequestreview-182016038
--    dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic', '-Wl,-rpath')
-+    dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic')
-     dedup1_suffixes = ('.lib', '.dll', '.so', '.dylib', '.a')
-     dedup1_args = ('-c', '-S', '-E', '-pipe', '-pthread')
- 
--- 
-2.41.0
-
diff --git a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
deleted file mode 100644
index c552831cfd6b..000000000000
--- a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5f96e35b873d6230970fd63ba2e706bbd3f4e26f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 8 Sep 2023 16:54:48 -0400
-Subject: [PATCH 1/7] python dependency: ensure that setuptools doesn't inject
- itself into distutils
-
-We do not use setuptools for anything, and only lightly use distutils.
-Unpredictable issues can occur due to setuptools monkey-patching, which
-interferes with our intended use. Tell setuptools to simply never get
-involved.
-
-Note: while it's otherwise possible to check if the probe is run using
-sys.executable and avoid forking, setuptools unconditionally injects
-itself at startup in a way that requires subprocess isolation to
-disable.
-
-(cherry picked from commit 9f610ad5b72ea91de2d7aeb6f3266d0a7477062e)
----
- mesonbuild/dependencies/python.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
-index 160772888..f04494674 100644
---- a/mesonbuild/dependencies/python.py
-+++ b/mesonbuild/dependencies/python.py
-@@ -113,7 +113,9 @@ class BasicPythonExternalProgram(ExternalProgram):
- 
-         with importlib.resources.path('mesonbuild.scripts', 'python_info.py') as f:
-             cmd = self.get_command() + [str(f)]
--            p, stdout, stderr = mesonlib.Popen_safe(cmd)
-+            env = os.environ.copy()
-+            env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib'
-+            p, stdout, stderr = mesonlib.Popen_safe(cmd, env=env)
- 
-         try:
-             info = json.loads(stdout)
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch b/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch
deleted file mode 100644
index 51c13d6926ff..000000000000
--- a/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From cb4e62a8c55118988babac8b8254e0af1dc9698b Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 21 Nov 2022 20:47:14 -0500
-Subject: [PATCH 2/7] python module: stop using distutils schemes on
- sufficiently new Debian
-
-Since 3.10.3, Debian finally started patching sysconfig with custom
-paths, instead of just distutils. This means we can now go use that
-instead. It reduces our reliance on the deprecated distutils module.
-
-Partial fix for #7702
-
-(cherry picked from commit 40f897fa92f7d3cc43788d3000733310ce77cf0c)
----
- mesonbuild/scripts/python_info.py | 32 +++++++++++++++++++++++--------
- 1 file changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py
-index 9c3a0791a..65597b121 100755
---- a/mesonbuild/scripts/python_info.py
-+++ b/mesonbuild/scripts/python_info.py
-@@ -13,7 +13,6 @@ if sys.path[0].endswith('scripts'):
-     del sys.path[0]
- 
- import json, os, sysconfig
--import distutils.command.install
- 
- def get_distutils_paths(scheme=None, prefix=None):
-     import distutils.dist
-@@ -37,15 +36,32 @@ def get_distutils_paths(scheme=None, prefix=None):
- # default scheme to a custom one pointing to /usr/local and replacing
- # site-packages with dist-packages.
- # See https://github.com/mesonbuild/meson/issues/8739.
--# XXX: We should be using sysconfig, but Debian only patches distutils.
-+#
-+# We should be using sysconfig, but before 3.10.3, Debian only patches distutils.
-+# So we may end up falling back.
- 
--if 'deb_system' in distutils.command.install.INSTALL_SCHEMES:
--    paths = get_distutils_paths(scheme='deb_system')
--    install_paths = get_distutils_paths(scheme='deb_system', prefix='')
--else:
--    paths = sysconfig.get_paths()
-+def get_install_paths():
-+    if sys.version_info >= (3, 10):
-+        scheme = sysconfig.get_default_scheme()
-+    else:
-+        scheme = sysconfig._get_default_scheme()
-+
-+    if sys.version_info >= (3, 10, 3):
-+        if 'deb_system' in sysconfig.get_scheme_names():
-+            scheme = 'deb_system'
-+    else:
-+        import distutils.command.install
-+        if 'deb_system' in distutils.command.install.INSTALL_SCHEMES:
-+            paths = get_distutils_paths(scheme='deb_system')
-+            install_paths = get_distutils_paths(scheme='deb_system', prefix='')
-+            return paths, install_paths
-+
-+    paths = sysconfig.get_paths(scheme=scheme)
-     empty_vars = {'base': '', 'platbase': '', 'installed_base': ''}
--    install_paths = sysconfig.get_paths(vars=empty_vars)
-+    install_paths = sysconfig.get_paths(scheme=scheme, vars=empty_vars)
-+    return paths, install_paths
-+
-+paths, install_paths = get_install_paths()
- 
- def links_against_libpython():
-     from distutils.core import Distribution, Extension
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch
deleted file mode 100644
index 484e967c8328..000000000000
--- a/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c179c18765514d5c37737dec996b4c91cb31477f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 2 Oct 2023 16:40:15 -0400
-Subject: [PATCH 3/7] python module: refactor pypy detection into a consistent
- variable
-
-(cherry picked from commit 3d3a10ef022284c8377bd9f8e1b1adec73c50d95)
----
- mesonbuild/scripts/python_info.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py
-index 65597b121..d17b3a376 100755
---- a/mesonbuild/scripts/python_info.py
-+++ b/mesonbuild/scripts/python_info.py
-@@ -72,6 +72,8 @@ def links_against_libpython():
- variables = sysconfig.get_config_vars()
- variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)})
- 
-+is_pypy = '__pypy__' in sys.builtin_module_names
-+
- if sys.version_info < (3, 0):
-     suffix = variables.get('SO')
- elif sys.version_info < (3, 8, 7):
-@@ -88,7 +90,7 @@ print(json.dumps({
-   'install_paths': install_paths,
-   'version': sysconfig.get_python_version(),
-   'platform': sysconfig.get_platform(),
--  'is_pypy': '__pypy__' in sys.builtin_module_names,
-+  'is_pypy': is_pypy,
-   'is_venv': sys.prefix != variables['base_prefix'],
-   'link_libpython': links_against_libpython(),
-   'suffix': suffix,
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch b/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch
deleted file mode 100644
index 2ebdbcc2b30f..000000000000
--- a/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3c493dae4bd8410bfb09e8f654605f65e15d8e66 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 22 Nov 2022 22:56:10 -0500
-Subject: [PATCH 4/7] python module: stop using distutils "link to libpython"
- probe on recent python
-
-On python >=3.8, this information is expected to be encoded in the
-sysconfig vars.
-
-In distutils, it is always necessary to link to libpython on Windows;
-for posix platforms, it depends on the value of LIBPYTHON (which is the
-library to link to, possibly the empty string) as generated by
-configure.ac and embedded into python.pc and python-config.sh, and then
-coded a second time in the distutils python sources.
-
-There are a couple of caveats which have ramifications for Cygwin and
-Android:
-
-- python.pc and python-config.sh disagree with distutils when python is
-  not built shared. In that case, the former act the same as a shared
-  build, while the latter *never* links to libpython
-
-- python.pc disagrees with python-config.sh and distutils when python is
-  built shared. The former never links to libpython, while the latter do
-
-The disagreement is resolved in favor of distutils' behavior in all
-cases, and python.pc is correct for our purposes on python 3.12; see:
-https://github.com/python/cpython/pull/100356
-https://github.com/python/cpython/pull/100967
-
-Although it was not backported to older releases, Cygwin at least has
-always patched in a fix for python.pc, which behavior is now declared
-canonical. We can reliably assume it is always correct.
-
-This is the other half of the fix for #7702
-
-(cherry picked from commit 2d6c10908b3771216e7ce086af1ee4dc77e698c2)
----
- mesonbuild/scripts/python_info.py | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py
-index d17b3a376..a3f3d3535 100755
---- a/mesonbuild/scripts/python_info.py
-+++ b/mesonbuild/scripts/python_info.py
-@@ -64,10 +64,19 @@ def get_install_paths():
- paths, install_paths = get_install_paths()
- 
- def links_against_libpython():
--    from distutils.core import Distribution, Extension
--    cmd = Distribution().get_command_obj('build_ext')
--    cmd.ensure_finalized()
--    return bool(cmd.get_libraries(Extension('dummy', [])))
-+    # on versions supporting python-embed.pc, this is the non-embed lib
-+    #
-+    # PyPy is not yet up to 3.12 and work is still pending to export the
-+    # relevant information (it doesn't automatically provide arbitrary
-+    # Makefile vars)
-+    if sys.version_info >= (3, 8) and not is_pypy:
-+        variables = sysconfig.get_config_vars()
-+        return bool(variables.get('LIBPYTHON', 'yes'))
-+    else:
-+        from distutils.core import Distribution, Extension
-+        cmd = Distribution().get_command_obj('build_ext')
-+        cmd.ensure_finalized()
-+        return bool(cmd.get_libraries(Extension('dummy', [])))
- 
- variables = sysconfig.get_config_vars()
- variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)})
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch b/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch
deleted file mode 100644
index 078e9035e228..000000000000
--- a/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ae44d9a379faca6274db819be44ffca3e0159f56 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 2 Oct 2023 23:51:57 -0400
-Subject: [PATCH 5/7] tests: fix test case to not import distutils on python
- 3.12
-
-Testing the correctness of the `modules: ` kwarg can be done with other
-guaranteed stdlib modules that are even more guaranteed since they
-didn't get deprecated for removal.
-
-(cherry picked from commit ecf261330c498783760cbde00b613b7469f8d3c0)
----
- test cases/python/5 modules kwarg/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test cases/python/5 modules kwarg/meson.build b/test cases/python/5 modules kwarg/meson.build
-index 9751adaab..41a9a4fae 100644
---- a/test cases/python/5 modules kwarg/meson.build	
-+++ b/test cases/python/5 modules kwarg/meson.build	
-@@ -1,7 +1,7 @@
- project('python kwarg')
- 
- py = import('python')
--prog_python = py.find_installation('python3', modules : ['distutils'])
-+prog_python = py.find_installation('python3', modules : ['os', 'sys', 're'])
- assert(prog_python.found() == true, 'python not found when should be')
- prog_python = py.find_installation('python3', modules : ['thisbetternotexistmod'], required : false)
- assert(prog_python.found() == false, 'python not found but reported as found')
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch b/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch
deleted file mode 100644
index 0e1f167b32fb..000000000000
--- a/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d9abf4a97dc182b3c57204a792000d620f9f941e Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 3 Oct 2023 00:22:25 -0400
-Subject: [PATCH 6/7] mark the PyPI metadata as supporting python 3.12
-
-meson itself runs okay on 3.12, and the last issue for *probing* against
-3.12 is solved. Tests pass here locally.
-
-(cherry picked from commit 880f21281ee359e01de659fe7d45549d19e6b84d)
----
- setup.cfg | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index dfaba76dd..2f2962eed 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -30,6 +30,7 @@ classifiers =
- 	Programming Language :: Python :: 3.9
- 	Programming Language :: Python :: 3.10
- 	Programming Language :: Python :: 3.11
-+	Programming Language :: Python :: 3.12
- 	Topic :: Software Development :: Build Tools
- long_description = Meson is a cross-platform build system designed to be both as fast and as user friendly as possible. It supports many languages and compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its build definitions are written in a simple non-Turing complete DSL.
- 
diff --git a/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch
deleted file mode 100644
index 4ada76ae909b..000000000000
--- a/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 3 Oct 2023 16:52:56 +0100
-Subject: [PATCH 7/7] Revert "rust: apply global, project, and environment C
- args to bindgen"
-
-This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e.
-
-This ended up not doing what was intended - see https://github.com/mesonbuild/meson/issues/12065#issuecomment-1742263677.
-
-Bug: https://bugs.gentoo.org/914989
-Bug: https://bugs.gentoo.org/915014
-Signed-off-by: Sam James <sam@gentoo.org>
----
- mesonbuild/modules/rust.py                     |  6 ------
- test cases/rust/12 bindgen/meson.build         | 18 ------------------
- .../rust/12 bindgen/src/global-project.h       | 10 ----------
- test cases/rust/12 bindgen/src/global.c        |  5 -----
- test cases/rust/12 bindgen/src/global.rs       | 14 --------------
- test cases/rust/12 bindgen/test.json           |  5 +----
- 6 files changed, 1 insertion(+), 57 deletions(-)
- delete mode 100644 test cases/rust/12 bindgen/src/global-project.h
- delete mode 100644 test cases/rust/12 bindgen/src/global.c
- delete mode 100644 test cases/rust/12 bindgen/src/global.rs
-
-diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py
-index e6e5c633f..3514412e6 100644
---- a/mesonbuild/modules/rust.py
-+++ b/mesonbuild/modules/rust.py
-@@ -232,12 +232,6 @@ class RustModule(ExtensionModule):
-                 elif isinstance(s, CustomTarget):
-                     depends.append(s)
- 
--        clang_args.extend(state.global_args.get('c', []))
--        clang_args.extend(state.project_args.get('c', []))
--        cargs = state.get_option('args', state.subproject, lang='c')
--        assert isinstance(cargs, list), 'for mypy'
--        clang_args.extend(cargs)
--
-         if self._bindgen_bin is None:
-             self._bindgen_bin = state.find_program('bindgen')
- 
-diff --git a/test cases/rust/12 bindgen/meson.build b/test cases/rust/12 bindgen/meson.build
-index e7cb5f3db..c05cc0631 100644
---- a/test cases/rust/12 bindgen/meson.build	
-+++ b/test cases/rust/12 bindgen/meson.build	
-@@ -8,9 +8,6 @@ if not prog_bindgen.found()
-   error('MESON_SKIP_TEST bindgen not found')
- endif
- 
--add_project_arguments('-DPROJECT_ARG', language : 'c')
--add_global_arguments('-DGLOBAL_ARG', language : 'c')
--
- # This seems to happen on windows when libclang.dll is not in path or is not
- # valid. We must try to process a header file for this to work.
- #
-@@ -84,18 +81,3 @@ test('generated header', rust_bin2)
- 
- subdir('sub')
- subdir('dependencies')
--
--gp = rust.bindgen(
--  input : 'src/global-project.h',
--  output : 'global-project.rs',
--)
--
--gp_lib = static_library('gp_lib', 'src/global.c')
--
--gp_exe = executable(
--  'gp_exe',
--  structured_sources(['src/global.rs', gp]),
--  link_with : gp_lib,
--)
--
--test('global and project arguments', gp_exe)
-diff --git a/test cases/rust/12 bindgen/src/global-project.h b/test cases/rust/12 bindgen/src/global-project.h
-deleted file mode 100644
-index 6084e8ed6..000000000
---- a/test cases/rust/12 bindgen/src/global-project.h	
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#ifndef GLOBAL_ARG
--char * success(void);
--#endif
--#ifndef PROJECT_ARG
--char * success(void);
--#endif
--#ifndef CMD_ARG
--char * success(void);
--#endif
--int success(void);
-diff --git a/test cases/rust/12 bindgen/src/global.c b/test cases/rust/12 bindgen/src/global.c
-deleted file mode 100644
-index 10f6676f7..000000000
---- a/test cases/rust/12 bindgen/src/global.c	
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include "src/global-project.h"
--
--int success(void) {
--    return 0;
--}
-diff --git a/test cases/rust/12 bindgen/src/global.rs b/test cases/rust/12 bindgen/src/global.rs
-deleted file mode 100644
-index 4b70b1ecc..000000000
---- a/test cases/rust/12 bindgen/src/global.rs	
-+++ /dev/null
-@@ -1,14 +0,0 @@
--// SPDX-license-identifer: Apache-2.0
--// Copyright © 2023 Intel Corporation
--
--#![allow(non_upper_case_globals)]
--#![allow(non_camel_case_types)]
--#![allow(non_snake_case)]
--
--include!("global-project.rs");
--
--fn main() {
--    unsafe {
--        std::process::exit(success());
--    };
--}
-diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json
-index b3a758562..f94ee85f9 100644
---- a/test cases/rust/12 bindgen/test.json	
-+++ b/test cases/rust/12 bindgen/test.json	
-@@ -1,10 +1,7 @@
- {
--  "env": {
--    "CFLAGS": "-DCMD_ARG"
--  },
-   "stdout": [
-     {
--      "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
-+      "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
-     }
-   ]
- }
--- 
-2.42.0
-
diff --git a/dev-build/meson/files/meson-1.3.1-xtools-support.patch b/dev-build/meson/files/meson-1.3.1-xtools-support.patch
deleted file mode 100644
index dfb9b3f6be68..000000000000
--- a/dev-build/meson/files/meson-1.3.1-xtools-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 33527630f1bd0e51093044016557cb44e7bb6547 Mon Sep 17 00:00:00 2001
-From: Fabian Groffen <grobian@gentoo.org>
-Date: Wed, 17 Jan 2024 17:04:45 +0100
-Subject: [PATCH] linkers_detect: detect xtools (Apple ld64 derivative)
-
-xtools is in use on Gentoo Prefix x86_64 and ppc based Darwin installs.
-Pick it up as a valid linker.
-
-Since xtools is answering with a version to --version, as opposed to
-ld64, detection of xtools in the ld64 handling block is not possible,
-since --version already succeeded.
-
-Bug: https://bugs.gentoo.org/868516
-Bug: https://github.com/mesonbuild/meson/issues/10805
-Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- mesonbuild/linkers/detect.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py
-index 918f2e634..1bce413f4 100644
---- a/mesonbuild/linkers/detect.py
-+++ b/mesonbuild/linkers/detect.py
-@@ -174,6 +174,11 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
-             v = search_version(o)
- 
-         linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
-+    # detect xtools first, bug #10805
-+    elif 'xtools-' in o.split('\n', maxsplit=1)[0]:
-+        xtools = o.split(' ', maxsplit=1)[0]
-+        v = xtools.split('-', maxsplit=2)[1]
-+        linker = linkers.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:
--- 
-2.43.0
-