From 99d38fd80dbcd05d7ac05f9fbc86c396bacd5f7c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 6 Apr 2023 05:27:00 +0100
Subject: gentoo auto-resync : 06:04:2023 - 05:27:00

---
 app-shells/fish/Manifest          |   8 +--
 app-shells/fish/fish-3.4.0.ebuild |   2 +-
 app-shells/fish/fish-3.5.1.ebuild | 108 ----------------------------------
 app-shells/fish/fish-3.6.0.ebuild | 121 --------------------------------------
 app-shells/fish/fish-3.6.1.ebuild | 121 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 125 insertions(+), 235 deletions(-)
 delete mode 100644 app-shells/fish/fish-3.5.1.ebuild
 delete mode 100644 app-shells/fish/fish-3.6.0.ebuild
 create mode 100644 app-shells/fish/fish-3.6.1.ebuild

(limited to 'app-shells/fish')

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c709f691173b..bd8820559642 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,9 +1,7 @@
 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 e14f9754485d0ee5e14deb24cdb75c5ebc042a4bc04d04af706705a30900aeea3da876a48167de88ce3734445f4a111dc3f063ed496ef9a3c0b89361e6cf88d9 SHA512 c84ca22211a383df8e6360c2fa6ef63bc43022bdf8c45cde1f8c22c09b30509cd44452a6ba99aa9651639952377bbb9644d606ab514309c220a8bacf512547b9
-EBUILD fish-3.5.1.ebuild 2616 BLAKE2B 51c9c0bae76d788d7462e1f1c67612bb7a21130c2887faad9edebb176f13c88ab2e0fc4bbdde7e1c5068b9dce9e0f645172871d70a82b15f3c57a80c82e2f7b5 SHA512 8cfde08e24c274d5ec2dbdba1f388ea38ae23558b4fb3d3f7a7e7143da6c7a9b2a9e3053268c5bf9d5abb07f2e35bdcf03c63ad7b2191d5b23e0ba0f41efa7de
-EBUILD fish-3.6.0.ebuild 3170 BLAKE2B 3a517161029426887aeb367b9db86bf7a875943bbcd6aeb6313abce4012f180b235ded363dc4ddebdb4f0186b02c7363a4db4915ee9bd057dead95b26f5291f6 SHA512 d8bc1eccfe9b0828d65f4d64889d9f60814b957e0a051decdd9121e5d3fdd8a3b4a83086c7d5b88542c08124e94062640404d812dd951e55244519eccaef22ae
+DIST fish-3.6.1.tar.xz 2866100 BLAKE2B 13a41781c9a7ad093b18d4697c6087ef4c621bdf9cdc23c29ab89514fe990b38461c2323344e884cb95070c98976db1a37615f91281919a4ac36d6ca3312558a SHA512 ee6f5c7699307d515f111c8c4f1633d9eb9703e045a93cfc2fcec722a03cca4ab25e4e09f6fd94ff2d07180d8b37c6ab733323bb2645065fdeb4e94771347597
+EBUILD fish-3.4.0.ebuild 2347 BLAKE2B 3e79acc8d7e668c9f0c10886e7194c4a5cacfe56ea0081aac934c3b4899908a129353c0a82eb7a7b393ff679a3b82799562d02d668abcabe3282f371bcf614cf SHA512 648f603f95856e1ca8b35aef732b29e823ca02261309f15bc7a015abac5fb74c61255a65051a0b5d084376540accdd748e6a4a320eac64d4d1bda98b888070b2
+EBUILD fish-3.6.1.ebuild 3170 BLAKE2B 3a517161029426887aeb367b9db86bf7a875943bbcd6aeb6313abce4012f180b235ded363dc4ddebdb4f0186b02c7363a4db4915ee9bd057dead95b26f5291f6 SHA512 d8bc1eccfe9b0828d65f4d64889d9f60814b957e0a051decdd9121e5d3fdd8a3b4a83086c7d5b88542c08124e94062640404d812dd951e55244519eccaef22ae
 EBUILD fish-9999.ebuild 3170 BLAKE2B 3a517161029426887aeb367b9db86bf7a875943bbcd6aeb6313abce4012f180b235ded363dc4ddebdb4f0186b02c7363a4db4915ee9bd057dead95b26f5291f6 SHA512 d8bc1eccfe9b0828d65f4d64889d9f60814b957e0a051decdd9121e5d3fdd8a3b4a83086c7d5b88542c08124e94062640404d812dd951e55244519eccaef22ae
 MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203
diff --git a/app-shells/fish/fish-3.4.0.ebuild b/app-shells/fish/fish-3.4.0.ebuild
index 3efa32026379..a654ad4ba29b 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
diff --git a/app-shells/fish/fish-3.5.1.ebuild b/app-shells/fish/fish-3.5.1.ebuild
deleted file mode 100644
index cf71ce82dca9..000000000000
--- a/app-shells/fish/fish-3.5.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 readme.gentoo-r1
-
-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 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
-	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-3.6.0.ebuild b/app-shells/fish/fish-3.6.0.ebuild
deleted file mode 100644
index 03c282164a03..000000000000
--- a/app-shells/fish/fish-3.6.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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-3.6.1.ebuild b/app-shells/fish/fish-3.6.1.ebuild
new file mode 100644
index 000000000000..03c282164a03
--- /dev/null
+++ b/app-shells/fish/fish-3.6.1.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_{9..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
+}
-- 
cgit v1.2.3