diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /app-shells/fish | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'app-shells/fish')
| -rw-r--r-- | app-shells/fish/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/fish/fish-9999.ebuild | 26 |
2 files changed, 22 insertions, 6 deletions
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index ed124557af99..c6e59fd1d1f6 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -9,5 +9,5 @@ EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca137 EBUILD fish-3.0.2.ebuild 1662 BLAKE2B 803c662cd6cda8a2cc4b17d69fac6d89707770c7aaf140acebffda40f690d90f38a253424db4ea19fcea155f0d6e49d6bd92495fade96b750b1d451a04f57903 SHA512 e51b71e0a7bbbcb54a50dea245facd141bfc6e07e5d45199dbad5e2e1a6747b16a5f269b55ffafeffdefa0227c29c39e3b0b039eabacaae700476b14fe9fac09 EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570 EBUILD fish-3.1.2.ebuild 1571 BLAKE2B 91cf51764d5969c2d941612b5f74456133de08c4ab101e38d80d2169da6661e5711ce449edf677106bfdb55a75a75549efbea36673dc0b11384a10c137819391 SHA512 b8b956ae839cfec8acfece28ca1b6b9b8cc9875112f27a728ab32f7d3b1a929ea9044f0e3dabf3723683c92309b6e2e56cc04638f1e74741de0da4779b19e68a -EBUILD fish-9999.ebuild 1591 BLAKE2B 1133b6360cbdb5e3ac7d4c8ad799bc14dfb6590829535345ec69159abc46a52e7ad1192ed371d05d91dabad83ca78108de2a86d10ab65097faba70f849516703 SHA512 62c2e273b74443551ec12502c5fc1f2246e49229ed32a919ffcc5f9f577fd47654c58746b5357bef198f105ec84fa360fed764a88af5a8c05b2a9b1bcbcebe89 +EBUILD fish-9999.ebuild 2057 BLAKE2B 8c6efe43984f467ef77552f189eae1f947334e2a3e1558a5b1a51cb2376e5bf8a7de85cc780d882bfc99e22a04919eb5a9db9795e546e0ab719481d8d27af17b SHA512 915e41d259b8401b4d4bb08152744d3493fea9e326e6923beb43dddd2dc6b9bd1d4105dbb53238788e6ae9b6035461e7bb797bd4d2bb20cd1f5bf1782644a78e MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97 diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index 34e66d1137bb..0ba68e1c6750 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit cmake readme.gentoo-r1 +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit cmake python-any-r1 readme.gentoo-r1 DESCRIPTION="Friendly Interactive SHell" HOMEPAGE="http://fishshell.com/" @@ -21,8 +23,8 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="+doc nls test" -IUSE="doc nls test" RESTRICT="!test? ( test )" RDEPEND=" @@ -32,13 +34,25 @@ RDEPEND=" " DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) - test? ( dev-tcltk/expect ) + 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}#' \ @@ -51,9 +65,11 @@ src_configure() { -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DCURSES_NEED_NCURSES=ON - -DBUILD_DOCS="$(usex doc)" + -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 } |