From ee0c4d5e506a6c64994a15c3af5cf1ca22045567 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 27 Nov 2023 22:51:10 +0000
Subject: gentoo auto-resync : 27:11:2023 - 22:51:09

---
 sci-libs/gloo/Manifest                         |  3 +-
 sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch | 19 ++++++++
 sci-libs/gloo/gloo-2023.01.17-r1.ebuild        | 64 -------------------------
 sci-libs/gloo/gloo-2023.01.17-r2.ebuild        | 65 ++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 65 deletions(-)
 create mode 100644 sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch
 delete mode 100644 sci-libs/gloo/gloo-2023.01.17-r1.ebuild
 create mode 100644 sci-libs/gloo/gloo-2023.01.17-r2.ebuild

(limited to 'sci-libs/gloo')

diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest
index 455dc81171a2..10bbde4f82c7 100644
--- a/sci-libs/gloo/Manifest
+++ b/sci-libs/gloo/Manifest
@@ -1,5 +1,6 @@
 AUX gloo-2022.05.18-gentoo.patch 3073 BLAKE2B 0d6b4b4f87d8b8507b8ed06b3ea1548f750eac0bbebb1618950ea2fc4c0eff98b46d5561d2eb8b1011e6ea87a1d51d2791c712fc46192f8957652a2017876dc9 SHA512 5b3ee22b5e4d08002798cdd940b962f179b24cce02fc5b1d3e1d42d8fb747381b5932467c0dbda12a2e37eeb85154198d53ec734256a820111e7e929762a841e
 AUX gloo-2023.01.17-cuda.patch 460 BLAKE2B 646004184eed2acbfb0cb54bdfadaa6cb4b3ac51b4323a6e16e825a3eabf0274061dcd8c1cfc996c72d75645176f3f798667caae33006d387bbd6ac1d00d4aa1 SHA512 649969154c42ef381c8220ea891ff3175292b2941efef0ce166bef137b1fb08d2f262de0961e3ce11661307a56c2338e7a7f81944e71b93aa5210bc2a7603caf
+AUX gloo-2023.01.17-ssl3.patch 764 BLAKE2B e4abed8dc9f891da2a97c80e4aa3c7f68beed1143a039f22ed6add80cdb16b0543086b0d3c54628904743dd7901caa11a3281d9e574a256132ee3a1f4d52bb28 SHA512 259048a70a9ae9090b6e6631aba5787ce68b12facbf0d0c0200121ace780ffe30990b9240ba817f361e46025ec2cf22f3b6f06d8df8797848a16f8e4167253d2
 DIST gloo-2023.01.17.tar.gz 252199 BLAKE2B 66b5fc6786a4c07aa639a30036a21d86f43c1577a950934f558051f241d198dd3e0d7bd9da39835c5e3d617a754164cb77ae30b9bc284b0119436bf0a26f5000 SHA512 d39102ed00c813576066b755730e367337f2558a4223fe8dd127bd48882db6a97c67522782f7e7b00c36198ccd2096e61e84382358783d2edb1ca4ee55123344
-EBUILD gloo-2023.01.17-r1.ebuild 1411 BLAKE2B 4dd98ef23aeda97fdcb5b5995fcd2cc824c96b7b23b8f624f5b405a6cd66b748844de68b3b4ded7aef7a8c97d6196a9ffd53018ec7fa32098847088ddb822fed SHA512 6aa52eeb82b0c965d8da0f6a4c884e50a6d711457becdc257b66bbed93520fed576fb8b7ff8e3c8550b0ba9f43e74f78318579050d60c909bed20e7c33090c1a
+EBUILD gloo-2023.01.17-r2.ebuild 1442 BLAKE2B 0f9b073359f28a376c1007af3584a60430857d4e2a2a5f1217489ec379130fcafe192bef0d894d5c2e44d910ed63412e50cc5591c410417bbb6af120f010ada3 SHA512 d8c3a6b5523b6ba4d4604b67772c7e5bb37f06a384953b8233f75526a2b9b80eaf1b75e3f25b9f9db252ff91c6333b924702b15758958c51cc24b88b8ef5aef3
 MISC metadata.xml 539 BLAKE2B a003088828ee5ddab36b1b1796342e5ae93d1accae3c478c6030ae35b44dd64d33f637010b28c2bd56d0c70c7817d8601a794338d790964ee2e31e532e4e5618 SHA512 5828cdbfa19220b3bb07d964ad8d1a20031d361dff0ea319352f6b2e9ed511aefb5de3d8cae03f1b4f479b552de2a516cfea70d95d147a922a8761064bb4e875
