gentoo resync : 16.04.2022

3 files changed, 72 insertions, 1 deletions

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bc1cc6d76051..e3a25b3e8083 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -2,11 +2,12 @@ AUX 3.3.1-don-t-override-linker.patch 1891 BLAKE2B 7af3726bd0df67feb8f36c308a6a3
 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 2345 BLAKE2B 038e2f6ca9e1cfe106a55a26b1b58979420dc680595dc70a66469976174685fcae448b145963ebaf90a31c3b66aef38d6133b3b276f97eeac834332b1084f3f9 SHA512 05f040d1d5a96ec5f3e297c491d46932e5cd77b75ac3fcacbab5f7dc1a819848efe7fcb2f2c2003563bc5dcbb2e5f953a518b0d6aaa2ef016813316a840954bd
-EBUILD fish-3.4.1.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
+EBUILD fish-3.4.1.ebuild 2443 BLAKE2B 7044cb0d478e8aa710dae2fe4e0282e55ff5f22b68fc6ca41200374afe674744d7df2144b0d7b7daa0f088b52b38aabec5d05cc800ced982539a02da0aa426f9 SHA512 f0a08c39d647b4901987654bf497913c95bc850bdd4a2fcbb78037fee1a3c0c8c5a1cdadbed700c0570458dd136c6ad3686adc57029759624226b494ac7c2194
 EBUILD fish-9999.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
 MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1
diff --git a/app-shells/fish/files/fish-3.4.1-atomic.patch b/app-shells/fish/files/fish-3.4.1-atomic.patch
new file mode 100644
index 000000000000..a12e069a7433
--- /dev/null
+++ b/app-shells/fish/files/fish-3.4.1-atomic.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/836951
+Taken from https://github.com/fish-shell/fish-shell/pull/8851
+
+From a3eb41ca882cc390b656515dd668a6816f745121 Mon Sep 17 00:00:00 2001
+From: Raymond Wong <infiwang@pm.me>
+Date: Mon, 4 Apr 2022 01:14:26 +0800
+Subject: [PATCH 1/2] cmake: alter check for 64-bit atomic operation
+
+Signed-off-by: Raymond Wong <infiwang@pm.me>
+---
+ cmake/ConfigureChecks.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
+index bc190de054f..924aea1015a 100644
+--- a/cmake/ConfigureChecks.cmake
++++ b/cmake/ConfigureChecks.cmake
+@@ -255,10 +255,10 @@ int main () {
+ check_cxx_source_compiles("
+ #include <atomic>
+ #include <cstdint>
+-std::atomic<uint64_t> x (0);
++std::atomic<uint64_t> n64 (0);
+ int main() {
+-uint64_t i = x.load(std::memory_order_relaxed);
+-return std::atomic_is_lock_free(&x);
++uint64_t i = n64.load(std::memory_order_relaxed);
++return std::atomic_is_lock_free(&n64);
+ }"
+ LIBATOMIC_NOT_NEEDED)
+ IF (NOT LIBATOMIC_NOT_NEEDED)
+
+From 2fe9bfe0a6c1a821dabbf52af35c8eb2cd6e029b Mon Sep 17 00:00:00 2001
+From: Raymond Wong <infiwang@pm.me>
+Date: Sun, 3 Apr 2022 14:01:15 +0800
+Subject: [PATCH 2/2] cmake: check for 8-bit atomic operation
+
+Fix building on RISC-V.
+Closes #8850.
+
+Signed-off-by: Raymond Wong <infiwang@pm.me>
+---
+ cmake/ConfigureChecks.cmake | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
+index 924aea1015a..6562d324f45 100644
+--- a/cmake/ConfigureChecks.cmake
++++ b/cmake/ConfigureChecks.cmake
+@@ -255,10 +255,13 @@ int main () {
+ check_cxx_source_compiles("
+ #include <atomic>
+ #include <cstdint>
++std::atomic<uint8_t> n8 (0);
+ std::atomic<uint64_t> n64 (0);
+ int main() {
+-uint64_t i = n64.load(std::memory_order_relaxed);
+-return std::atomic_is_lock_free(&n64);
++uint8_t i = n8.load(std::memory_order_relaxed);
++uint64_t j = n64.load(std::memory_order_relaxed);
++return std::atomic_is_lock_free(&n8)
++     & std::atomic_is_lock_free(&n64);
+ }"
+ LIBATOMIC_NOT_NEEDED)
+ IF (NOT LIBATOMIC_NOT_NEEDED)
diff --git a/app-shells/fish/fish-3.4.1.ebuild b/app-shells/fish/fish-3.4.1.ebuild
index 45bc18a52822..9e86384466cc 100644
--- a/app-shells/fish/fish-3.4.1.ebuild
+++ b/app-shells/fish/fish-3.4.1.ebuild
@@ -49,6 +49,11 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# bug 836951, drop on next version bump
+	"${FILESDIR}"/${PN}-3.4.1-atomic.patch
+)
+
 python_check_deps() {
 	use test || return 0
 	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"