gentoo auto-resync : 09:03:2024 - 18:44:28

3 files changed, 123 insertions, 0 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 6c0f6ee306cf..5f30d095fa0a 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 3c83dfd471e6..2ad5d33b7b44 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,7 +1,9 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a SHA512 ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
+DIST fish-3.7.0.tar.xz 2961912 BLAKE2B fd2c663a21be7a3aad362c69eff94f1cd9947075953deae74de64ef96b1d6f3874efa6389806f0eebc5789068acefb1218c6baaa1059a14ed13b5c33e6bc03e3 SHA512 bc5121ddd2a9918befac197b215721f20b69984897ec57558bef8e3a36a849935f6d1ec1c74c2d92e565f23e417039d7130122549c8b1d8c55dd8dbfb51a2d34
 EBUILD fish-3.4.0.ebuild 2334 BLAKE2B 4332dbf3a801cbec41d4744741446b1efec30dbc80ec354d576da0df8139cb47678301235a93b7a26338e7db6c1877635d5838459ac809e1c50425ca0ef5eda8 SHA512 88edbeac9301815e8190c651fc1af8cd9a0d8f1fed0061cffde064db2aa1a1404a97450a3122ee3325d8a8ffcee3c5b30fa6d3c532990e8a032a3f2688756859
 EBUILD fish-3.6.1.ebuild 3151 BLAKE2B 0138802ab238bc8ef46e77b121f597407f21b2b03c1aac9e23d46a17986192194dc9194c33ee53847a7a55f5a1696985ae561d9cc78d91fcc36ac8e5aebf0dac SHA512 471a8a5e558ebb68f5b3d80612bfeb017a3b99558027ba04dc07e2ce34cef83bd931a8f9dbe9f9a5365373cc73c5424079aacafeb9225ba75e73448be9c67ac6
+EBUILD fish-3.7.0.ebuild 3158 BLAKE2B 03522aef4bdcfc03d00d2b3dbf2c508f3ad30502f455636cc7721eeea32ab41ed030ddd675e2c9c77a6a423640eadd0fd737fcf960d9365b7fd565a22a9c9e96 SHA512 1cfa23997405fb891de2297603cf19406c6c157f3aa0996c6bd48e3de58cba7bd94610a1bf8654ca4412f15d8268d67c339b7c994af07fe3d98321edcf92cf5c
 EBUILD fish-9999.ebuild 3157 BLAKE2B 86f209666f5725e34b80db135c4a7d1885ea8895531a3610c8ca458141f0fccfd5de3408d80aa343178af6f5d51efd4279070776e5b3e0fb0a66d6d3a565965c SHA512 c19b70e3086b586193b105ae845dc79cd8abbc21d6eb0406974f5c1fc5d23d0c0c5a71c84a5a49ec721d3b6e7817ff2b186d80f35a8d7ffde5e43e51b0f0bffa
 MISC metadata.xml 544 BLAKE2B 1d712f1e36fa1329f8d3cf766a7ed19f210356bb229a66e17f0fc640fd6969f60c56dff1003995ddda3d2f1b28da914d9748bdb84d101a4cdd4a089fd07f58ed SHA512 686d3bebc8b840abc98464ef07e9bb8e5456fef99b55a5c6688c99453173ef941f7ffb67d0f8de4273ff0f7d632b8843783939d7b078bf84d36cf8a31cff5df6
diff --git a/app-shells/fish/fish-3.7.0.ebuild b/app-shells/fish/fish-3.7.0.ebuild
new file mode 100644
index 000000000000..d11c8f1ca20c
--- /dev/null
+++ b/app-shells/fish/fish-3.7.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 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/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls split-usr test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-tcltk/expect
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+	)
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	if use split-usr; then
+		sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+			cmake/Tests.cmake || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# installing into /bin breaks tests on merged usr systems.
+		# sbin -> bin symlink confuses tests.
+		# so on split-usr we install to /bin.
+		# on merge-usr we set sbindir to bin.
+		$(usex split-usr "-DCMAKE_INSTALL_BINDIR=${EPREFIX}/bin" \
+			"-DCMAKE_INSTALL_SBINDIR=${EPREFIX}/usr/bin")
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	else
+		mycmakeargs+=( -DBUILD_DOCS=OFF )
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	# some tests are fragile, sanitize environment
+	local -x COLUMNS=80
+	local -x LINES=24
+
+	# very fragile, depends on terminal, size, tmux, screen and timing
+	# no die is intentional, for repeated test runs
+	if [[ ${PV} != 9999 ]]; then
+		rm -v tests/pexpects/terminal.py || :
+	fi
+
+	# zfs completion test will fail with "Permission denied the ZFS utilities must be run as root."
+	mv "${S}"/share/completions/zfs.{fish,disabled} || die
+
+	# TODO: fix tests & submit upstream
+	# tests are confused by usr/sbin -> bin symlink, no die is intentional for repeated test runs
+	use split-usr || rm -v tests/checks/{redirect,type}.fish || :
+
+	cmake_build test
+
+	# now restore zfs completions
+	mv "${S}"/share/completions/zfs.{disabled,fish} || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}