gentoo resync : 15.06.2021

3 files changed, 63 insertions, 5 deletions

diff --git a/sys-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index c0b1aa6901de..689df6b630a8 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1,9 +1,10 @@
+AUX ucx-1.10.0_rc5-drop-werror.patch 1822 BLAKE2B 4a0f9310f8cfd6691f0aac4d86570f60da05e5bc747445884b03618cf67fc583faa75f5789a2147dfa0ecf0c0bd651d87526bc3127a6b9eb092037a90927da22 SHA512 677f9c5a85e6971b7ed4dc9b9f71f69574797df048f6cde25a1c3e61700af71975c4ecbba73d6bcd8ccea582905701a4ea839cfa5b4b81312e09cd729317798e
 DIST ucx-1.10.0_rc5.tar.gz 2399950 BLAKE2B f6f78d2a3e0cd7f252354d59b9d667992c5f9f4d8ee4a41356decf4a1ed72382d8ce5213395bc6bacf1d8658f95808082cc0f825230857ddbbff19ed060efa5c SHA512 b772ad030e80bc5b0ab25d590117950d363f5f7ea1b7ed5ce0bba285d0a932205ee4d73705c094cef077c751b1cf8b6efdd4608c7df6b39d813771a0a31460ac
 DIST ucx-1.2.2.tar.gz 1513611 BLAKE2B 488b9b3cecc2c617b1209036e1342e4378459db6a5e93eab1d88dfe80cb0d9c8013c767413206f0fbd0105557ed89994ab510421068d709101336a7b3d2eac5e SHA512 515c382826310b9aa7179ab19ceb76a881a41e6786514219b7f703c6144fa57ca141bceb3b80523ae1b4e2a4b13e9abcb9df063612b376d894c5cd81cdc00571
 DIST ucx-1.3.0.tar.gz 1707317 BLAKE2B 740ab240663a26fde8abe631416dae6233febf3c587ba6bb7b27a9cb0aa041540ce71e106bb3c5618a719de66d479055961908b67125df61a4c7696999c0affb SHA512 0a2e32985e0225fc4ad15dbb1c422dba1d5552638e7329d67572924502e61e1a481ce30cde5ccc83c663fb4ec643df83efc08aed164dfbce6cf38d66a16b3e42
 DIST ucx-1.5.2.tar.gz 1844416 BLAKE2B 2e0296e34d8116a79c545fb3371dda1746517a18cc75f94da5d1f9420c7a74752839d5a3a07a61a2e91021baa87a26d02ab24554316351db9ba76721a18a5244 SHA512 7f11014eb26df342fc8f0914d323f08f4c19ea21e98e18f0a4ec18b7004299687f91daa8ee654ecee716ece6d4d6de5c9714c548768b1d44551b6be6195e2e9b
 DIST ucx-1.9.0.tar.gz 2467338 BLAKE2B 4d2d18c530f99a56baeb1dec88a7dba813970d3f501eb08f637dc7cefcfe5e564bc121e50c1842ea94e927a0fd657847c571241e3dd9601cdde207729d32d721 SHA512 2e8507e9cbba9ea445efdf8be5b5128dfc76cce30111805e9f7a5618bbbbb77d2bb449b6ad5e415f086b3156b63128306671d3a906583248cde720edb4241c67
