From bbc1f4eb9fc16193b7f9b69961f346feb58ccc88 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 17 Jul 2021 23:29:51 +0200 Subject: app-shells/fish: Add sys-libs/ncurses[unicode(+)] Signed-off-by: David Seifert --- app-shells/fish/fish-3.1.2-r1.ebuild | 71 +++++++++++++++++++++++++++ app-shells/fish/fish-3.1.2.ebuild | 71 --------------------------- app-shells/fish/fish-3.2.1-r1.ebuild | 89 ++++++++++++++++++++++++++++++++++ app-shells/fish/fish-3.2.1.ebuild | 89 ---------------------------------- app-shells/fish/fish-3.2.2-r1.ebuild | 89 ++++++++++++++++++++++++++++++++++ app-shells/fish/fish-3.2.2.ebuild | 89 ---------------------------------- app-shells/fish/fish-3.3.1-r1.ebuild | 94 ++++++++++++++++++++++++++++++++++++ app-shells/fish/fish-3.3.1.ebuild | 94 ------------------------------------ app-shells/fish/fish-9999.ebuild | 4 +- 9 files changed, 345 insertions(+), 345 deletions(-) create mode 100644 app-shells/fish/fish-3.1.2-r1.ebuild delete mode 100644 app-shells/fish/fish-3.1.2.ebuild create mode 100644 app-shells/fish/fish-3.2.1-r1.ebuild delete mode 100644 app-shells/fish/fish-3.2.1.ebuild create mode 100644 app-shells/fish/fish-3.2.2-r1.ebuild delete mode 100644 app-shells/fish/fish-3.2.2.ebuild create mode 100644 app-shells/fish/fish-3.3.1-r1.ebuild delete mode 100644 app-shells/fish/fish-3.3.1.ebuild (limited to 'app-shells') diff --git a/app-shells/fish/fish-3.1.2-r1.ebuild b/app-shells/fish/fish-3.1.2-r1.ebuild new file mode 100644 index 000000000000..177c7aa2ce46 --- /dev/null +++ b/app-shells/fish/fish-3.1.2-r1.ebuild @@ -0,0 +1,71 @@ +# 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.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild deleted file mode 100644 index 20411af588c3..000000000000 --- a/app-shells/fish/fish-3.1.2.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: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.2.1-r1.ebuild b/app-shells/fish/fish-3.2.1-r1.ebuild new file mode 100644 index 000000000000..abb51e209302 --- /dev/null +++ b/app-shells/fish/fish-3.2.1-r1.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:=[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.1.ebuild b/app-shells/fish/fish-3.2.1.ebuild deleted file mode 100644 index e2662c513ae4..000000000000 --- a/app-shells/fish/fish-3.2.1.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: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-3.2.2-r1.ebuild b/app-shells/fish/fish-3.2.2-r1.ebuild new file mode 100644 index 000000000000..abb51e209302 --- /dev/null +++ b/app-shells/fish/fish-3.2.2-r1.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:=[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.ebuild b/app-shells/fish/fish-3.2.2.ebuild deleted file mode 100644 index e2662c513ae4..000000000000 --- a/app-shells/fish/fish-3.2.2.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: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-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild new file mode 100644 index 000000000000..e24e0866494f --- /dev/null +++ b/app-shells/fish/fish-3.3.1-r1.ebuild @@ -0,0 +1,94 @@ +# 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 )" + +PATCHES=( + "${FILESDIR}/3.3.1-don-t-override-linker.patch" + "${FILESDIR}/3.3.1-sbin-path-sh-test.patch" +) + +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 test +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-shells/fish/fish-3.3.1.ebuild b/app-shells/fish/fish-3.3.1.ebuild deleted file mode 100644 index fc205e24afcf..000000000000 --- a/app-shells/fish/fish-3.3.1.ebuild +++ /dev/null @@ -1,94 +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 )" - -PATCHES=( - "${FILESDIR}/3.3.1-don-t-override-linker.patch" - "${FILESDIR}/3.3.1-sbin-path-sh-test.patch" -) - -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 test -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index e2662c513ae4..abb51e209302 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -28,9 +28,9 @@ IUSE="+doc nls test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/libpcre2-10.32[pcre32] + >=dev-libs/libpcre2-10.32:=[pcre32] sys-apps/coreutils - sys-libs/ncurses:0=[unicode] + sys-libs/ncurses:=[unicode(+)] " DEPEND="${RDEPEND}" -- cgit v1.2.3-65-gdbad