gentoo auto-resync : 09:09:2022 - 16:40:34

6 files changed, 96 insertions, 1 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 87201e3822d2..5ac31b74f7f6 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index 11541862df17..2113a21f1857 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1,12 +1,16 @@
 AUX ucx-1.10.0_rc5-drop-werror.patch 1822 BLAKE2B 4a0f9310f8cfd6691f0aac4d86570f60da05e5bc747445884b03618cf67fc583faa75f5789a2147dfa0ecf0c0bd651d87526bc3127a6b9eb092037a90927da22 SHA512 677f9c5a85e6971b7ed4dc9b9f71f69574797df048f6cde25a1c3e61700af71975c4ecbba73d6bcd8ccea582905701a4ea839cfa5b4b81312e09cd729317798e
 AUX ucx-1.13.0-binutils-2.39-ptr-typedef.patch 957 BLAKE2B 848012972fd7e2c8469ee47e6f4cd01459fa16bab4afd75c474a71f77824677b8c17d03ab0e0482d6d2ec389d6b9f14e43e5ee8951c6361b0d4fc751a3cf09ab SHA512 c65625d00757c1689b55213d070779f1d3b4462411c50aa989a00a73742f9011329cb08ab9e92ea3635935dc2bd6d28914ba7a495360dccf9f219b7bb5ece293
+AUX ucx-1.13.0-cstdint-include.patch 559 BLAKE2B dfd13c69862ed1d541e706ba9c92286132f48a2d398bc3fd82224e3bb9f3c706dfa90d2f243230a4b004d7cde4378df877bc0b70323cb61d1927a804ff5e5e50 SHA512 d8ec39ee1c30ecac5c559348ddf6137a330a66f9031da1896cffe59490f8c8877b82664b8ed436e8bdf4bf30cc78c187af54be3c09bd06b1662d5128cd26a010
 AUX ucx-1.13.0-drop-werror.patch 835 BLAKE2B eaf0a5a5ae7339e49a74f8382491d9b59a2cd25eff7fa6c7d3b38eb4352106a44c66824a1eac25553ea0d53fee1bfe959a58f95e13a04e3bf01e5aecf9b2cd69 SHA512 504a64f03c258afc41b54f656ba7354258d699141d90954343ed19caef5712dee147bdff148c01a553fc75eb30ecab31227fe9a37be9c85af3a478692527acdb
 AUX ucx-1.13.0-fix-bashisms.patch 1846 BLAKE2B a2fe4b6f0ca98632ab67131aecb70a52bcba23861883f5750c8cea5536ca799b487f0a76dcd99c5d3b370a303feeb06bcec467b24d0db1dde7530e1b34cc5efc SHA512 040aa3740f7317fa32bd9383461a35565521ba0282da6abd55afb76f55beecdb1991cb76dc9e31f568c9cf834c65ff0704f79375611c7b126e2ec8a4fe2c5c25
 AUX ucx-1.13.0-fix-fcntl-include-musl.patch 3007 BLAKE2B 1383a52232d93871f89e5f0ae1eeb24fbb3e07683780b0a6672a0025f4be383baf657240f5ea9f8b635c33830a0ec7bdfda0ecb1417465a8a91e2b8a9756604e SHA512 7607ae95df0649a512b28f93e17beae9246f72bf315b60423cd519281f1dbaccaa97446376cad61b1665e22d3edd2352011c6e059313cb18ac30f6c71e7ac946
