gentoo auto-resync : 17:01:2024 - 08:06:37

3 files changed, 1 insertions, 29 deletions

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 2f9c69d3d553..2c8de2ead6ff 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -11,7 +11,6 @@ AUX 1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch 4822 B
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 AUX meson-1.2.1-llvm-17.patch 1658 BLAKE2B d111537d4b9befbb848a7da9ffc72f5cebf8caa80f2ab95f5dc3caa30481f3f055dd415e101438cb2f2b4ca8650b3c32a99dfde7029096e05d3cf9bb9ddc1828 SHA512 bc6b2bc1d60343502bf43beb655642bde3d04c10b7c068dba4bae1acec09e7907a9c09ceeacd2e82b35434c2e4f6090cc7df96130650787d4057a46d58b24ea3
 AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08
-AUX meson-1.3.1-xtools-support.patch 1174 BLAKE2B 317f723447df25cc4b9607e1ba92e1f8c1296c6c7ed7539c0b8b43d71fefa784d292786d4e4df19d0aef395eff92a72609c10555abb7b172eda7bb9fea5da685 SHA512 e13216c4fda26feae64437997b5939dab21d7d2b24bf6450657cbae4361ec50a25edf4c9e30810ae8f036c03533481b77499bc3a34727ac55592c073c7099327
 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.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
@@ -32,6 +31,6 @@ EBUILD meson-1.2.2.ebuild 3293 BLAKE2B 2e4f4bb4e7281e0af6b93874dfe05e2536d41e00f
 EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc
 EBUILD meson-1.3.0-r1.ebuild 3410 BLAKE2B 76f565c4ecf7f1b08e3447133c87221da251362d17152e5e7151c69e33057064d9998a181a9b10c0576d2caa744e62295b41a37a27eaa4e3ebca6aa10b273a59 SHA512 15ae4d826750895062d0986130612e993b8ce4a64d7ef154e1aae458b09a7985bc5f52d0319223b4db6b8995a8cff713f3a152c5d7785e0fddbc359c355f8d1b
 EBUILD meson-1.3.0-r2.ebuild 3565 BLAKE2B 45aebd9f7f4978385d339588d5177418e3fc6e77878b3b5f095e95d30b0b237e5481f94225c651043888ab4af27510315de5f747eec45566e9b018dd5f2e9c22 SHA512 89646f67dbc7182a5808664125bc6d370b280f298fe3359a8837ebda3320b2e244adfbe39742c530da0a342f74aed5d3ba1d9b476440f393fd09a4af2babff85
-EBUILD meson-1.3.1.ebuild 3636 BLAKE2B 6f2fe1c9eb23bd9f2bcddffc0093214f926e21b830abc45711f0e6c995d737105975a944ebf18e1b68be5073eab9721d02d0dcddd756910b5d7b000f116e494b SHA512 416fc8b13ed941a9c2a4ae5d279f01fb093fe25726585b2784a700ca5a60c07511899d42f4ede437e6f0c470a6f810bbc4b01bc7755f4fd3b4691a5cd48016e3
+EBUILD meson-1.3.1.ebuild 3588 BLAKE2B 245a20c4f1a296c6038c23485758abc00ddd3b225a4c964043a2f75ed76bbe2a8dfb7aed20b76c2324a01b9a3d3b386c4592e259268ab8838598cb427a9fcfc9 SHA512 84dcaf773703132c1e68a824aa9749634ea9ca5b3585c0fc467b8881583ef0fdf5470e592adb4d238080bd18da55a9489263fb142ba4aab245e8ca19219c7d8e
 EBUILD meson-9999.ebuild 3235 BLAKE2B a70383fb27538f5539c16d0ca07f1cff24def033d6bde05053657c8c5217798ce65c3e15f599aa15f54f173b7ddcceefc4debb5af4ab53284cf75900a1e97152 SHA512 6d6afb4820807ef0d852ea7d7284ca574d089767917a4f1157726505e98aad1e4c485701023bbb99d7bec174dda802ccb16375237d5e05c874b59f058eceda43
 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5
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 6e9e670ba8da..000000000000
--- a/dev-build/meson/files/meson-1.3.1-xtools-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/dev-build/meson/meson-1.3.1.ebuild b/dev-build/meson/meson-1.3.1.ebuild
index 0f026f75c31e..2498ea56a83a 100644
--- a/dev-build/meson/meson-1.3.1.ebuild
+++ b/dev-build/meson/meson-1.3.1.ebuild
@@ -54,7 +54,6 @@ 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