From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0375A1382C5 for ; Thu, 18 Jun 2020 22:21:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A0CE08E5; Thu, 18 Jun 2020 22:21:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 161D5E08E5 for ; Thu, 18 Jun 2020 22:21:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7255034EF3C for ; Thu, 18 Jun 2020 22:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CA311EF for ; Thu, 18 Jun 2020 22:21:30 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1592518852.d7a8a440d7924b16cf20a40c290ab4d20d29e393.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/fish/fish-9999.ebuild X-VCS-Directories: app-shells/fish/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: d7a8a440d7924b16cf20a40c290ab4d20d29e393 X-VCS-Branch: master Date: Thu, 18 Jun 2020 22:21:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78a87695-5900-4e32-9a39-aae1c2c791d5 X-Archives-Hash: 143bd2f06c4fecc9b33c5f37956f5e6a commit: d7a8a440d7924b16cf20a40c290ab4d20d29e393 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jun 18 22:17:23 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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 }