gentoo resync : 09.07.2022

3 files changed, 118 insertions, 2 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 9699807f9fe2..1aebd2b79cb5 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15
 AUX fish-3.4.1-atomic.patch 2109 BLAKE2B 8b33b8a0d3add15847ea54d5c3f243bc7bb5a8e99e029ee445405304a113217984e68c10088549df4c9cdba967bfda3f09f0dcfae96ce4035594477961410fe2 SHA512 651acf7d0961ed51332f52611e7ec4e6b56808ecd90ad8b2839c4cd9d4573a9d92824f1f3b3dafed9fabc06523cdb2fb4622098b60d4e32b462bc2ce450cc488
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
+DIST fish-3.5.0.tar.xz 3326276 BLAKE2B ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa SHA512 ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859
 EBUILD fish-3.4.0.ebuild 2342 BLAKE2B e1da974c7abcfa42059f85206d1b332d363cc9c41fec99b1aa9d0605b9b14ef9482c0af6dbb9af39c46770d01ad13beaa70baa1f8253dd34be0c00b62a308479 SHA512 cc270dda6da40e95576cd6714885ac2e8e84c4b1c1ed73502fc3aa8660e96086a93bdeec0f9bb650356d9c11c357b196557c36ef15cc56e109a705846b59158f
 EBUILD fish-3.4.1.ebuild 2463 BLAKE2B 9376647dc551b4d754038e2a13ec19bb59319a11fa9fea118016eb4b7ad6010353db6e425cad4ab43ec3ed1c1ae93ef2070a4654b3e3617eae7c823cb3a971f9 SHA512 25ccb6285e2f1b30a66d82326c3f0b16f470b021dc765f0eb06d9c60ba59c60eb79f7d5eaa9d55f26199200ef26563565bbb59eb0edc2db404d9c994c04cae76
-EBUILD fish-9999.ebuild 2369 BLAKE2B fe8ee52f625888a0e1d211535071b4b1069ec19b66dcb2c8df53b3aeb243ef0a27d38e3b94b5a3795317f31a7d2c5bf7bbf1fe5f4cfb6121a0ac9c63f0765301 SHA512 e400eb23b4b272930ff55a022e49953a97eb5eb0059ac94b455bc2e58118c6e3c75eb30f07e8c52086ed59fa9886edf5749c4e5852e782008b10830fd931637d
+EBUILD fish-3.5.0.ebuild 2611 BLAKE2B 0111b5193d134969e5cb9024cb8c7c26fcf9b76a7132d7252c9f17889c9072bb3458d1af79f121d844173bc106568b8ba8d9c6f03bf8ec6829a35240111d1fa5 SHA512 6ff9d74c493867a2ea0efd0c59a8d5bb183a5ec2f1be168942eadb9dec0442d8302b83d5e3987d3075e62237a8ecb227e8400573297dd97c6c08ec61fda23067
+EBUILD fish-9999.ebuild 2611 BLAKE2B 0111b5193d134969e5cb9024cb8c7c26fcf9b76a7132d7252c9f17889c9072bb3458d1af79f121d844173bc106568b8ba8d9c6f03bf8ec6829a35240111d1fa5 SHA512 6ff9d74c493867a2ea0efd0c59a8d5bb183a5ec2f1be168942eadb9dec0442d8302b83d5e3987d3075e62237a8ecb227e8400573297dd97c6c08ec61fda23067
 MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203
diff --git a/app-shells/fish/fish-3.5.0.ebuild b/app-shells/fish/fish-3.5.0.ebuild
new file mode 100644
index 000000000000..d0328d498838
--- /dev/null
+++ b/app-shells/fish/fish-3.5.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://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 ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls 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
+	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/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
+	if [[ ${PV} != 9999 ]]; then
+		rm -v tests/pexpects/terminal.py || die
+	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
+
+	cmake_build test
+
+	# now restore zfs completions
+	mv "${S}"/share/completions/zfs.{disabled,fish} || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index de44bf1d4092..d0328d498838 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -94,7 +94,13 @@ src_test() {
 		rm -v tests/pexpects/terminal.py || die
 	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
+
 	cmake_build test
+
+	# now restore zfs completions
+	mv "${S}"/share/completions/zfs.{disabled,fish} || die
 }
 
 pkg_postinst() {