commit: 49cc7f743ba3f38b7f35cb1024b3a6d2324e9d48 Author: idealseal <realidealseal <AT> protonmail <DOT> com> AuthorDate: Tue Feb 17 19:15:04 2026 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Tue Feb 17 19:59:29 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cc7f74
app-shells/fish: add 4.5.0 Add build workaround to re-enable loading file from vendor_*.d directories. Bug: https://bugs.gentoo.org/970077 Signed-off-by: idealseal <realidealseal <AT> protonmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/82 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> app-shells/fish/Manifest | 2 + app-shells/fish/fish-4.5.0.ebuild | 111 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 059a95a818b1..dae56a798e15 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,5 +1,7 @@ DIST fish-4.3.3.tar.xz 2545388 BLAKE2B 8d8ae67c4f97ef41d94ebcd728f9882e682eece6d21461eef48e71b293ce22226fd6d2909d7e4aea4fb168b2fbb8c4b66660a30b09a18e8844711003f1d22d78 SHA512 ab20c5d6c052319a1bb6ae5d0af0e4a4563528348ea61728ee812f31ded7f379e1df3687be47ee71af0b79ab46a3febe7f09f8a5312c9a06cb03269447513e8b DIST fish-4.4.0.tar.xz 2570412 BLAKE2B 93b74dc8c17c8d1d437b2a170715e7963d29a78781520fbb7181bfbfc158c1c1f1a245f15621cb326d4f81dc097084cd54bb14c890fee7b7ab9022a5a41f98d1 SHA512 7d5f3f43e1478ffbf46119ad535b9ece57450751aea059ce520828733733ecc8dbe6b9581703bc3150b015eb2e3b910e28284bb8b25ee05fcad24e477fd99a93 +DIST fish-4.5.0.tar.xz 2567056 BLAKE2B 1ac4bb151d8513e7f772e4be239d7c634ae5e002761f8959158f7ab43a5483b70741489c43eb9d8faf513a3e3ec085571e44c7c2b860555d0b42b21f6b2d8859 SHA512 c1e4df76a9dc77a9bcf66872f79def5473f152e013281dadc41564dbcb528d0c1c80d4af93e6d7ff524f49f72cb500173d666763811a11adab5fc632fa1fcde8 DIST fish-shell-4.3.3-crates.tar.xz 6696892 BLAKE2B 98f6aac950b09ad069b74534b066ff0c31e6bbc1af34012833c5b5bf2e2aabbcbef3fa183afa7a569d23dbd21df5e4d028d8c98d548ad9a71686ba77ca597e0b SHA512 9545ce539d38d47adf848aa153e1dfbe16008743a552b3bf08cbda924fe65907142dbba71508e302d9e5ac5dcf6e87a015da175d95afdcac19fb1fc9ecbff4ad DIST fish-shell-4.4.0-crates.tar.xz 7073424 BLAKE2B 256672c8061cdb257abd9e9371476237cce12d3f3b7af1bdb133eec27a5b507611d512723eccaacb8579646002eb56e8924e83abf3b6bc267f6d1a1919d16199 SHA512 842925fac09a5ae741ff1a809776bfb700f5de303d7bbd3fb3b62bf685218e53ba7fc10d61893c78f98ba4bb7494e7431a31aeffe8b201862dabb3f077329838 +DIST fish-shell-4.5.0-crates.tar.xz 6870016 BLAKE2B 9d2d3f7840f4abb80e632cb565ec00c5af0829cec19eb5ac54b9e988e71f9bb8a17f644a69d6e78a61760dd9e5e880b2b0388c701e57bf99bbdd75a988a440c9 SHA512 7710995bc6e872fce68b0a813bd743f4d208343e7a30430492684e2ae775d6541940742523defacae6fd56d70e831ae482d22e82ee879fd02e91e0936566ae58 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 BLAKE2B 533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68 SHA512 9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da8152178888bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad diff --git a/app-shells/fish/fish-4.5.0.ebuild b/app-shells/fish/fish-4.5.0.ebuild new file mode 100644 index 000000000000..f0ed4963569d --- /dev/null +++ b/app-shells/fish/fish-4.5.0.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES="" +RUST_MIN_VER="1.85.0" + +if [[ ${PV} != 9999 ]]; then + 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%' + ) +fi + +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.4.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_MESSAGE_LOCALIZATION="$(usex nls 1 0)" + ) + + cargo_src_configure --no-default-features + 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)" + + # HACK: Let the rust build script know we are using CMake. + # Bug: https://bugs.gentoo.org/970077 + local -x FISH_CMAKE_BINARY_DIR="${BUILD_DIR}" + + 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 +}
