From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 64E811582EF for ; Tue, 11 Mar 2025 09:11:27 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 520A33430F9 for ; Tue, 11 Mar 2025 09:11:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4C99D11037F; Tue, 11 Mar 2025 09:11:26 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 40C9B11037F for ; 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 EE8033430CA for ; Tue, 11 Mar 2025 09:11:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5866328AE for ; Tue, 11 Mar 2025 09:11:24 +0000 (UTC) From: "Sam James" 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" Message-ID: <1741684240.1a1c462aff3c8d781088e6e82debd0ca5d756d70.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-4.0.0.ebuild X-VCS-Directories: app-shells/fish/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1a1c462aff3c8d781088e6e82debd0ca5d756d70 X-VCS-Branch: master Date: Tue, 11 Mar 2025 09:11:24 +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: 2cb929d8-0b03-494e-966e-77a1d34ca610 X-Archives-Hash: a3bc9e44517cc58dac13a64ee31d4d69 commit: 1a1c462aff3c8d781088e6e82debd0ca5d756d70 Author: idealseal protonmail com> AuthorDate: Mon Mar 10 11:07:29 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 11 09:10:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1c462a app-shells/fish: inject proper sysconfdir Older fish versions used /etc/fish as the sysconfdir and if not set explicitly fish 4 will default to /usr/share/etc/fish. Closes: https://bugs.gentoo.org/950699 Signed-off-by: idealseal protonmail.com> Signed-off-by: Sam James gentoo.org> app-shells/fish/{fish-4.0.0.ebuild => fish-4.0.0-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-shells/fish/fish-4.0.0.ebuild b/app-shells/fish/fish-4.0.0-r1.ebuild similarity index 98% rename from app-shells/fish/fish-4.0.0.ebuild rename to app-shells/fish/fish-4.0.0-r1.ebuild index fd51ab804370..c0f7125bd50f 100644 --- a/app-shells/fish/fish-4.0.0.ebuild +++ b/app-shells/fish/fish-4.0.0-r1.ebuild @@ -112,6 +112,7 @@ 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 } @@ -119,6 +120,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