commit: c41b4152dd4b97796d2693507e974edd19aeb1dc Author: idealseal <realidealseal <AT> protonmail <DOT> com> AuthorDate: Sun Sep 28 15:30:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 00:44:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41b4152
app-shells/fish: drop 4.0.0-r1 Signed-off-by: idealseal <realidealseal <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43973 Signed-off-by: Sam James <sam <AT> gentoo.org> app-shells/fish/Manifest | 2 - app-shells/fish/fish-4.0.0-r1.ebuild | 165 ----------------------------------- 2 files changed, 167 deletions(-) diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index ce0e86b00bec..b0405a467e81 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,11 +1,9 @@ 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 DIST fish-4.0.2.tar.xz 3055064 BLAKE2B 5332cba0f1941950701106680110965154d34dcdd786e07967481516012b6272ac40eeee1f54aaa0bd4e78a2fb5c9c7087a9ddc8f4c05a8c9aa3a367949536ae SHA512 9b95c58884fe139a05043f8bed8d93825237327be3384f4310cbf43f4f1996dbad66eb9ba39b36741f3769e17df46166f1b872a59b2375dbc50aaec536b73c96 DIST fish-4.0.6.tar.xz 3057300 BLAKE2B f422ad91a5cdeb0533a2f379694b10f64ab73463276e7bf05046b8aba5df3c5217963cac4fc742575e616c004f5dba5ff580cd1ea9d9a89d788ec5ebc8ea70c9 SHA512 b8587644e8e73fb3c8d2d8424283c4753d86f06102bd3963a1c05dc523a8c7318a4dd9e2d22c897023bb515ec72f96071874bfe4cb0a8f203879924c35e36713 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722 SHA512 64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd SHA512 01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c -DIST fish-shell-4.0.0-crates.tar.xz 7418464 BLAKE2B 943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245 SHA512 d79489c1a997ddd2736c17848a8663bd199a08e78c176dddd4b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245 SHA512 d79489c1a997ddd2736c17848a8663bd199a08e78c176dddd4b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c DIST fish-shell-4.0.2-crates.tar.xz 7418464 BLAKE2B 943f28ef8b30ff54ad4d8a7746243afcab5359c0b1be849f64bd2dbff39091648485a486294f0c40198f65323683e1cf0e467d0c35ddd782723fd379ae02c245 SHA512 d79489c1a997ddd2736c17848a8663bd199a08e78c176dddd4b7440253138bf431dc71a407c1bcc90bbfb052dbf4b74d4ae44da9c5c9e1377a7bd6485718752c DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5 SHA512 c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455 diff --git a/app-shells/fish/fish-4.0.0-r1.ebuild b/app-shells/fish/fish-4.0.0-r1.ebuild deleted file mode 100644 index cc3146978ee5..000000000000 --- a/app-shells/fish/fish-4.0.0-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES="" - -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%' -) - -PYTHON_COMPAT=( python3_{11..13} ) - -inherit cargo cmake python-any-r1 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 ~amd64-linux ~x86-linux ~ppc-macos ~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+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB" -SLOT="0" -IUSE="+doc nls split-usr test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - nls? ( sys-devel/gettext ) - test? ( - ${PYTHON_DEPS} - dev-tcltk/expect - $(python_gen_any_dep ' - dev-python/pexpect[${PYTHON_USEDEP}] - ') - ) -" -# we don't need shpinx dep for release tarballs -[[ ${PV} == 9999 ]] && BDEPEND+=" doc? ( dev-python/sphinx )" - -QA_FLAGS_IGNORED="**bin/fish*" - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup - rust_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - cargo_src_unpack - fi -} - -src_prepare() { - # workaround for https://github.com/fish-shell/fish-shell/issues/4883 - if use split-usr; then - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ - cmake/Tests.cmake || die - fi - - # remove the build targets from the default build set so they are not wanted - # if cmake_src_install is called - sed -i \ - -e ' - /function(CREATE_TARGET target)/,/endfunction(CREATE_TARGET)/ { - s/${target} ALL/${target}/ - }' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # installing into /bin breaks tests on merged usr systems. - # sbin -> bin symlink confuses tests. - # so on split-usr we install to /bin. - # on merge-usr we set sbindir to bin. - $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \ - "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin") - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DINSTALL_DOCS="$(usex doc)" - -DWITH_GETTEXT="$(usex nls)" - ) - # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE - if [[ ${PV} == 9999 ]]; then - mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) - else - mycmakeargs+=( -DBUILD_DOCS=OFF ) - fi - 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 DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - # Bug: https://bugs.gentoo.org/950699 - local -x SYSCONFDIR="${EPREFIX}/etc" - local -x CMAKE_WITH_GETTEXT - CMAKE_WITH_GETTEXT="$(usex nls 1 0)" - cargo_src_compile - - for target in fish fish_indent fish_key_reader; do - cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die - done - cmake_src_compile -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - # tests will create temporary files - local -x TMPDIR="${T}" - - # some tests are fragile, sanitize environment - local -x COLUMNS=80 - local -x LINES=24 - - # very fragile, depends on terminal, size, tmux, screen and timing - # no die is intentional, for repeated test runs - if [[ ${PV} != 9999 ]]; then - rm -v tests/pexpects/terminal.py || : - fi - - # TODO: fix tests & submit upstream - # tests are confused by usr/sbin -> bin symlink, no die is intentional for repeated test runs - use split-usr || rm -v tests/checks/{redirect,type}.fish || : - - # tests are invoked through the test target - cargo_env cmake_build test -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_pkg_postinst -}
