gentoo auto-resync : 03:12:2023 - 05:00:53

3 files changed, 36 insertions, 1 deletions

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 667911fff42c..45f8a1121452 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-Only-convert-boolean-values-for-cmake-formats.patch 1094 BLAKE2B 3c65ba28fab604a1c63e195650a88a9ae7539a04d373e46d48fb742f372efdcebcb68977a669e7d6ceacec98db02c21b6daec45c1fea569c9cec29728ef83e6f SHA512 b6e4ee780969f858f5bd8a92998b012988df5aa6deba4666108dbed8bc77012c224499a3b09ce5278e67c41f7eaabe2cfa1452ece8877509f05241a3d5e2d7c2
 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
@@ -24,6 +25,6 @@ EBUILD meson-1.2.1-r2.ebuild 3312 BLAKE2B 4e36e20e3585b7db4ba1744311af7788f22be2
 EBUILD meson-1.2.2-r1.ebuild 3298 BLAKE2B df141e7d10d26fdb41e298cdf856fe46e632ad484a8fc363ac9230a8f46e44f9939ed15935ee5d6b0cf7a9022779080dbe621d2b54ebbbd9165de43e7f3cceb1 SHA512 76b7aee97f500107364a7e3fbf55e077f09d3b75cbb379537b71de05c269d7dc140c81963c1feb146d363c0ff558624be55af306c5adcf19de33012e2976a3f6
 EBUILD meson-1.2.2.ebuild 3285 BLAKE2B 1b38a024705bc9a5046a19ed80f2ba126ff984112a5761283778207d1cce3e33ea39260cc3e6ce864b3f5d07ceaf7a0431f56638830491814da0455cfd2a7e7a SHA512 c581592f28a3a39834afa3369af14ddc267a1e3c2f35e2c41674354da560828fd2037550a6314f0063700528414b0bdfa42aecc82ea86340384985db8aee0fc3
 EBUILD meson-1.2.3.ebuild 3277 BLAKE2B 8a19cba268c31b8adc4f4852eca184639f0d6344934c321279a7dd48f5e3de02ce63bd4f3cff5814d8e42beff6733c9cf52c3742c254b051fa1d7a07d1885c33 SHA512 7fa82018c0f7d0179e1ccd5df33651e0e59561d2a35ccb189a32f7dc298cbe25bdfe4fd5db0eaf314a22b181ed111b74d957e240ab77cad62e2de9b3be9be512
-EBUILD meson-1.3.0.ebuild 3285 BLAKE2B 1b38a024705bc9a5046a19ed80f2ba126ff984112a5761283778207d1cce3e33ea39260cc3e6ce864b3f5d07ceaf7a0431f56638830491814da0455cfd2a7e7a SHA512 c581592f28a3a39834afa3369af14ddc267a1e3c2f35e2c41674354da560828fd2037550a6314f0063700528414b0bdfa42aecc82ea86340384985db8aee0fc3
+EBUILD meson-1.3.0-r1.ebuild 3402 BLAKE2B 86c1be84d1a2a95ef3a2c325754d773502fc38e0e689f8eb449c4a26e1498148383f608612d3f82fe223402b6d09b58a7f38f52c24211e1285512c7f134b9fa0 SHA512 28e238d500cfcd0afc8b01f1bb22c957fc86c0d85b3c17814861e2ffc4dee2024a022cb08b991dd73d32e0fef1c01ab411a2db6df6595851bbf70e1211e51aa0
 EBUILD meson-9999.ebuild 3227 BLAKE2B 8c8e99032af1d188ca7a8a227c992a4f53676523bcbdb5d7a0b44e254f897f6c2ed597bc6bd8472ddcf67f27e0d9117129fe93ebb452b80603dddf2d1664023e SHA512 a483a7433c22951f9da4d82c13eaff36f94b3772324641483129a4d7a138438382d6b349079808579d4fee22d59631f00a20759a8ac01f73a506c73f7e077218
 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5
diff --git a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
new file mode 100644
index 000000000000..394b1bbb7c1b
--- /dev/null
+++ b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
@@ -0,0 +1,31 @@
+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-util/meson/meson-1.3.0.ebuild b/dev-util/meson/meson-1.3.0-r1.ebuild
index 429bfd5ba7d3..1621828da199 100644
--- a/dev-util/meson/meson-1.3.0.ebuild
+++ b/dev-util/meson/meson-1.3.0-r1.ebuild
@@ -54,6 +54,9 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+
+	# backport fix for broken configure_file()
+	"${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch
 )
 
 python_prepare_all() {