+AUX ucx-1.13.0-no-rpm-sandbox.patch 751 BLAKE2B 8144335c3edb2bb99949cd02a79f48088163c19455495a60a15757295c98ae6d8ac550da2ae132336e7825c54683d45e24403ccfb30abb53743ca17ae9bb4723 SHA512 836810338352647860ec56446a8be2d4b6898c558c48c2dfb8b7f9441314a4053a6d8172e334780af652632a7ebb935e9f2031fa04f1a1ebc7f094e2a2fe64f6
 DIST ucx-1.10.0_rc5.tar.gz 2399950 BLAKE2B f6f78d2a3e0cd7f252354d59b9d667992c5f9f4d8ee4a41356decf4a1ed72382d8ce5213395bc6bacf1d8658f95808082cc0f825230857ddbbff19ed060efa5c SHA512 b772ad030e80bc5b0ab25d590117950d363f5f7ea1b7ed5ce0bba285d0a932205ee4d73705c094cef077c751b1cf8b6efdd4608c7df6b39d813771a0a31460ac
 DIST ucx-1.13.0.tar.gz 2770439 BLAKE2B 779bf7913ec1d0f5aebfd12d4eda90c83f6dae746e82bb818c4d981f6f564ecb37b6e003c3718db4ad74f25aa19fcbeb0ff98ed6349e254b7c707b4dda3c8974 SHA512 bea02adeb5c4286df360cfe788b40afde3e0404c659678497b53e753851e091de766f32aef39bd6f76e71802c88f0e0ed49c31af0c908ce2d9f3edc79ed6f933
+DIST ucx-1.13.1.tar.gz 2979566 BLAKE2B c175f876dda923062a1350b2f3939aca1c9ce3b8a0ee2a50bcc35c72b9f622cc7f4b740194dfdf2b28f56050f05cf4305d903ca0fb35496090691097f2f6d02b SHA512 8ca0876b55326deaf9f756ad8b60b2f6b96d8107d8fc4b9c58b3aad99b161b5a6c4c8a64a924ce35899012959c2d4479eac0309bec05227cf06ffc83dbfc2f6f
 DIST ucx-1.9.0.tar.gz 2467338 BLAKE2B 4d2d18c530f99a56baeb1dec88a7dba813970d3f501eb08f637dc7cefcfe5e564bc121e50c1842ea94e927a0fd657847c571241e3dd9601cdde207729d32d721 SHA512 2e8507e9cbba9ea445efdf8be5b5128dfc76cce30111805e9f7a5618bbbbb77d2bb449b6ad5e415f086b3156b63128306671d3a906583248cde720edb4241c67
 EBUILD ucx-1.10.0_rc5.ebuild 787 BLAKE2B e194162df091517e92d11ce58c2c0219eabed5b3e21fa0b4cd8db0abcdf94d1f64165a6b40991513bfb25c17437d84caf0eb823ef6dd05c58f563735b085cce5 SHA512 562b0ce8c4550ecfcb2cd289e4af9cd3c7acf7a91d5e577f7f814381254519bab1e3926aae0eca196450b4ad7fe3980904f7a74356cdf2c8e8f66367b21d7bf5
-EBUILD ucx-1.13.0.ebuild 1153 BLAKE2B e586d7410850e82f67fa4c575ae2424ffa7411ec6728cdb3ab15ac6600ba0b09d2f577a5ef855414e2e86c712da9b5a3fb5b9c86e6477122ed6c2411be41945d SHA512 c104f2f1265d714f49445ee997d5c7a5b2716fa557779ac3314b3c06085d041fce659809ef5723a63e5764a526e5738be15a6ca74212d51feb840550ce0f56fa
+EBUILD ucx-1.13.0.ebuild 1203 BLAKE2B 1f61d78b1b6c7813e915db4dea0c51e7e733bd5ab44a5650468298c5231203317f8390c782fae01b94a9026d64c184b6606d745bc69f6c85deba34b6d49455de SHA512 9b751914d2fa54fb89a9c4bff6a4c5390f7642ff8c92dd240d61c1528340e439f7f85bf9b3b3c95b7d34f1eb2007270c77a8096d41eeccc812c608bd1b459fbe
+EBUILD ucx-1.13.1.ebuild 1257 BLAKE2B 4e113648e84a27b76add36e00da408a29a21787ec57ed93c42a1747a657143b6269aeedbfe2c9e5c023cdacdb9dc53fcb86c48f8ed176d43426291f13a760b74 SHA512 858f12dce17c5a77289ad464bb6d64f86d27da9539ecb608974ae6eda0ed7d92c0ee85274c1c34f7503bc09e5e359a7a393e9f53a624e577a45893e3fa8b53c6
 EBUILD ucx-1.9.0.ebuild 608 BLAKE2B c6b01f62989d841ccc7be1dffb3ddf356d8f59bc5621bef514a300984d9f63317cb5c5b51cbf031689e292d262477082b7c4365fb899c0ddab91f6541abe8e5d SHA512 cbb8fe1196f36f2d68803c004ad6343378ff1a8eb693249c5bbe0c196fb9b72d5dddead0def92857c1afd771d440ccaed287b106d878e6424cc0f694b2a83d5e
 MISC metadata.xml 415 BLAKE2B 314b20a7f39116af997a15309552142ad7141940d12646a6e4ddca3131b53b62d62522915e353374cf0667af236ff92d8929e81291ed090eec3f49a0b8cfc6fe SHA512 c86ba7f79718e898e7c45856029d6bdb4b638a23af5a3362202d1ff8d890f79696535fee123812428f4bfe3b91408b8a5c9ebb8172dfd01ae65e63feeac9a6d0
