commit: 1a1c462aff3c8d781088e6e82debd0ca5d756d70 Author: idealseal <realidealseal <AT> protonmail <DOT> com> AuthorDate: Mon Mar 10 11:07:29 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=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 <realidealseal <AT> protonmail.com> Signed-off-by: Sam James <sam <AT> 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