-EBUILD ucx-1.10.0_rc5.ebuild 719 BLAKE2B 3927fd32521073fde66d525ce636e40e711f9a42fed7460559c2f9fbe70337135632543449250786758eb386f0afbb9545a896a43665d32fe921cebbd273ab8f SHA512 57efc7274dbb8b59bfe0552a009fda76232904240ff5757d7bd58b8460afd003c04dbd631fe291afc9fd5daa730c0ba07b3f3e0863a4e3138a405c92bb3a1b74
+EBUILD ucx-1.10.0_rc5.ebuild 780 BLAKE2B 53ead7ba1b78df6a996d8a00e3bcd43425062b4f036ebf94156a5822a90472ab4d9e94056d0ca7e4b377207e2ee9467fb6eb683ba0cfdb4e0f057adfbe3bbf29 SHA512 15aaf4479f078f1cda81bc13050e02cd974ab319a150103b406898f9c7edf34bb2743d1788b707db35f6ae47a2500f9f40b1b1a5d1a88a8206b341a9efb40d13
 EBUILD ucx-1.2.2-r1.ebuild 657 BLAKE2B 0296b5fb569ebe585f28ad21a93db38ae8f7e067485bd2bde52e59ef1c55550b4580bb5fb7e3d3749d834fb98deca7992fb27fde1935f7ee416512a6614711e5 SHA512 18f24525c15aeb5c58488577a1fa895d11bd37dca8d18508fa3db09f6be142f7afc147d8b0d6014abcfcc3f1651b23ffc2436a5db16021fcde0ae23277508e30
 EBUILD ucx-1.3.0.ebuild 521 BLAKE2B 424edb7396cd501bfebaace337b0ffdca591e784b020d1f59ac768c576bb45177ace636584ddee803112ebfaf34c3bff11316fde49aa12ba0e923cc266ab8b8e SHA512 505e9fd473b6011b65b32ef657f2dd328e00647409b5ad5e9f1b4aa10ceb734eeb25ee8eaf7b8d70b5b5cce199ce546bf60bb2978b574beec7987f8a2b497d88
 EBUILD ucx-1.5.2.ebuild 608 BLAKE2B d6cd8284f1ba783ea6ef3471d6779859c3af572834b387a123e1829fc01240ab6a476188d290cbc593a07c0af3129c8492594a0947db70e3dc50eb881d5da351 SHA512 03fae77ea4880763d65f7a5332800438c7dcf9a9c6345fa31f486c4770be249012c05791e39e2e8e8e96cc6d6abad967d539f9cc2f5e80950414e770294d543c
diff --git a/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
new file mode 100644
index 000000000000..7a6894fe6194
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/789762
+
+From 18df3302b256bce6f61d83a58b2afbc8d788ad5c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 01:40:48 +0000
+Subject: [PATCH] Drop -Werror
+
+---
+ bindings/java/src/main/native/Makefile.am | 2 +-
+ examples/Makefile.am                      | 2 +-
+ test/apps/sockaddr/Makefile.am            | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/java/src/main/native/Makefile.am b/bindings/java/src/main/native/Makefile.am
+index 73f9940..6616dae 100644
+--- a/bindings/java/src/main/native/Makefile.am
++++ b/bindings/java/src/main/native/Makefile.am
+@@ -64,7 +64,7 @@ libjucx_la_SOURCES = context.cc \
+                      ucs_constants.cc \
+                      worker.cc
+ 
+-libjucx_la_CXXFLAGS = -fPIC -DPIC -Werror -std=gnu++98
++libjucx_la_CXXFLAGS = -fPIC -DPIC -std=gnu++98
+ 
+ libjucx_la_LIBADD = $(topdir)/src/ucs/libucs.la \
+                     $(topdir)/src/uct/libuct.la \
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 05cde27..76c3b18 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXAMPLE_CUDA_CFLAGS = $(CFLAGS_PEDANTIC)
+ EXAMPLE_CUDA_CPPFLAGS =
+ endif
+ 
+-EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Werror -Wl,-rpath,$(libdir) \
++EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Wl,-rpath,$(libdir) \
+                      $(EXAMPLE_CUDA_LDFLAGS) $(EXAMPLE_CUDA_CPPFLAGS)
+ 
+ installcheck-local:
+diff --git a/test/apps/sockaddr/Makefile.am b/test/apps/sockaddr/Makefile.am
+index 7ce7a01..2e4ad47 100644
+--- a/test/apps/sockaddr/Makefile.am
++++ b/test/apps/sockaddr/Makefile.am
+@@ -12,7 +12,7 @@ noinst_HEADERS = \
+ 	sa_util.h
+ 
+ sa_CXXFLAGS = \
+-	-std=c++11 -g -Wall -Werror
++	-std=c++11 -Wall
+ 
+ sa_CPPFLAGS = $(BASE_CPPFLAGS)
+ 
+-- 
+2.32.0
+
diff --git a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
index 1d3c4a64a113..b1b15f27d9e1 100644
--- a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
+++ b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 inherit autotools
 
+MY_PV=${PV/_/-}
 DESCRIPTION="Unified Communication X"
 HOMEPAGE="https://www.openucx.org"
-
-MY_PV=${PV/_/-}
 SRC_URI="https://github.com/openucx/ucx/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+numa +openmp"
 
@@ -22,7 +22,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0_rc5-drop-werror.patch
+)
 
 src_prepare() {
 	default