From 43c2a85d4e20318dd3d35872e348707900870067 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 6 May 2024 00:00:52 +0100 Subject: gentoo auto-resync : 06:05:2024 - 00:00:51 --- app-shells/Manifest.gz | Bin 10639 -> 10643 bytes app-shells/fish/Manifest | 4 +- app-shells/fish/fish-3.7.0.ebuild | 121 -------------------------------------- app-shells/fish/fish-3.7.1.ebuild | 121 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 app-shells/fish/fish-3.7.0.ebuild create mode 100644 app-shells/fish/fish-3.7.1.ebuild (limited to 'app-shells') diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index 3ccd4c390a3d..90b6404938c3 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index a5d9fcdb8fb7..2ae803a49033 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,9 +1,9 @@ AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a SHA512 ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597 -DIST fish-3.7.0.tar.xz 2961912 BLAKE2B fd2c663a21be7a3aad362c69eff94f1cd9947075953deae74de64ef96b1d6f3874efa6389806f0eebc5789068acefb1218c6baaa1059a14ed13b5c33e6bc03e3 SHA512 bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34 +DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a SHA512 f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe EBUILD fish-3.4.0.ebuild 2386 BLAKE2B 80a635f151c8c5509e071c4dbc1ac4d64fbf6fa3cf37abe7894fe696a18b101bb76d57b0b1b773a5c9c77b3ffe7521330464121deb03a36b3cd037cc787f7ca3 SHA512 489f6bf503e1798a7687e0abe12e7a4d7ae10969e3004ac25a239145be72ef3a9aa7fafab0ce1fc6495360688967f1f0ac58f409192b6cf3d7b073b59f25ec41 EBUILD fish-3.6.1.ebuild 3203 BLAKE2B bda5a19375faa528cd7abdd1b55182872200f45b3b26a6d3a4f88df246695d218ee86663efe5387163539ca37f52b6a9cc945c98194a00a0cfaabed8c10d2117 SHA512 fca7130012ae290c7dd74d006ff4fcb4143ac9ae091ace63b4e65b5a515358a1ffd7647ac82a98b5dbf6706f49f70bace472fdb9e8f46286443ab81e6cd62d3c -EBUILD fish-3.7.0.ebuild 3210 BLAKE2B 364facda034ffbceab345e7cb5563d01d3284ccc5c5583517e9411c0da9d5470d61d7f29498e6778d1d15da3eb6c83f033c32f87c5e8df1eac2ca0988d4dcd57 SHA512 7f8d78c801a78e9752e0083de4310ef71c5ef6782b5b90f078b15880c4f39ea62b019b69c72bed43505c6b55d4aa28eb86429de166716b34e52b9c1f8f1193ef +EBUILD fish-3.7.1.ebuild 3210 BLAKE2B e7633c1d3144616dff742f54ef434d0d7ceabf8710464ed6673e1da10b2d144a1a1734a82e2d13b552507d317bca2fbb6ebfa9085626483f1ca2744cec97743a SHA512 7f656be8ebecdd4d0071046996073fe7ae6b4ad72530afba7f7d1fdd02ff4935566d8e4eb5c76aa93598c66fcad0046453cd22937d2cb84efa587be3ca48bce4 EBUILD fish-9999.ebuild 3209 BLAKE2B 687f6b216e0ebfc5f128bb71dd4b68215290b10bf430e471533b55d5230fa46db429bc239de5c4769d1f5c6a51d7fb8a00087c8b9931978876456ea8390e1705 SHA512 46c7c8d2853645f9d5317a3548ff01e26a16c707bb28c45601cad2605f1ce62e45f3ca9ee4e66a920218de81772cc07b05375015f8bcf61a09b184b0a07e7e6b MISC metadata.xml 544 BLAKE2B 1d712f1e36fa1329f8d3cf766a7ed19f210356bb229a66e17f0fc640fd6969f60c56dff1003995ddda3d2f1b28da914d9748bdb84d101a4cdd4a089fd07f58ed SHA512 686d3bebc8b840abc98464ef07e9bb8e5456fef99b55a5c6688c99453173ef941f7ffb67d0f8de4273ff0f7d632b8843783939d7b078bf84d36cf8a31cff5df6 diff --git a/app-shells/fish/fish-3.7.0.ebuild b/app-shells/fish/fish-3.7.0.ebuild deleted file mode 100644 index 00c62c4a20d5..000000000000 --- a/app-shells/fish/fish-3.7.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit 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/${PN}-shell/${PN}-shell.git" -else - SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB" -SLOT="0" -IUSE="+doc nls split-usr test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libpcre2-10.32:=[pcre32] - sys-apps/coreutils - sys-libs/ncurses:=[unicode(+)] -" - -DEPEND="${RDEPEND}" -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 ]] && DEPEND+=" doc? ( dev-python/sphinx )" - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" -} - -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 - 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" - -DCURSES_NEED_NCURSES=ON - -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 - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - # 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 - - # zfs completion test will fail with "Permission denied the ZFS utilities must be run as root." - mv "${S}"/share/completions/zfs.{fish,disabled} || die - - # 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 || : - - cmake_build test - - # now restore zfs completions - mv "${S}"/share/completions/zfs.{disabled,fish} || die -} - -pkg_postinst() { - readme.gentoo_print_elog - xdg_pkg_postinst -} diff --git a/app-shells/fish/fish-3.7.1.ebuild b/app-shells/fish/fish-3.7.1.ebuild new file mode 100644 index 000000000000..3d7c6dff3fa3 --- /dev/null +++ b/app-shells/fish/fish-3.7.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit 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/${PN}-shell/${PN}-shell.git" +else + SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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" +SLOT="0" +IUSE="+doc nls split-usr test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libpcre2-10.32:=[pcre32] + sys-apps/coreutils + sys-libs/ncurses:=[unicode(+)] +" + +DEPEND="${RDEPEND}" +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 ]] && DEPEND+=" doc? ( dev-python/sphinx )" + +python_check_deps() { + use test || return 0 + python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" +} + +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 + 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" + -DCURSES_NEED_NCURSES=ON + -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 + cmake_src_configure +} + +src_install() { + cmake_src_install + keepdir /usr/share/fish/vendor_{completions,conf,functions}.d + readme.gentoo_create_doc +} + +src_test() { + # 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 + + # zfs completion test will fail with "Permission denied the ZFS utilities must be run as root." + mv "${S}"/share/completions/zfs.{fish,disabled} || die + + # 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 || : + + cmake_build test + + # now restore zfs completions + mv "${S}"/share/completions/zfs.{disabled,fish} || die +} + +pkg_postinst() { + readme.gentoo_print_elog + xdg_pkg_postinst +} -- cgit v1.2.3