gentoo resync : 29.12.2022

3 files changed, 0 insertions, 99 deletions

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
-