From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- app-shells/fish/Manifest | 14 +--- .../fish-2.7.1-fix-printf-o-handling-on-ppc.patch | 12 --- .../fish/files/fix-histfile-test-on-ppc.patch | 31 -------- app-shells/fish/fish-2.7.1.ebuild | 88 --------------------- app-shells/fish/fish-3.0.2.ebuild | 75 ------------------ app-shells/fish/fish-3.1.0.ebuild | 71 ----------------- app-shells/fish/fish-3.1.2.ebuild | 2 +- app-shells/fish/fish-3.2.0.ebuild | 89 ++++++++++++++++++++++ app-shells/fish/fish-9999.ebuild | 9 ++- 9 files changed, 99 insertions(+), 292 deletions(-) delete mode 100644 app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch delete mode 100644 app-shells/fish/files/fix-histfile-test-on-ppc.patch delete mode 100644 app-shells/fish/fish-2.7.1.ebuild delete mode 100644 app-shells/fish/fish-3.0.2.ebuild delete mode 100644 app-shells/fish/fish-3.1.0.ebuild create mode 100644 app-shells/fish/fish-3.2.0.ebuild (limited to 'app-shells/fish') diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index e1340b6006e3..f044435e801d 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,13 +1,7 @@ AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693 -AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969a01c476e026777cdb5b98d367ecf05599f0471da6f79901ebc1f3a672ca78f4c2216d3c1ff121fb0624bf2498be08685f2f6eac1528d20 SHA512 05f859c9d32b0003b489088054828f9ee9aba282ea6d2e6c659e4896e2b731e4cb8c2c524cfe5247784607a7c0bb781f3d918a22d5de69f5d9fceaa3e3c1a38b -AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0 -DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b -DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3 -DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -EBUILD fish-2.7.1.ebuild 2435 BLAKE2B 6a0b8e0a9927cc7a2ec3987f4b0a27772f5a0a37e2583dd65c33cfdd7f574c3e656b262256cfbbf6b570fb0c37d1690fe7e6c17e6a2e11506ff774457a3c1d8e SHA512 e71ea273a360380253fdbdbc0d97c4db727b8903202d862521088ac6dacb515b9f8bd45303c68b1ea7b6535cf7bbc5a58f44b6b1a029ca6f3b059fb210d43179 -EBUILD fish-3.0.2.ebuild 1656 BLAKE2B 0c0592e96be1c6833148587613914500eb50dbdc206b86d17e2316957f8aec3d4a0f6098ba76964529561ea57b94ea54fd939405c945928a0b0f71c7ad947be7 SHA512 31bfa16ae512cd891681576a4a4d1c2ef577ebc7579929fa42320be470cb290286ca0acd1874e31542fa27973932435ca1e3091f49ffaa8ce9922bbe968a392a -EBUILD fish-3.1.0.ebuild 1546 BLAKE2B bf003f5f8a0abea6dd32f608860bf76d0c4fe78e507de8e25fa602405215bdd4d51e7c19590d8bc1aeca646c39f976f789a384e1447bfa3a620714ce8e2daf44 SHA512 638068298c8670722677e13532197c91c5a51219d5a7affa6786f09aece4751c6c9c65bf8c75aafde19d5cbb1cf726e7d5d6d80d8e50f463a3b723a8038c1cea -EBUILD fish-3.1.2.ebuild 1560 BLAKE2B 793e0c7c91bd95af770617917b3d4a2e2dc34af767330b62a0ae93c4c8e1c8247302418277e855db0c233700115ecce94b5b7a4a9d469cb459b4d3ddc6afc511 SHA512 54648ff0f5a21f6e9102f00166c61360b27cf1bb92a31a2f29e5e08a3757bc3f289a404f02b7e3f45c4a7c33cc431836595ba7c5d5a526f64086294d0242c81e -EBUILD fish-9999.ebuild 2044 BLAKE2B 7e8eb5dc75510e4224558a6b7cac44f517bf02d5ea79d8ca65dc10ac871294be4c190760c9f8828c2d4a75047f61184d5dfe5a14e28a20241649aaa6b652ca19 SHA512 db6f2ca3a6757a18cc80fbec437f8362435369274a0d8172d9cd401595f958a8a4057c6301878f7240e4a0048c39cd1b2e034cca45748839f09e45dcbeee0e51 +DIST fish-3.2.0.tar.xz 3403640 BLAKE2B 740e20d428ef67b25352d56e5f2ca5732bbcb8310082dc1ca4f66c173d0380a5ab86328d6c1f8d899844d78bfd9547323a02d2c4caf5e82817ad01260bba3a7e SHA512 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face +EBUILD fish-3.1.2.ebuild 1559 BLAKE2B 6591d08cf4f1a160d5b133436b7e11ac4eabfa506710ad2edd61c3b98894f32265073102acf83dfffffdd4d4af67549240f7e8097cfe74691663ce0ec5d2b4f4 SHA512 b0d4f615573a43b5407262629d40c3f3a60d3007ea53978173b29ac9a996a72a528f538f83f1ce7810948dc606509494e2b92e6ab1c846129aed29d3b7c9d754 +EBUILD fish-3.2.0.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae +EBUILD fish-9999.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97 diff --git a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch deleted file mode 100644 index 4d3d79ae6a53..000000000000 --- a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp -index 8595120d5..24cf9a9e1 100644 ---- a/src/builtin_printf.cpp -+++ b/src/builtin_printf.cpp -@@ -444,6 +444,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc - case L'X': - case L'd': - case L'i': -+ case L'o': - case L'u': { - fmt.append(L"ll"); - break; diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch deleted file mode 100644 index 8b9540ffc610..000000000000 --- a/app-shells/fish/files/fix-histfile-test-on-ppc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001 -From: David Adam -Date: Sat, 5 Jan 2019 15:59:25 +0800 -Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on - 32-bit platforms - -Rather than killing the process with close, read EOF after sending the -"exit" command and wait for OS cleanup (per the expect examples). - -Not cleaning up with wait caused expect to crash on all 32-bit platforms -including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b". - -64-bit platforms were not affected, for reasons that are not clear. ---- - tests/histfile.expect | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/histfile.expect b/tests/histfile.expect -index 81ca11276..7ac056235 100644 ---- a/tests/histfile.expect -+++ b/tests/histfile.expect -@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" { - # ============= - # Start by shutting down the previous shell. - send "exit\r" --close $spawn_id -+expect eof -+wait - - # Set the fish_history env var. - set ::env(fish_history) env diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild deleted file mode 100644 index 8d7a938cb990..000000000000 --- a/app-shells/fish/fish-2.7.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_beta/b}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Friendly Interactive SHell" -HOMEPAGE="http://fishshell.com/" -SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" = *_* ]] || \ -KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="nls test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libpcre2-10.21[pcre32] - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - sys-devel/bc - nls? ( sys-devel/gettext ) - test? ( dev-tcltk/expect ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" - "${FILESDIR}/fix-histfile-test-on-ppc.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - # Set things up for fish to be a default shell. - # It has to be in /bin in case /usr is unavailable. - # Also, all of its utilities have to be in /bin. - econf \ - --bindir="${EPREFIX}"/bin \ - --without-included-pcre2 \ - $(use_with nls gettext) -} - -src_compile() { - emake V=1 -} - -src_install() { - emake DESTDIR="${D}" V=1 install -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - emake -j1 V=1 SHOW_INTERACTIVE_LOG=1 test - else - ewarn "Some tests only work when the package is already installed" - fi -} - -pkg_postinst() { - elog "fish is now installed on your system." - elog "To run fish, type 'fish' in your terminal." - elog - elog "It is advised not to set fish as a default login shell." - elog "see bug #545830 for more details." - elog "Executing fish using ~/.bashrc is an alternative" - elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details" - elog - elog "To set your colors, run 'fish_config'" - elog "To scan your man pages for completions, run 'fish_update_completions'" - elog "To autocomplete command suggestions press Ctrl + F or right arrow key." - elog - elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the" - elog "browser of your choice to get acces to ${PN}'s help system:" - elog " BROWSER=\"/usr/bin/firefox\"" - elog - elog "In order to get lzma and xz support for man-page completion please" - elog "emerge one of the following packages:" - elog " dev-python/backports-lzma" - elog " >=dev-lang/python-3.3" - elog - elog "If you have issues with cut'n'paste in X-terminals, install the" - elog "x11-misc/xsel package." - elog - elog "Have fun!" -} diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild deleted file mode 100644 index 8af6d7593119..000000000000 --- a/app-shells/fish/fish-3.0.2.ebuild +++ /dev/null @@ -1,75 +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.21[pcre32] - sys-devel/bc - sys-libs/ncurses:0=[unicode] -" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext ) - test? ( dev-tcltk/expect ) -" - -PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" ) - -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 - -DINTERNAL_WCWIDTH=OFF - -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.1.0.ebuild b/app-shells/fish/fish-3.1.0.ebuild deleted file mode 100644 index 546da6799869..000000000000 --- a/app-shells/fish/fish-3.1.0.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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:0=[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.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild index a50c8dfeff34..20411af588c3 100644 --- a/app-shells/fish/fish-3.1.2.ebuild +++ b/app-shells/fish/fish-3.1.2.ebuild @@ -16,7 +16,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.gz" - 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" diff --git a/app-shells/fish/fish-3.2.0.ebuild b/app-shells/fish/fish-3.2.0.ebuild new file mode 100644 index 000000000000..e2662c513ae4 --- /dev/null +++ b/app-shells/fish/fish-3.2.0.ebuild @@ -0,0 +1,89 @@ +# 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:0=[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-9999.ebuild b/app-shells/fish/fish-9999.ebuild index a23370890b1d..e2662c513ae4 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,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit cmake python-any-r1 readme.gentoo-r1 @@ -17,8 +17,8 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" + 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" @@ -33,7 +33,8 @@ RDEPEND=" sys-libs/ncurses:0=[unicode] " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" nls? ( sys-devel/gettext ) test? ( ${PYTHON_DEPS} -- cgit v1.2.3