From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1726616-garchives=archives.gentoo.org@lists.gentoo.org>
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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 410D21582EF
for <garchives@archives.gentoo.org>; Tue, 11 Mar 2025 09:11:30 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 2D79B343091
for <garchives@archives.gentoo.org>; Tue, 11 Mar 2025 09:11:30 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 5D0DC1103C7;
Tue, 11 Mar 2025 09:11:26 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 bobolink.gentoo.org (Postfix) with ESMTPS id 53D771103C7
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Mar 2025 09:11:26 +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 10B0B3430E3
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Mar 2025 09:11:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E23D28D4
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Mar 2025 09:11:24 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1741684240.dc93d3d1b2ed96ae2ebfea8c60d3f32b04ce6a7f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-shells/fish/fish-4.0.0-r1.ebuild app-shells/fish/fish-9999.ebuild
X-VCS-Directories: app-shells/fish/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: dc93d3d1b2ed96ae2ebfea8c60d3f32b04ce6a7f
X-VCS-Branch: master
Date: Tue, 11 Mar 2025 09:11:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d0595026-fba6-468d-bd1e-e8cb74dcc519
X-Archives-Hash: 5446ef28ce8a7be7fef9b07da4fe134e
commit: dc93d3d1b2ed96ae2ebfea8c60d3f32b04ce6a7f
Author: idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Mon Mar 10 11:17:52 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 09:10:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc93d3d1
app-shells/fish: sync live ebuild
Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40997
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/fish/fish-4.0.0-r1.ebuild | 1 -
app-shells/fish/fish-9999.ebuild | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-shells/fish/fish-4.0.0-r1.ebuild b/app-shells/fish/fish-4.0.0-r1.ebuild
index c0f7125bd50f..cc3146978ee5 100644
--- a/app-shells/fish/fish-4.0.0-r1.ebuild
+++ b/app-shells/fish/fish-4.0.0-r1.ebuild
@@ -112,7 +112,6 @@ src_configure() {
else
mycmakeargs+=( -DBUILD_DOCS=OFF )
fi
-
cargo_src_configure --no-default-features --bin fish --bin fish_indent --bin fish_key_reader
cmake_src_configure
}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index cb59069fbc8e..443624f2a4d8 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
@@ -111,6 +111,8 @@ src_configure() {
src_compile() {
local -x PREFIX="${EPREFIX}/usr"
local -x DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ # Bug: https://bugs.gentoo.org/950699
+ local -x SYSCONFDIR="${EPREFIX}/etc"
local -x CMAKE_WITH_GETTEXT
CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
cargo_src_compile