gentoo auto-resync : 06:04:2025 - 01:34:40

3 files changed, 22 insertions, 18 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bd975e3f159d..6ad1b08edd6d 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
-AUX fish-4.0.1-use-cargo-eclass-for-build.patch 1694 BLAKE2B be084c0de6f80ce36106e054a70af79488c0fc048ef646a49ae0c3a45a6d900e25deabd96a23b69e946962ffa048c64f86a2924cfb08956dd6c067d1478bcea7 SHA512 8f50fae143bc6038823fab293bcefcffe3c305bdf9b86de9eeabe2e51a89210165382ee93678f2b2ea1486fa31846d1b44f40bd0c0b0bcfc72e97d27207c9dd9
-AUX fish-9999-use-cargo-eclass-for-build.patch 1699 BLAKE2B f69a00e13858802fa07d2d7d28cf1ae68d1c5da8a3b2329482ed7711380b9d329837cecb66263d496075fc47dfb40e651121b3a01d0fe00b51b1cf0cd4ef380b SHA512 0da6b9e0f3980ef999f355459e2084ceafe290333dbfd7a3964b1cfbbcf9ada0f958f60ff8691b41ae276be11fcd4308354795ad13439699a1b418e354d39d83
+AUX fish-4.0.1-use-cargo-eclass-for-build.patch 1791 BLAKE2B 1a9a2e438e09a9eefb3ba74223259ccc6c8da4e2cd6981f5ce5b61139f52166887cc4ffdb6116749d0dfa51a657d9e22fbefca061b6e6e15872a84dae3a7515d SHA512 2cc0e4f0fa95421afe31cd8f1ef53f780086d7ee8c9df16075bc812af845d912f1a9df9a893bc13aa475c01ab1345ad72fc16936ea0d22afa20d684877fda969
+AUX fish-9999-use-cargo-eclass-for-build.patch 1751 BLAKE2B d024842a2fd0acb143684db7024eacdd57d6ba4c0d84ac89e61ad8cbae309a8a44c44dcce7f89c98ee693c160401d85fa1cda469a3ea2237550954916416515b SHA512 67def7939841ec5219056c375b98bc381d67d6de5fe13303beb2024e8c13a60b3f6f56cbc6a6dde22be5edcd0faa4faac06d9533f1e3782bb9ca58853187dc8a
 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a SHA512 f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe
 DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d SHA512 559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c
 DIST fish-4.0.1.tar.xz 3049856 BLAKE2B d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639 SHA512 ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565
diff --git a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
index 3f2bf9c6ec40..0091d08fed86 100644
--- a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
+++ b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch
@@ -1,12 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 496226e89..cb032d6d5 100644
+index 496226e89..69bdf037d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -51,17 +51,6 @@ function(CREATE_TARGET target)
-   add_custom_target(
+@@ -52,18 +52,7 @@ function(CREATE_TARGET target)
      ${target} ALL
      COMMAND
--      "${CMAKE_COMMAND}" -E
+       "${CMAKE_COMMAND}" -E
 -        env ${VARS_FOR_CARGO}
 -          ${Rust_CARGO}
 -            build --bin ${target}
@@ -17,9 +16,12 @@ index 496226e89..cb032d6d5 100644
 -            ${CARGO_FLAGS}
 -            ${FEATURES_ARG}
 -      &&
-       "${CMAKE_COMMAND}" -E
-         copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
+-      "${CMAKE_COMMAND}" -E
+-        copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
++        copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+     USES_TERMINAL
+   )
 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
 index 40887be45..fa0f7ab6f 100644
 --- a/cmake/Rust.cmake
diff --git a/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch b/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch
index f20510a54bd8..964c7435d4ca 100644
--- a/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch
+++ b/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch
@@ -1,12 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0510cd2d7..c49f80d69 100644
+index 0510cd2d7..84fa35e2e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,17 +41,6 @@ function(CREATE_TARGET target)
-   add_custom_target(
+@@ -42,18 +42,7 @@ function(CREATE_TARGET target)
      ${target} ALL
      COMMAND
--      "${CMAKE_COMMAND}" -E
+       "${CMAKE_COMMAND}" -E
 -        env ${VARS_FOR_CARGO}
 -          ${Rust_CARGO}
 -            build --bin ${target}
@@ -17,23 +16,26 @@ index 0510cd2d7..c49f80d69 100644
 -            ${CARGO_FLAGS}
 -            ${FEATURES_ARG}
 -      &&
-       "${CMAKE_COMMAND}" -E
-         copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
+-      "${CMAKE_COMMAND}" -E
+-        copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
++        copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}"
      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+     USES_TERMINAL
+   )
 diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index c5bb1b1b3..618b47183 100644
+index 9cdd01c30..5c554dd2d 100644
 --- a/cmake/Rust.cmake
 +++ b/cmake/Rust.cmake
-@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off)
+@@ -1,7 +1,7 @@
  include(FindRust)
- find_package(Rust 1.70 REQUIRED)
+ find_package(Rust REQUIRED)
  
 -set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
 +set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
  
  if(DEFINED ASAN)
      list(APPEND CARGO_FLAGS "-Z" "build-std")
-@@ -22,8 +22,8 @@ else()
+@@ -18,8 +18,8 @@ else()
      set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
  endif()