commit: 42a95fc0df1d6de01c807d945dd22f87332e451b Author: idealseal <realidealseal <AT> protonmail <DOT> com> AuthorDate: Sun Dec 28 10:54:59 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 30 22:19:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a95fc0
app-shells/fish: add 4.3.0 Signed-off-by: idealseal <realidealseal <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45186 Closes: https://github.com/gentoo/gentoo/pull/45186 Signed-off-by: Sam James <sam <AT> gentoo.org> app-shells/fish/Manifest | 2 + .../fish-4.3.0-use-cargo-eclass-for-build.patch | 46 +++++++++ app-shells/fish/fish-4.3.0.ebuild | 107 +++++++++++++++++++++ 3 files changed, 155 insertions(+) diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 7d0de4b5fd8c..b0b2414b9d26 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -6,6 +6,7 @@ DIST fish-4.1.1.tar.xz 2966548 BLAKE2B c6dc29a272be382f5f8804723e684e2bedc4a4ff4 DIST fish-4.1.2.tar.xz 2968176 BLAKE2B dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69 SHA512 a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf DIST fish-4.2.0.tar.xz 3010224 BLAKE2B 4de4f9d0b35aea008fb032ced8ed5ad0283d8ccdcc794c5b3bbc1bd101f135982a0967cfc104da0ed1da8f778715b4ad7de3a23d85b572c258ffccc299fbaa38 SHA512 9214b6c252e90a7574b79cc101206d6bb4d0999457b827f293410d69341f4f2e9f1ad44eb498c57c0f83fd17e5adb7b6ea716e89441ab93b444e35505c2beb2a DIST fish-4.2.1.tar.xz 3012808 BLAKE2B 37f6552d8c5874c841976f5a8f7c2751590913831595bfc651e409a29da60a0aca905dd69e72359d2ceebb53d554a9a5f92d073e478470844f8920a31f110f01 SHA512 7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e +DIST fish-4.3.0.tar.xz 2533776 BLAKE2B cfd8cbbc702e61308c7dab1bad2a69e8fc752bc409e8d365529e7b05309f861998cf4504eea938bc217b592d5e0ed453732606de2ee513671a779a6eeb2ff52a SHA512 ffe931663debc6b344fb764682ec9ce1b1f89a56ebf12c5bf298bb113787844635bcaf8c0c52d372ef220435b7ac0b3fc214c1031b942aded7572c6e8d022c85 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5 SHA512 c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5 SHA512 c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18 SHA512 1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438 @@ -13,4 +14,5 @@ DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f96 DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18 SHA512 1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438 DIST fish-shell-4.2.0-crates.tar.xz 6407044 BLAKE2B aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9 SHA512 affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81 DIST fish-shell-4.2.1-crates.tar.xz 6407044 BLAKE2B aa88ef25cb25ab5b3fd8a5b9faa4e9e91572fe8dfcb1bbb749404bd0cbdaaf36caab1b27e3d874e788b980bd213fc56bf8b4916f82d9a239aa1c9ec7c68985a9 SHA512 affe98ddba9a582f23289149464d50897d54bd1efe931b67721f05ade34f35e69bb31f00dcedd1dc025d04025135e17cee185dbad0f028ace140cfe8dacb4a81 +DIST fish-shell-4.3.0-crates.tar.xz 6667516 BLAKE2B 8e44e0b0510a3ea4493c9a6d628fa54d24eefb1e834c96d35fed34e262f4b09e78228d7269cd77587700b1c323407b345f258c49227154082224bd3287e6c09a SHA512 69bb4afe8ca6034339d5f18773b5de25415d785b44a158b5587a0f71a27774741243c4d497d75ce92e9f8a3c9bdef6ed1b5df5f01d7aed752b0a5bcd7097daf8 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 BLAKE2B 533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68 SHA512 9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da8152178888bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad diff --git a/app-shells/fish/files/fish-4.3.0-use-cargo-eclass-for-build.patch b/app-shells/fish/files/fish-4.3.0-use-cargo-eclass-for-build.patch new file mode 100644 index 000000000000..5844e8f66b15 --- /dev/null +++ b/app-shells/fish/files/fish-4.3.0-use-cargo-eclass-for-build.patch @@ -0,0 +1,46 @@ +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-4.3.0.ebuild b/app-shells/fish/fish-4.3.0.ebuild new file mode 100644 index 000000000000..9fabab0739f1 --- /dev/null +++ b/app-shells/fish/fish-4.3.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES="" +RUST_MIN_VER="1.85.0" + +declare -A GIT_CRATES=( + [pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys' + [pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%' +) + +inherit cargo cmake readme.gentoo-r1 xdg + +DESCRIPTION="Friendly Interactive SHell" +HOMEPAGE="https://fishshell.com/"; + +MY_PV="${PV/_beta/b}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git"; +else + SRC_URI=" + https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz + https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz + ${CARGO_CRATE_URIS} + " + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x64-macos" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB" +# Dependent crate licenses +LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-3.0 WTFPL-2 ZLIB" +SLOT="0" +IUSE="+doc nls test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( dev-python/sphinx ) + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.3.0-use-cargo-eclass-for-build.patch" +) + +QA_FLAGS_IGNORED="usr/bin/.*" + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DWITH_DOCS="$(usex doc)" + -DWITH_GETTEXT="$(usex nls 1 0)" + ) + cargo_src_configure --no-default-features \ + --bin fish \ + --bin fish_indent \ + --bin fish_key_reader + cmake_src_configure +} + +src_compile() { + local -x PREFIX="${EPREFIX}/usr" + local -x DATADIR="${EPREFIX}/usr/share" + local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + # Bug: https://bugs.gentoo.org/950699 + local -x SYSCONFDIR="${EPREFIX}/etc" + + local -x FISH_BUILD_DOCS + FISH_BUILD_DOCS="$(usex doc 1 0)" + + cargo_src_compile +} + +src_test() { + local -x CARGO_TERM_COLOR=always + local -x TEST_VERBOSE=1 + # cargo_env cmake_src_compile fish_run_tests + cargo_env cmake_src_test fish_run_tests +} + +src_install() { + cmake_src_install + keepdir /usr/share/fish/vendor_{completions,conf,functions}.d + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + xdg_pkg_postinst +}
