public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/
Date: Thu, 18 Jun 2020 22:21:30 +0000 (UTC)	[thread overview]
Message-ID: <1592518852.d7a8a440d7924b16cf20a40c290ab4d20d29e393.gyakovlev@gentoo> (raw)

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
 }
 


             reply	other threads:[~2020-06-18 22:21 UTC|newest]

Thread overview: 144+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-18 22:21 Georgy Yakovlev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-13 17:08 [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/ Sam James
2025-03-13 17:08 Sam James
2025-03-13  9:45 Sam James
2025-03-11  9:11 Sam James
2025-03-11  9:11 Sam James
2025-03-02 17:59 Arthur Zamarin
2025-03-02 17:59 Arthur Zamarin
2025-01-21 14:34 Joonas Niilola
2025-01-21 14:34 Joonas Niilola
2024-12-02  1:06 John Helmert III
2024-08-30 14:59 Ionen Wolkens
2024-08-11 16:57 Petr Vaněk
2024-06-20 13:04 Sam James
2024-06-19  8:46 Sam James
2024-06-19  8:46 Sam James
2024-06-19  8:46 Sam James
2024-06-19  8:46 Sam James
2024-06-19  8:46 Sam James
2024-05-05 12:17 Arthur Zamarin
2024-03-15  4:17 Ulrich Müller
2024-03-09 10:46 Yixun Lan
2024-02-15  7:07 Joonas Niilola
2024-02-15  7:07 Joonas Niilola
2023-08-15  7:34 Sam James
2023-07-20 12:19 Sam James
2023-07-08  3:39 Sam James
2023-07-07  3:36 Sam James
2023-04-05 23:41 Georgy Yakovlev
2023-04-05 23:41 Georgy Yakovlev
2023-04-05 23:41 Georgy Yakovlev
2023-04-05 23:41 Georgy Yakovlev
2023-01-09  9:10 Georgy Yakovlev
2023-01-09  9:10 Georgy Yakovlev
2022-09-20  4:19 Sam James
2022-09-20  1:38 Georgy Yakovlev
2022-09-20  0:23 Georgy Yakovlev
2022-08-11 10:38 Sam James
2022-07-04 21:07 Georgy Yakovlev
2022-07-04 21:07 Georgy Yakovlev
2022-05-19  9:29 Agostino Sarubbo
2022-05-17  9:24 Agostino Sarubbo
2022-05-10 16:39 Jakov Smolić
2022-05-10 16:39 Jakov Smolić
2022-05-01 23:34 Sam James
2022-05-01  1:52 WANG Xuerui
2022-05-01  1:52 WANG Xuerui
2022-04-24 11:06 Jakov Smolić
2022-04-24 11:06 Jakov Smolić
2022-03-27  2:33 Sam James
2022-03-27  2:33 Sam James
2022-03-26 18:21 Lars Wendler
2022-03-18  9:26 Arthur Zamarin
2022-03-17  2:28 Sam James
2022-03-14  6:48 Lars Wendler
2022-03-14  6:48 Lars Wendler
2021-12-23 22:37 Georgy Yakovlev
2021-12-23 22:37 Georgy Yakovlev
2021-12-23 22:37 Georgy Yakovlev
2021-12-23 22:28 Georgy Yakovlev
2021-12-23 22:28 Georgy Yakovlev
2021-12-23 22:28 Georgy Yakovlev
2021-12-23  8:40 Arthur Zamarin
2021-12-23  8:40 Arthur Zamarin
2021-12-22  9:36 Arthur Zamarin
2021-12-21 20:56 Arthur Zamarin
2021-12-21 20:56 Arthur Zamarin
2021-12-21 20:43 Arthur Zamarin
2021-12-21 20:33 Arthur Zamarin
2021-04-07 15:08 Lars Wendler
2021-04-07 15:08 Lars Wendler
2021-03-18  9:19 Lars Wendler
2021-03-02  7:23 Lars Wendler
2021-03-02  7:23 Lars Wendler
2021-02-26 17:34 Sergei Trofimovich
2021-01-07 20:14 Sam James
2021-01-07 10:35 Sam James
2021-01-07 10:09 Sam James
2021-01-06 13:26 Fabian Groffen
2021-01-04  1:32 Sam James
2020-12-13  0:16 Sam James
2020-08-01 19:06 Sergei Trofimovich
2020-07-12  2:41 Sam James
2020-06-13  6:59 Matt Turner
2020-06-13  6:59 Matt Turner
2020-06-13  6:59 Matt Turner
2020-06-12 18:44 Sergei Trofimovich
2020-06-12 18:44 Sergei Trofimovich
2020-04-29  7:49 Lars Wendler
2020-04-27 20:36 Lars Wendler
2020-04-27 20:36 Lars Wendler
2020-04-13 22:42 Sergei Trofimovich
2020-04-13 22:42 Sergei Trofimovich
2020-03-25  5:09 Georgy Yakovlev
2020-03-03  8:09 Matt Turner
2020-02-13  4:34 Georgy Yakovlev
2020-02-13  4:34 Georgy Yakovlev
2020-02-05 19:26 Sergei Trofimovich
2020-01-27 21:47 Georgy Yakovlev
2019-07-29 14:31 Mikle Kolyada
2019-05-26  7:35 Sergei Trofimovich
2019-05-13 19:59 Aaron Bauman
2019-05-13  9:49 Mikle Kolyada
2019-05-12 21:57 Sergei Trofimovich
2019-04-23 22:08 Aaron Bauman
2019-03-19  0:54 Georgy Yakovlev
2019-02-19 21:17 Georgy Yakovlev
2019-02-19 21:17 Georgy Yakovlev
2019-02-11 17:07 Georgy Yakovlev
2018-12-29 23:43 Georgy Yakovlev
2018-12-29 23:43 Georgy Yakovlev
2018-12-29 23:43 Georgy Yakovlev
2018-12-29  8:43 Georgy Yakovlev
2018-12-28 18:39 Georgy Yakovlev
2018-12-28 18:39 Georgy Yakovlev
2018-06-17  1:18 Georgy Yakovlev
2018-06-04 19:25 Mart Raudsepp
2018-04-24 10:39 Mikle Kolyada
2018-04-11 20:43 Thomas Deutschmann
2018-04-11 13:42 Lars Wendler
2018-04-06 11:05 Fabian Groffen
2018-03-30  3:10 Aaron Bauman
2018-03-27  8:50 Lars Wendler
2018-02-11 10:25 Michał Górny
2018-01-23  5:58 Markus Meier
2017-12-28 15:54 Lars Wendler
2017-11-23 14:49 Lars Wendler
2017-11-07 12:50 Lars Wendler
2017-11-07 12:50 Lars Wendler
2017-10-26 18:54 Thomas Deutschmann
2017-10-03  8:25 Sergei Trofimovich
2017-06-07  0:55 Lars Wendler
2017-02-21  9:30 Lars Wendler
2017-01-13 10:36 Lars Wendler
2017-01-02 10:32 Lars Wendler
2016-12-17  5:19 Aaron Bauman
2016-11-09  8:40 Lars Wendler
2016-11-08 18:49 Lars Wendler
2016-07-10 12:33 Lars Wendler
2016-07-06 12:30 Lars Wendler
2016-07-06  9:23 Agostino Sarubbo
2016-06-06 13:33 Agostino Sarubbo
2016-05-24  8:00 Lars Wendler
2015-10-16  9:18 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1592518852.d7a8a440d7924b16cf20a40c290ab4d20d29e393.gyakovlev@gentoo \
    --to=gyakovlev@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox