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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A779515800F for ; Mon, 9 Jan 2023 09:10:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 010A6E07AE; Mon, 9 Jan 2023 09:10:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E012CE07B2 for ; Mon, 9 Jan 2023 09:10:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E5F7E335D1C for ; Mon, 9 Jan 2023 09:10:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34CCE7FD for ; Mon, 9 Jan 2023 09:10:56 +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: <1673255438.c7464b451fe54c8d125852133156c8990e1231e6.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: c7464b451fe54c8d125852133156c8990e1231e6 X-VCS-Branch: master Date: Mon, 9 Jan 2023 09:10:56 +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: efefbd63-359a-4a45-91fe-a288f95727ce X-Archives-Hash: 80500b094e3ee17701fd8e28ce3b6fc4 commit: c7464b451fe54c8d125852133156c8990e1231e6 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Jan 9 09:10:19 2023 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jan 9 09:10:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7464b45 app-shells/fish: sync live ebuild Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/fish/fish-9999.ebuild | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index fe718cdc3436..7c8b6a2c6584 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake python-any-r1 readme.gentoo-r1 +inherit cmake python-any-r1 readme.gentoo-r1 xdg DESCRIPTION="Friendly Interactive SHell" HOMEPAGE="https://fishshell.com/" @@ -23,7 +23,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+doc nls test" +IUSE="+doc nls split-usr test" RESTRICT="!test? ( test )" @@ -56,14 +56,21 @@ python_check_deps() { 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}#' \ - cmake/Tests.cmake || die + if use split-usr; then + sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ + cmake/Tests.cmake || die + fi cmake_src_prepare } src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" + # installing into /bin breaks tests on merged usr systems. + # sbin -> bin symlink confuses tests. + # so on split-usr we install to /bin. + # on merge-usr we set sbindir to bin. + $(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \ + "-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin") -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DCURSES_NEED_NCURSES=ON -DINSTALL_DOCS="$(usex doc)" @@ -90,13 +97,18 @@ src_test() { local -x LINES=24 # very fragile, depends on terminal, size, tmux, screen and timing + # no die is intentional, for repeated test runs if [[ ${PV} != 9999 ]]; then - rm -v tests/pexpects/terminal.py || die + rm -v tests/pexpects/terminal.py || : fi # zfs completion test will fail with "Permission denied the ZFS utilities must be run as root." mv "${S}"/share/completions/zfs.{fish,disabled} || die + # TODO: fix tests & submit upstream + # tests are confused by usr/sbin -> bin symlink, no die is intentional for repeated test runs + use split-usr || rm -v tests/checks/{redirect,type}.fish || : + cmake_build test # now restore zfs completions @@ -105,4 +117,5 @@ src_test() { pkg_postinst() { readme.gentoo_print_elog + xdg_pkg_postinst }