gentoo resync : 03.03.2021

2 files changed, 0 insertions, 43 deletions

diff --git a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
deleted file mode 100644
index 4d3d79ae6a53..000000000000
--- a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
-index 8595120d5..24cf9a9e1 100644
---- a/src/builtin_printf.cpp
-+++ b/src/builtin_printf.cpp
-@@ -444,6 +444,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc
-         case L'X':
-         case L'd':
-         case L'i':
-+        case L'o':
-         case L'u': {
-             fmt.append(L"ll");
-             break;
diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
deleted file mode 100644
index 8b9540ffc610..000000000000
--- a/app-shells/fish/files/fix-histfile-test-on-ppc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001
-From: David Adam <zanchey@ucc.gu.uwa.edu.au>
-Date: Sat, 5 Jan 2019 15:59:25 +0800
-Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on
- 32-bit platforms
-
-Rather than killing the process with close, read EOF after sending the
-"exit" command and wait for OS cleanup (per the expect examples).
-
-Not cleaning up with wait caused expect to crash on all 32-bit platforms
-including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b".
-
-64-bit platforms were not affected, for reasons that are not clear.
----
- tests/histfile.expect | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/histfile.expect b/tests/histfile.expect
-index 81ca11276..7ac056235 100644
---- a/tests/histfile.expect
-+++ b/tests/histfile.expect
-@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" {
- # =============
- # Start by shutting down the previous shell.
- send "exit\r"
--close $spawn_id
-+expect eof
-+wait
- 
- # Set the fish_history env var.
- set ::env(fish_history) env