From dc93d3d1b2ed96ae2ebfea8c60d3f32b04ce6a7f Mon Sep 17 00:00:00 2001 From: idealseal Date: Mon, 10 Mar 2025 12:17:52 +0100 Subject: [PATCH] app-shells/fish: sync live ebuild Signed-off-by: idealseal Closes: https://github.com/gentoo/gentoo/pull/40997 Signed-off-by: Sam James --- 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 c0f7125bd50f9..cc3146978ee54 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 cb59069fbc8e8..443624f2a4d88 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