diff --git a/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch b/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch
new file mode 100644
index 000000000000..f01beafa4596
--- /dev/null
+++ b/sci-libs/gloo/files/gloo-2023.01.17-ssl3.patch
@@ -0,0 +1,19 @@
+--- a/gloo/CMakeLists.txt	2023-11-27 22:39:53.709670525 +0100
++++ b/gloo/CMakeLists.txt	2023-11-27 22:42:29.784250524 +0100
+@@ -77,7 +77,7 @@
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+   set(GLOO_HAVE_TRANSPORT_TCP 1)
+   if(${USE_TCP_OPENSSL_LINK} OR ${USE_TCP_OPENSSL_LOAD})
+-    find_package(OpenSSL 1.1 REQUIRED EXACT)
++    find_package(OpenSSL 1.1...<4 REQUIRED)
+     set(GLOO_HAVE_TRANSPORT_TCP_TLS 1)
+   else()
+     set(GLOO_HAVE_TRANSPORT_TCP_TLS 0)
+--- a/gloo/test/CMakeLists.txt	2023-11-27 22:42:55.969844380 +0100
++++ b/gloo/test/CMakeLists.txt	2023-11-27 22:43:14.873551147 +0100
+@@ -1,4 +1,4 @@
+-find_package(OpenSSL 1.1 REQUIRED EXACT)
++find_package(OpenSSL 1.1...<4 REQUIRED)
+ 
+ set(GLOO_TEST_SRCS
+   "${CMAKE_CURRENT_SOURCE_DIR}/allgather_test.cc"
diff --git a/sci-libs/gloo/gloo-2023.01.17-r1.ebuild b/sci-libs/gloo/gloo-2023.01.17-r1.ebuild
deleted file mode 100644
index a2c76198f848..000000000000
--- a/sci-libs/gloo/gloo-2023.01.17-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake cuda
-
-CommitId=10909297fedab0a680799211a299203e53515032
-
-DESCRIPTION="library of floating-point neural network inference operators"
-HOMEPAGE="https://github.com/facebookincubator/gloo/"
-SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda libuv mpi redis ssl test"
-
-RDEPEND="
-	cuda? ( <dev-util/nvidia-cuda-toolkit-12:= )
-	libuv? ( dev-libs/libuv )
-	mpi? ( virtual/mpi )
-	redis? (
-		dev-db/redis
-		dev-libs/hiredis
-	)
-	ssl? ( dev-libs/openssl:0/1.1 )
-"
-DEPEND="${RDEPEND}
-"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="test" # For some test the network is needed
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2022.05.18-gentoo.patch
-	"${FILESDIR}"/${P}-cuda.patch
-)
-
-src_prepare() {
-	eapply_user
-	cmake_src_prepare
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_CUDA=$(usex cuda ON OFF)
-		-DGLOO_USE_CUDA_TOOLKIT=$(usex cuda ON OFF)
-		-DUSE_LIBUV=$(usex libuv ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF)
-	)
-	if use cuda; then
-		mycmakeargs+=(
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	fi
-	cmake_src_configure
-}
diff --git a/sci-libs/gloo/gloo-2023.01.17-r2.ebuild b/sci-libs/gloo/gloo-2023.01.17-r2.ebuild
new file mode 100644
index 000000000000..8518665b3cd4
--- /dev/null
+++ b/sci-libs/gloo/gloo-2023.01.17-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake cuda
+
+CommitId=10909297fedab0a680799211a299203e53515032
+
+DESCRIPTION="library of floating-point neural network inference operators"
+HOMEPAGE="https://github.com/facebookincubator/gloo/"
+SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda libuv mpi redis ssl test"
+
+RDEPEND="
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12:= )
+	libuv? ( dev-libs/libuv )
+	mpi? ( virtual/mpi )
+	redis? (
+		dev-db/redis
+		dev-libs/hiredis
+	)
+	ssl? ( dev-libs/openssl:0/1.1 )
+"
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="test" # For some test the network is needed
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.05.18-gentoo.patch
+	"${FILESDIR}"/${P}-cuda.patch
+	"${FILESDIR}"/${P}-ssl3.patch
+)
+
+src_prepare() {
+	eapply_user
+	cmake_src_prepare
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DUSE_CUDA=$(usex cuda ON OFF)
+		-DGLOO_USE_CUDA_TOOLKIT=$(usex cuda ON OFF)
+		-DUSE_LIBUV=$(usex libuv ON OFF)
+		-DUSE_MPI=$(usex mpi ON OFF)
+		-DUSE_REDIS=$(usex redis ON OFF)
+		-DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF)
+	)
+	if use cuda; then
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
+	cmake_src_configure
+}
-- 
cgit v1.2.3