gentoo resync : 29.12.2022

7 files changed, 3 insertions, 217 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 654003f83fca..9699807f9fe2 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,13 +1,8 @@
-AUX 3.3.1-don-t-override-linker.patch 1891 BLAKE2B 7af3726bd0df67feb8f36c308a6a370303b0168691db8f7aa0e6a1dcf4027b45ddabab56deda965e6c74d92c56b9d66c269cc91484f77ddaf148a620bd0365ab SHA512 29b62fa780f0162a0dcfd6f801243e90b979b9917b1c78f783f0563eca8fb7ddb30c4309dbb4e8d23875ddc45b0919a34d48aaa33be49b978decf008605d56bc
-AUX 3.3.1-drop-some-tests.patch 1206 BLAKE2B ee550c04d7f6adb179bf5473b2cbd4e54bfbcf6015480202a85440945ea2d408a6615430f14d6b2831abc64968818b9903318e743ce41e3bb06bc7825403162f SHA512 da39324a5616c29bdbe126292a2e5bd4b680cc584b3d6d4819a5209e6dae32ba3da177c0374539e561f546596f590529be9a13c1b0d2918c838247ba32264dce
-AUX 3.3.1-sbin-path-sh-test.patch 808 BLAKE2B 8ee354287c9f5319edf43217d54f4ca564e607c6c06e3dff04033a9dc2c87a7cf0bb688c49561acd69cf22b2ee59493468bc55d070b4565fc83a9cf7e917308d SHA512 3446b51ae833698dab9b7c163059947f122f4c72c49a8cad8f160a1a912bf57ac41ef4ca706e81bc6563f53f0f4c608b78da3cc66a040697a857554cde65cf5a
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 AUX fish-3.4.1-atomic.patch 2109 BLAKE2B 8b33b8a0d3add15847ea54d5c3f243bc7bb5a8e99e029ee445405304a113217984e68c10088549df4c9cdba967bfda3f09f0dcfae96ce4035594477961410fe2 SHA512 651acf7d0961ed51332f52611e7ec4e6b56808ecd90ad8b2839c4cd9d4573a9d92824f1f3b3dafed9fabc06523cdb2fb4622098b60d4e32b462bc2ce450cc488
-DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981
-EBUILD fish-3.3.1-r1.ebuild 2457 BLAKE2B 5a530482f82025a5488895402b2f7612f29033db93c1f9521396a2941fa40250f512e12a40cfde123a27b9b9cbb4a6b4b1e82f981e7ae9deabf206793e0a8a15 SHA512 b0b5718ff2c16ebd4ac66446419c6efc28da139abbd229b625d888dc6c32d00e834d3a1052433302aa659c1106d1f4a5026e071f285f91814d9dc8a1daba8d04
-EBUILD fish-3.4.0.ebuild 2344 BLAKE2B caf88c7ed5842e726c59460ca0627e6e1418781ba8f4132669759f0cec7e1ee8e22f30cdac4e21ffa0529804be73768d7fc0098c6ed1b95b85c703ea74ea4029 SHA512 92f07b4797cf7bad5f53e69e80774bb6c06fd62da574442d4dd2a648b17f0a6bdafa069cd03f1d1ada89a39b7d9941dee301639166d24381c7ed6c0d424d7dd7
+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
-MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1
+MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203
diff --git a/app-shells/fish/files/3.3.1-don-t-override-linker.patch b/app-shells/fish/files/3.3.1-don-t-override-linker.patch
deleted file mode 100644
index cb67498fd2ba..000000000000
--- a/app-shells/fish/files/3.3.1-don-t-override-linker.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c9ab706be64439d1a03f978d3a47450135c87002 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <ya@sysdump.net>
-Date: Tue, 29 Jun 2021 09:40:44 -0700
-Subject: [PATCH] don't override linker
-
----
- CMakeLists.txt | 18 +-----------------
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fda837cd3..507dc8817 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,22 +56,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
- # Disable exception handling.
- add_compile_options(-fno-exceptions)
- 
--# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and
--# _sys_errlist. They're also faster (significantly so in the case of lld).
--if (UNIX)
--    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
--        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
--    if ("${LD_VERSION}" MATCHES "LLD ")
--        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
--    elseif (NOT APPLE)
--        execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
--            ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
--        if ("${LD_VERSION}" MATCHES "GNU gold")
--            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
--        endif()
--    endif()
--endif()
--
- # Hide the CMake Rules directories in Xcode projects.
- source_group("CMake Rules" REGULAR_EXPRESSION "^$")
- 
-@@ -128,7 +112,7 @@ set(FISH_SRCS
-     src/proc.cpp src/reader.cpp src/redirection.cpp src/sanity.cpp src/screen.cpp
-     src/signal.cpp src/termsize.cpp src/timer.cpp src/tinyexpr.cpp
-     src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp src/util.cpp
--    src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp 
-+    src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
-     src/wutil.cpp src/fds.cpp
- )
- 
--- 
-2.32.0
-
diff --git a/app-shells/fish/files/3.3.1-drop-some-tests.patch b/app-shells/fish/files/3.3.1-drop-some-tests.patch
deleted file mode 100644
index 4c4081d77cfa..000000000000
--- a/app-shells/fish/files/3.3.1-drop-some-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec8844d834cc9fe626e9fc326c6f5410341d532a Mon Sep 17 00:00:00 2001
-From: Fabian Homborg <FHomborg@gmail.com>
-Date: Thu, 14 Oct 2021 18:18:51 +0200
-Subject: [PATCH] Drop tests with resetting match start inside lookaround
-
-This seems to be of little use
-
-Fixes #8353
----
- src/fish_tests.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
-index 3d71877de81..04058b47ba7 100644
---- a/src/fish_tests.cpp
-+++ b/src/fish_tests.cpp
-@@ -5723,9 +5723,6 @@ static void test_string() {
-         {{L"string", L"match", L"-r", L"-a", L"a*", L"b", 0}, STATUS_CMD_OK, L"\n\n"},
-         {{L"string", L"match", L"-r", L"foo\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\n"},
-         {{L"string", L"match", L"-r", L"(foo)\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\nfoo\n"},
--        {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
--        {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
--
-         {{L"string", L"replace", 0}, STATUS_INVALID_ARGS, L""},
-         {{L"string", L"replace", L"", 0}, STATUS_INVALID_ARGS, L""},
-         {{L"string", L"replace", L"", L"", 0}, STATUS_CMD_ERROR, L""},
diff --git a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch b/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
deleted file mode 100644
index ce66e98eb124..000000000000
--- a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f73c8d923e41442cefd5a58498798971282c701 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <ya@sysdump.net>
-Date: Tue, 29 Jun 2021 09:55:14 -0700
-Subject: [PATCH] sbin path sh test
-
----
- tests/checks/type.fish | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/checks/type.fish b/tests/checks/type.fish
-index 85a2d142a..6ce3a4f68 100644
---- a/tests/checks/type.fish
-+++ b/tests/checks/type.fish
-@@ -31,7 +31,7 @@ echo $status
- # Test that we print a command path
- type sh
- # (we resolve the path, so if /bin is a symlink to /usr/bin this shows /usr/bin/sh)
--# CHECK: sh is {{.*}}/bin/sh
-+# CHECK: sh is {{.*}}/{{s*}}bin/sh
- 
- # Test that we print a function definition.
- # The exact definition and description here depends on the system, so we'll ignore the actual code.
--- 
-2.32.0
-
diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
deleted file mode 100644
index 184f01e1dcab..000000000000
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-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 ppc ppc64 ~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 )"
-
-PATCHES=(
-	"${FILESDIR}/3.3.1-don-t-override-linker.patch"
-	"${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
-	"${FILESDIR}/3.3.1-drop-some-tests.patch"
-)
-
-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
-	rm -v tests/pexpects/terminal.py || die
-
-	cmake_build test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fish/fish-3.4.0.ebuild b/app-shells/fish/fish-3.4.0.ebuild
index 0521028bf2b1..761a34b45d20 100644
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fish/metadata.xml b/app-shells/fish/metadata.xml
index 10a596e2416f..984a8917c773 100644
--- a/app-shells/fish/metadata.xml
+++ b/app-shells/fish/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<longdescription lang="en">
 		Smart and user-friendly command line shell for macOS, Linux, and the rest of the family.
 		It includes features like syntax highlighting, autosuggest-as-you-type,