[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/

["Sam James" <sam@gentoo.org>]

commit:     ae219226e4b51c943bdd34848aaecfd3ab039de4
Author:     idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Wed Oct  8 10:21:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 07:00:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae219226

app-shells/fish: add 4.1.2

Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44095
Closes: https://github.com/gentoo/gentoo/pull/44095
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-shells/fish/Manifest          |   2 +
 app-shells/fish/fish-4.1.2.ebuild | 109 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index b5c1bf9cd24c..c15688dad535 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,8 +3,10 @@ DIST fish-4.0.6.tar.xz 3057300 BLAKE2B f422ad91a5cdeb0533a2f379694b10f64ab734632
 DIST fish-4.0.8.tar.xz 3057636 BLAKE2B 9b49efda655f46a29420001dcda7270be4f38b82990a7ec8ce4677ab18565b8bb6dc50b2f8adc997e37df45aacbb37a0c5d1a90f84a9bfc11c0d362dce9cd722 SHA512 64330a93aa14a6728ea1de7f8ee67374b5d9437d9de423981df8d703a293d71ddd81af37bd8182dcd6146780730510e4578f20a99e232429d03e6abc1d16dd8d
 DIST fish-4.1.0.tar.xz 3275104 BLAKE2B 3b6abaab2167a84f327724b4482df15101cfb6aae5bdfea3a90249ec3dc307ec9a99910347a3ab01702e28d76981106198c462f2f6d30db8fe8e9ba2d0dbb5dd SHA512 01678f235afb77ad03b06e18b58665b2111df1624b946de66f814e2a8937d9543ce18f806d5eb40adc490591995fe95dabc8f3c8cffbda3611cd6c91d0f7707c
 DIST fish-4.1.1.tar.xz 2966548 BLAKE2B c6dc29a272be382f5f8804723e684e2bedc4a4ff45b66ee6baad3382d7640309c9539501cd2a8183af7e010f4f2c47dfdf295dae47d57bcd0967430689a1dd9b SHA512 00872dac175072142721580fbe8cee0b45d9fdc478dc6bfd857fe4c1f64b6cbf0c7cf3e678ab1b083f74579903f3804533975dd92bdfad325223852e3033e07b
+DIST fish-4.1.2.tar.xz 2968176 BLAKE2B dccd3eb52dc2a8b799e49b9d62e32f5fad756ee4e5e52027354c82ceebd8c18d99d48d3701d6894c565503a0312f1c2060dde0f1867df3fd98b830c242064d69 SHA512 a4b3fb1db13d338738189aece6b2764174d786a065044f211296554e73fd07cfe6913edef364d6a671717f789b6c6288345b489d537e61cece78ac668b44efcf
 DIST fish-shell-4.0.6-crates.tar.xz 7622808 BLAKE2B 8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5 SHA512 c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.0.8-crates.tar.xz 7622808 BLAKE2B 8a939212f1ba7585d66d9922c8231394e47e1eb49b38eda5a00839fdc0a99f2ae121e38dcb206af8f95470253b9691d9be4025a35eadfe907dd862bd27302ad5 SHA512 c221dcae64a46c5eae7b7a19001acb694cec02e355510c1014c0e61345afaa77cc700fba7ce0914494d8db0f99ca5f014f22ce7e9a68ad2f008bbee699317455
 DIST fish-shell-4.1.0-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18 SHA512 1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST fish-shell-4.1.1-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18 SHA512 1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
+DIST fish-shell-4.1.2-crates.tar.xz 7131000 BLAKE2B f36b33851cbee50a5d80a9527f969dfeae7963c0944c608ac3440b01b23691f63d1da05b7d824056b77ce2b0001a40ec1476aaab6b3d8aceb284711d488d4a18 SHA512 1f542be9f2174be0c7c4451b66df3cb32c010d5d0a6d330078cc818e09df7b9f6d16a9001fe7fc0262276e14e1e6be2eb63408f10ddca609d43d8130b673b438
 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 BLAKE2B 533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68 SHA512 9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da8152178888bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad

diff --git a/app-shells/fish/fish-4.1.2.ebuild b/app-shells/fish/fish-4.1.2.ebuild
new file mode 100644
index 000000000000..0568f35044e8
--- /dev/null
+++ b/app-shells/fish/fish-4.1.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=""
+
+declare -A GIT_CRATES=(
+	[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+	[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="https://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git"
+else
+	SRC_URI="
+		https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
+		https://github.com/gentoo-crate-dist/fish-shell/releases/download/${MY_PV}/fish-shell-${MY_PV}-crates.tar.xz
+		${CARGO_CRATE_URIS}
+	"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 BSD BSD-2 CC0-1.0 GPL-2+ ISC LGPL-2+ MIT PSF-2 ZLIB"
+# Dependent crate licenses
+LICENSE+=" MIT Unicode-DFS-2016 WTFPL-2 ZLIB"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+# Release tarballs contain prebuilt documentation.
+[[ ${PV} == 9999 ]] && BDEPEND+=" doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-use-cargo-eclass-for-build.patch"
+)
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls 1 0)"
+	)
+	cargo_src_configure --no-default-features \
+		--bin fish \
+		--bin fish_indent \
+		--bin fish_key_reader
+	cmake_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"
+
+	# Release tarballs contain prebuilt documentation.
+	local -x FISH_BUILD_DOCS
+	if [[ ${PV} == 9999 ]]; then
+		FISH_BUILD_DOCS="$(usex doc 1 0)"
+	else
+		FISH_BUILD_DOCS=0
+	fi
+
+	cargo_src_compile
+}
+
+src_test() {
+	local -x CARGO_TERM_COLOR=always
+	local -x TEST_VERBOSE=1
+	# cargo_env cmake_src_compile fish_run_tests
+	cargo_env cmake_src_test fish_run_tests
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}