[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     d7a8a440d7924b16cf20a40c290ab4d20d29e393
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 22:17:23 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 22:20:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a8a440

app-shells/fish: update live ebuild

fix docs, doxygen no longer used. upstream switched to sphinx.
we only need sphinx for live ebuild, as release tarballs have
prebuilt docs, so split configuration a bit to avoid
sphinx dependency on release.

switch doc flag on by default, as it installs manpages.
maybe we should install manpages unconditionally and
use doc useflag to install html, but upstream does not
split it, all-or-nothing approach.

also add pexpect dependency for new tests.

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/fish/fish-9999.ebuild | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 34e66d1137b..0ba68e1c675 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
 }