diff --git a/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch b/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch
new file mode 100644
index 000000000000..890c630c5792
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch
@@ -0,0 +1,20 @@
+https://github.com/openucx/ucx/pull/8517
+
+From 8f70e898b43d1bde1ff3fae56bf0ac5aac285997 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 9 Sep 2022 11:35:03 +0100
+Subject: [PATCH] TEST/SOCKADDR: Add missing <cstdint> include for GCC 13
+
+Closes: https://github.com/openucx/ucx/issues/8347
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/apps/sockaddr/sa_util.h
++++ b/test/apps/sockaddr/sa_util.h
+@@ -7,6 +7,7 @@
+ #ifndef SA_UTIL_H_
+ #define SA_UTIL_H_
+ 
++#include <cstdint>
+ #include <iostream>
+ #include <sstream>
+ #include <string>
+
diff --git a/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
new file mode 100644
index 000000000000..c387d640dff6
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790338
+--- a/src/uct/ib/Makefile.am
++++ b/src/uct/ib/Makefile.am
+@@ -13,7 +13,7 @@ libuct_ib_la_CFLAGS   = $(BASE_CFLAGS)
+ libuct_ib_la_LIBADD   = $(top_builddir)/src/ucs/libucs.la \
+                         $(top_builddir)/src/uct/libuct.la
+ libuct_ib_la_LDFLAGS  = $(IBVERBS_LDFLAGS) $(NUMA_LIBS) -version-info $(SOVERSION)
+-libmlx5_ver           = $(shell (rpm -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && rpm -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
++libmlx5_ver           = $(shell (false -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && false -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
+ 
+ noinst_HEADERS = \
+ 	base/ib_device.h \
diff --git a/sys-cluster/ucx/ucx-1.13.0.ebuild b/sys-cluster/ucx/ucx-1.13.0.ebuild
index 983466a7cf98..309fe0901b82 100644
--- a/sys-cluster/ucx/ucx-1.13.0.ebuild
+++ b/sys-cluster/ucx/ucx-1.13.0.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13.0-drop-werror.patch
 	"${FILESDIR}"/${PN}-1.13.0-fix-bashisms.patch
 	"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch
+	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
 	"${FILESDIR}"/${P}-binutils-2.39-ptr-typedef.patch
 )
 
diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild
new file mode 100644
index 000000000000..e3b3021121c9
--- /dev/null
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Unified Communication X"
+HOMEPAGE="https://www.openucx.org"
+SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+numa +openmp"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	numa? ( sys-process/numactl )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.13.0-drop-werror.patch
+	"${FILESDIR}"/${PN}-1.13.0-fix-bashisms.patch
+	"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch
+	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
+	"${FILESDIR}"/${PN}-1.13.0-binutils-2.39-ptr-typedef.patch
+	"${FILESDIR}"/${PN}-1.13.0-no-rpm-sandbox.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	BASE_CFLAGS="" econf \
+		--disable-compiler-opt \
+		--without-fuse3 \
+		--without-go \
+		$(use_enable numa) \
+		$(use_enable openmp)
+}
+
+src_compile() {
+	BASE_CFLAGS="" emake
+}