commit: 83d6352eb4e11066396a0627e80ef06f11c454df
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 3 22:13:57 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 3 22:36:44 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d6352e
app-shells/fish: fix duplicate patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../fish-9999-use-cargo-eclass-for-build.patch | 46 ----------------------
app-shells/fish/fish-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 47 deletions(-)
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
deleted file mode 100644
index 5844e8f66b15..000000000000
--- a/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c65b3e422..caf670f0c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,18 +60,7 @@ add_custom_target(
- fish ALL
- COMMAND
- "${CMAKE_COMMAND}" -E
-- env ${VARS_FOR_CARGO}
-- ${Rust_CARGO}
-- build --bin fish
-- $<$<CONFIG:Release>:--release>
-- $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-- --target ${Rust_CARGO_TARGET}
-- --no-default-features
-- --features=${FISH_CARGO_FEATURES}
-- ${CARGO_FLAGS}
-- &&
-- "${CMAKE_COMMAND}" -E
-- copy "${rust_target_dir}/${rust_profile}/fish"
"${CMAKE_CURRENT_BINARY_DIR}"
-+ copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/fish"
"${CMAKE_CURRENT_BINARY_DIR}"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- USES_TERMINAL
- )
-diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
-index d99e621e4..4d6b47f2a 100644
---- a/cmake/Rust.cmake
-+++ b/cmake/Rust.cmake
-@@ -1,7 +1,7 @@
- include(FindRust)
- 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")
-@@ -18,7 +18,7 @@ else()
- set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
- endif()
-
--set(rust_profile
$<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
-+set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
-
- option(WITH_GETTEXT "Build with gettext localization support. Requires
`msgfmt` to work." ON)
- # Enable gettext feature unless explicitly disabled.
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 63e2f1958082..bcfe706395d3 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-use-cargo-eclass-for-build.patch"
+ "${FILESDIR}/${PN}-4.3.0-use-cargo-eclass-for-build.patch"
)
QA_FLAGS_IGNORED="usr/bin/.*"
