gentoo auto-resync : 09:01:2023 - 12:18:20

4 files changed, 144 insertions, 8 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index a6b405059a37..43188d5c37cd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c81e0f2e473a..e77e75301963 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.5.1.tar.xz 3329900 BLAKE2B 960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3 SHA512 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235
+DIST fish-3.6.0.tar.xz 2892296 BLAKE2B 8c27e091b8241d88bd5e8390a0c221aa6cfccd236ece78feb434760318cf7d4e333a470b53bef02c228916b65ff4e19595cbb21e2021409b50d63df5d133b786 SHA512 a11ea761adace02ef7f88b25893328005cef07f92d362fbc794540dca26e9cfc970878d0312caebd19d64483e9f3c3e24ad6c27dfce264d177f93d65c7ef6996
 EBUILD fish-3.4.0.ebuild 2347 BLAKE2B 7b53f400c6738fd17c431ea45c3f6dcdb1380d1fc354d16d3116e9123eb8a0210c477e5043eaee5f53dd1059f8a61071bc629054cad4198bf7684e6f08c33ccd SHA512 ce2e90072bc0b9fc5e043da6192e159f3f62f9436e86b5891764784d11e402533819417e72a39e798bcd99b44d2894b8f4f98e0fb1786e6f3de5c7de8f0bc263
 EBUILD fish-3.5.1.ebuild 2616 BLAKE2B 438d4c8b2a3ee69b0dbd67f8404d019638f8efb47f20ea418673028df4bda27fec56e7a41212e8bd0d667e155d36516a3e231bdecc9a6399650c844f52e95562 SHA512 faab54fbfb2e230e30abffba2656a795e8645917811945e97d4e970d50c13f31bae485c809e1187cbb91d7450721f4fe3133477259fa51900621a65cf071ad51
-EBUILD fish-9999.ebuild 2616 BLAKE2B 438d4c8b2a3ee69b0dbd67f8404d019638f8efb47f20ea418673028df4bda27fec56e7a41212e8bd0d667e155d36516a3e231bdecc9a6399650c844f52e95562 SHA512 faab54fbfb2e230e30abffba2656a795e8645917811945e97d4e970d50c13f31bae485c809e1187cbb91d7450721f4fe3133477259fa51900621a65cf071ad51
+EBUILD fish-3.6.0.ebuild 3170 BLAKE2B 420ea48dbf366d2ebf9dc4b7778d7b7664f2fdd7783acad983b05e89068a0632caa6b3b5e7906015638f71df757847df9fc91230b7741ebbf6410f69a9f250cc SHA512 14dcec5780a42b0dc5982d290d7efe54b104993ae3f28c7f50f52853beb013d46cc795ca556a80ffe019b284f1ea35d5268bca1c0a52e02eb3b9f6b5affea769
+EBUILD fish-9999.ebuild 3170 BLAKE2B 420ea48dbf366d2ebf9dc4b7778d7b7664f2fdd7783acad983b05e89068a0632caa6b3b5e7906015638f71df757847df9fc91230b7741ebbf6410f69a9f250cc SHA512 14dcec5780a42b0dc5982d290d7efe54b104993ae3f28c7f50f52853beb013d46cc795ca556a80ffe019b284f1ea35d5268bca1c0a52e02eb3b9f6b5affea769
 MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203
diff --git a/app-shells/fish/fish-3.6.0.ebuild b/app-shells/fish/fish-3.6.0.ebuild
new file mode 100644
index 000000000000..7c8b6a2c6584
--- /dev/null
+++ b/app-shells/fish/fish-3.6.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 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 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 ~x86-solaris"
+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
+}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index fe718cdc3436..7c8b6a2c6584 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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
+inherit cmake python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="https://fishshell.com/"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+doc nls test"
+IUSE="+doc nls split-usr test"
 
 RESTRICT="!test? ( test )"
 
@@ -56,14 +56,21 @@ python_check_deps() {
 
 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
+	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=(
-		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		# 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)"
@@ -90,13 +97,18 @@ src_test() {
 	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 || die
+		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
@@ -105,4 +117,5 @@ src_test() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	xdg_pkg_postinst
 }