From 3811bc3072bf19e2be351d2c63f81532945c0f21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Jul 2018 18:58:21 +0100
Subject: gentoo resync : 21.07.2018

---
 app-shells/fish/Manifest                                     |  3 ++-
 .../fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch | 12 ++++++++++++
 app-shells/fish/fish-2.7.1.ebuild                            |  8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch

(limited to 'app-shells/fish')

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c4609b03f353..86e84a9868e8 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,6 @@
+AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969a01c476e026777cdb5b98d367ecf05599f0471da6f79901ebc1f3a672ca78f4c2216d3c1ff121fb0624bf2498be08685f2f6eac1528d20 SHA512 05f859c9d32b0003b489088054828f9ee9aba282ea6d2e6c659e4896e2b731e4cb8c2c524cfe5247784607a7c0bb781f3d918a22d5de69f5d9fceaa3e3c1a38b
 DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 EBUILD fish-2.6.0.ebuild 2089 BLAKE2B 93e47993b0fbf6efad4f3a3e8bd961e9975285c7fe4b46d54d9d65646f92a3f3079cb220150b930675863a334bcb0c096c5a860d45d7de7e1d0a4ef95a9f31f8 SHA512 f4aa8a54f89a8d5bb0a41dba319f75a713ce52681ca1631b06d96e39f4b52f5f5c441ea7420a3e3ea4049e82aef7dc562bfe45955d51644b8abc6c668633fd88
-EBUILD fish-2.7.1.ebuild 2163 BLAKE2B 4dd296054fa3fd0830a94906d881fd57ae735951b089b340b25b4347cf5ac8e2c8989e10bd3bb7dd0ab1a838319d53beeab85fd46a5a7b2aca54635b2be09e5f SHA512 2f646f6a7ed16b33a474c99227d55dd7035fe97a9cb944570af2eca8d1a4041d2b64fbbaa633609d91a6c92f4cecf5e31edb8ee23785228eb1eacda86ab1a4c1
+EBUILD fish-2.7.1.ebuild 2378 BLAKE2B 7e7b7d5459710160bc364824a6593184ba04d0abe52e069d9390d3c3b26a04057f6245930f06936560b2ce2ad898259307e0080e71d50797be8269d91a474156 SHA512 32316255402e4abcdeed758279ebe03032fb69b25d322588f90b12e03a67c4a8fe361a39ffce7e3a40769d7d3d81dc7ae188e9cbeb1d5146f9e3857191c9b111
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
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
new file mode 100644
index 000000000000..4d3d79ae6a53
--- /dev/null
+++ b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
@@ -0,0 +1,12 @@
+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/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index 657ee7b3e84c..06afa49de51f 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -27,6 +27,8 @@ DEPEND="
 	test? ( dev-tcltk/expect )
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
@@ -48,7 +50,11 @@ src_install() {
 }
 
 src_test() {
-	emake V=1 test
+	if has_version ~${CATEGORY}/${P} ; then
+		emake -j1 V=1 SHOW_INTERACTIVE_LOG=1 test
+	else
+		ewarn "Some tests only work when the package is already installed"
+	fi
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3