gentoo resync : 22.12.2021

3 files changed, 38 insertions, 3 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 8ef00c966980..d2953d2e57ef 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,4 +1,5 @@
 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
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
@@ -8,6 +9,6 @@ DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1
 EBUILD fish-3.1.2-r1.ebuild 1563 BLAKE2B bd2839a8e63f93b61d78b0f1d61996d30ab4e3903f51a0973f142af5685ea9ccd721d848a96faba760d01fd6447b7aab0ca63be6f63539975b1120d60f0fb147 SHA512 5bd0c9df88c49e3f0969e4afa0ccb5da50b9c35df2bac49b7086e3bc9c399d322110e99aac9e985ebab4a31cd99ba2138c03f8e35c5ce63c241762ff0d1ba845
 EBUILD fish-3.2.1-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
 EBUILD fish-3.2.2-r1.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
-EBUILD fish-3.3.1-r1.ebuild 2167 BLAKE2B cfc3e737990c11ef43a9d7f47b2c3e11fa61138026fd0d5cc44e1953c86a31cb7cb2d4e4723b7bb5ae994b4c7704623a6b2fa511d374fd2ae68b112d7e80f425 SHA512 509bae15277b7508d409544ca19ac0c2f93c7afe8037a8b428569bd3697665bdcf8a4a6b6c8ff525450144373a914e6408ca75b64f7faf911f5a8db577f1da66
+EBUILD fish-3.3.1-r1.ebuild 2406 BLAKE2B 5e4850a08702bae48e99d6b4fcad9e0fc30cc003e5e6572b0b6e1473a9dd93eb6add45a5694f52ea500aa7900168e7f4f1a1e5cebea998215955b9d2c4791e5e SHA512 46b1a856a1c008023bcb6dc6b7e0b9f8cfb2332adbc37e651bd17fda6e82289c86489b4cb24b41f8f27ed6b2f15977791cf41af741d4defeed297910a4bf36e1
 EBUILD fish-9999.ebuild 2064 BLAKE2B 2a6e4876ea91343769aec259d000449e51ecf47029df647473b1c47b19c44f6ed0a855ce3dd704a48e9b89e5e9d0ce3f5d6086e879a08f695fa51160a3f333c2 SHA512 f7f1ea48822bf7d01662f8e69393dd5436c809999da11af5f02e2c222a9d4769f00c4c319ef72df4c2e7a1155179ec3afbe8b2de680213d8e043b416a20c8f95
 MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1
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
new file mode 100644
index 000000000000..4c4081d77cfa
--- /dev/null
+++ b/app-shells/fish/files/3.3.1-drop-some-tests.patch
@@ -0,0 +1,26 @@
+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/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
index e24e0866494f..f59329e2387d 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -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"
@@ -30,6 +30,7 @@ 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="
@@ -86,6 +87,13 @@ src_install() {
 }
 
 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
 }