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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 300AD158086 for ; Thu, 23 Dec 2021 22:37:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2328B2BC006; Thu, 23 Dec 2021 22:37:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 079602BC006 for ; Thu, 23 Dec 2021 22:37:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0C4D342F0A for ; Thu, 23 Dec 2021 22:37:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40DE7258 for ; Thu, 23 Dec 2021 22:37:39 +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: <1640299000.38fe8c5f2b50e35e919b26dbf5789238a04b12d0.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: 38fe8c5f2b50e35e919b26dbf5789238a04b12d0 X-VCS-Branch: master Date: Thu, 23 Dec 2021 22:37:39 +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: 869c91b4-7084-4e0d-9a55-662a746cfa78 X-Archives-Hash: f48f0c55f9b46449d9c17e4e89eb0e70 commit: 38fe8c5f2b50e35e919b26dbf5789238a04b12d0 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Dec 23 22:36:40 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Dec 23 22:36:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fe8c5f app-shells/fish: sync live ebuild Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/fish/fish-9999.ebuild | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index b0013271b00f..c35b05dc2100 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then 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" + 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" @@ -70,7 +70,11 @@ src_configure() { -DWITH_GETTEXT="$(usex nls)" ) # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + if [[ ${PV} == 9999 ]]; then + mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) + else + mycmakeargs+=( -DBUILD_DOCS=OFF ) + fi cmake_src_configure } @@ -81,7 +85,16 @@ src_install() { } src_test() { - cmake_build -j1 test + # some tests are fragile, sanitize environment + local -x COLUMNS=80 + local -x LINES=24 + + # very fragile, depends on terminal, size, tmux, screen and timing + if [[ ${PV} != 9999 ]]; then + rm -v tests/pexpects/terminal.py || die + fi + + cmake_build test } pkg_postinst() {