diff options
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/Manifest.gz | bin | 8793 -> 8790 bytes | |||
-rw-r--r-- | app-shells/fish/Manifest | 10 | ||||
-rw-r--r-- | app-shells/fish/fish-3.1.2-r1.ebuild | 71 | ||||
-rw-r--r-- | app-shells/fish/fish-3.2.1-r1.ebuild | 89 | ||||
-rw-r--r-- | app-shells/fish/fish-3.2.2-r1.ebuild | 89 | ||||
-rw-r--r-- | app-shells/fish/fish-3.3.1-r1.ebuild | 12 | ||||
-rw-r--r-- | app-shells/fish/fish-9999.ebuild | 21 |
7 files changed, 27 insertions, 265 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex f72544e09c6b..497f5ee8a04e 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index d2953d2e57ef..708a57735c4b 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -2,13 +2,7 @@ AUX 3.3.1-don-t-override-linker.patch 1891 BLAKE2B 7af3726bd0df67feb8f36c308a6a3 AUX 3.3.1-drop-some-tests.patch 1206 BLAKE2B ee550c04d7f6adb179bf5473b2cbd4e54bfbcf6015480202a85440945ea2d408a6615430f14d6b2831abc64968818b9903318e743ce41e3bb06bc7825403162f SHA512 da39324a5616c29bdbe126292a2e5bd4b680cc584b3d6d4819a5209e6dae32ba3da177c0374539e561f546596f590529be9a13c1b0d2918c838247ba32264dce AUX 3.3.1-sbin-path-sh-test.patch 808 BLAKE2B 8ee354287c9f5319edf43217d54f4ca564e607c6c06e3dff04033a9dc2c87a7cf0bb688c49561acd69cf22b2ee59493468bc55d070b4565fc83a9cf7e917308d SHA512 3446b51ae833698dab9b7c163059947f122f4c72c49a8cad8f160a1a912bf57ac41ef4ca706e81bc6563f53f0f4c608b78da3cc66a040697a857554cde65cf5a AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693 -DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc -DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660 -EBUILD fish-3.1.2-r1.ebuild 1563 BLAKE2B bd2839a8e63f93b61d78b0f1d61996d30ab4e3903f51a0973f142af5685ea9ccd721d848a96faba760d01fd6447b7aab0ca63be6f63539975b1120d60f0fb147 SHA512 5bd0c9df88c49e3f0969e4afa0ccb5da50b9c35df2bac49b7086e3bc9c399d322110e99aac9e985ebab4a31cd99ba2138c03f8e35c5ce63c241762ff0d1ba845 -EBUILD fish-3.2.1-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95 -EBUILD fish-3.2.2-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95 -EBUILD fish-3.3.1-r1.ebuild 2406 BLAKE2B 5e4850a08702bae48e99d6b4fcad9e0fc30cc003e5e6572b0b6e1473a9dd93eb6add45a5694f52ea500aa7900168e7f4f1a1e5cebea998215955b9d2c4791e5e SHA512 46b1a856a1c008023bcb6dc6b7e0b9f8cfb2332adbc37e651bd17fda6e82289c86489b4cb24b41f8f27ed6b2f15977791cf41af741d4defeed297910a4bf36e1 -EBUILD fish-9999.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95 +EBUILD fish-3.3.1-r1.ebuild 2457 BLAKE2B 5a530482f82025a5488895402b2f7612f29033db93c1f9521396a2941fa40250f512e12a40cfde123a27b9b9cbb4a6b4b1e82f981e7ae9deabf206793e0a8a15 SHA512 b0b5718ff2c16ebd4ac66446419c6efc28da139abbd229b625d888dc6c32d00e834d3a1052433302aa659c1106d1f4a5026e071f285f91814d9dc8a1daba8d04 +EBUILD fish-9999.ebuild 2348 BLAKE2B af2401d4a21c80523902e9e4e8e26ecc48edda89791aecd4235b1891ff01b32db6e28768b57b7e8d7a19447ea8fc36382ab7d0ccfd0f4b008e02b244eff8e15e SHA512 ab8b454ca0af953bd6769ea05c5e7b9c2a256a6ec869a16cdaf318d3c229290d6ae5497d22bcb88a650f2aa7ef7cee89cf9a53f37e221b976d537d05bab7ff0a MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1 diff --git a/app-shells/fish/fish-3.1.2-r1.ebuild b/app-shells/fish/fish-3.1.2-r1.ebuild deleted file mode 100644 index 177c7aa2ce46..000000000000 --- a/app-shells/fish/fish-3.1.2-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake readme.gentoo-r1 - -DESCRIPTION="Friendly Interactive SHell" -HOMEPAGE="http://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.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="doc nls test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libpcre2-10.32:=[pcre32] - sys-libs/ncurses:=[unicode(+)] -" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext ) - test? ( dev-tcltk/expect ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # workaround for https://github.com/fish-shell/fish-shell/issues/4883 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ - cmake/Tests.cmake || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCURSES_NEED_NCURSES=ON - -DBUILD_DOCS="$(usex doc)" - -DWITH_GETTEXT="$(usex nls)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - cmake_build -j1 test -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/app-shells/fish/fish-3.2.1-r1.ebuild b/app-shells/fish/fish-3.2.1-r1.ebuild deleted file mode 100644 index abb51e209302..000000000000 --- a/app-shells/fish/fish-3.2.1-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-any-r1 readme.gentoo-r1 - -DESCRIPTION="Friendly Interactive SHell" -HOMEPAGE="http://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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+doc nls 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 - has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]" -} - -src_prepare() { - # workaround for https://github.com/fish-shell/fish-shell/issues/4883 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ - cmake/Tests.cmake || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/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 - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - cmake_build -j1 test -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/app-shells/fish/fish-3.2.2-r1.ebuild b/app-shells/fish/fish-3.2.2-r1.ebuild deleted file mode 100644 index abb51e209302..000000000000 --- a/app-shells/fish/fish-3.2.2-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-any-r1 readme.gentoo-r1 - -DESCRIPTION="Friendly Interactive SHell" -HOMEPAGE="http://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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+doc nls 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 - has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]" -} - -src_prepare() { - # workaround for https://github.com/fish-shell/fish-shell/issues/4883 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ - cmake/Tests.cmake || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/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 - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - cmake_build -j1 test -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild index f59329e2387d..184f01e1dcab 100644 --- a/app-shells/fish/fish-3.3.1-r1.ebuild +++ b/app-shells/fish/fish-3.3.1-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then 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 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" fi LICENSE="GPL-2" @@ -76,7 +76,11 @@ src_configure() { -DWITH_GETTEXT="$(usex nls)" ) # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + if [[ ${PV} == 9999 ]]; then + mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + else + mycmakeargs+=( -DBUILD_DOCS=OFF ) + fi cmake_src_configure } @@ -89,10 +93,10 @@ src_install() { src_test() { # some tests are fragile, sanitize environment local -x COLUMNS=80 - local -X LINES=24 + local -x LINES=24 # very fragile, depends on terminal, size, tmux, screen and timing - rm -v tests/pexpects/terminal.py || die + rm -v tests/pexpects/terminal.py || die cmake_build test } diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index abb51e209302..c35b05dc2100 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-any-r1 readme.gentoo-r1 @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" fi LICENSE="GPL-2" @@ -70,7 +70,11 @@ src_configure() { -DWITH_GETTEXT="$(usex nls)" ) # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + if [[ ${PV} == 9999 ]]; then + mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + else + mycmakeargs+=( -DBUILD_DOCS=OFF ) + fi cmake_src_configure } @@ -81,7 +85,16 @@ src_install() { } src_test() { - cmake_build -j1 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 + if [[ ${PV} != 9999 ]]; then + rm -v tests/pexpects/terminal.py || die + fi + + cmake_build test } pkg_postinst() { |