7 files changed, 15 insertions, 244 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e7be0ee125e2..b67391436673 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 60cb8174af1d..12d39a2efb8a 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -1,13 +1,8 @@
 AUX ibacm.init 205 BLAKE2B 3e955dbdb0f5fa24323ebca526a2a381e0aed49ac7a8a65ed18803e47b1be54258334201972697bd339c32f85b5f394be0cc3772671d74d4677c3e8874cbcdfa SHA512 028f3adde610ec3a0d02f9041981f3abc5b32bab7da8abfa0c4265e46fa9dcdbc13ffab2f450814930449d72cc00c463e00a693beedc87fc77fec44e990b2525
 AUX iwpmd.init 205 BLAKE2B a876a969b02c20bdb4f6a3dbf433a7ed3b5dccacf44821c825d8ab5a4fc33d7d60e01e6b265317ce6029b96927448506622c86047dfc1901b2bd1fbf8644735f SHA512 b011797925b89554a90d834a3da2d65ba3b8962f639184bbe72de98f204fe207a76073686178ee8b8456c3a6ee690bb56acfd68e02b090b99c35c55cb44d0cd7
-AUX rdma-core-38.0-musl.patch 914 BLAKE2B 26f8b9f9fa55d4fbdc7a2fc3f4b6a6d66481af21fcdfd05312f7a31aa5809f8dd516fd284895eac372ac1082b65d4c3ee0670ecf8ef24f83715746ef9fcf1196 SHA512 e5029eeb4ca63d26ecff2f41b97bb7e9394e7aeaccf9101fac28be415e3a03bf12913b5b41da3de824beddafabb7385ac5a530deb40718a472cdb403f92dd007
 AUX rdma-core-39.0-RDMA_BuildType.patch 314 BLAKE2B 86a44ca599ad3e02908640d469500899de27fe874c3bb49c87589bb36d0aebff097e941eb8e76f365251fca3344eecc3520fe2005a0bedc4aeeec2f0003b6edf SHA512 fc3594e8160710f12f83279ee03193e8dd03c6318d67054f61c696d2b5946bfb1907481d53200391328cc37ca5a6e80537d4d70ee52a77ac6bbfb8836d39fbb6
 AUX srpd.init 535 BLAKE2B 71b1c00f804ad2d5d5919044eda7dfd5ca273a8bbb2debe31cf7759b6122007f5dca5da521eca882a4c48011a9cf78433c7a0fbda4a9d7d39ab89fb6f72b44f7 SHA512 3fdeb9cf5cddcf9a9fcb516c757eb82aee6eb3651e43b8579ed4a909f9b90863400e1a1bde46bb3a3ce6aeb477c40709c828739c87b3fa80d2bd8d179fcd295d
-DIST rdma-core-38.0.tar.gz 1760189 BLAKE2B ab028ce9367353201748f19d05d4d02170920b155b7ebb3584043729422e377cfb4ae29ed442ce7f965faa2470fe558499e9b2e7da51f282fa65ab029d4bcaa9 SHA512 98b3e3d26675891d54652817851f172855443faf6950b5c17177f10f5b3b197778590ad0e9640ecceaba17cf4aceb276ddb145ab46c1f6af9d2f6954688c3239
-DIST rdma-core-39.0.tar.gz 1762652 BLAKE2B 7fed2be57624451c660120c6360fedd15ffaff36608879a329c3f078b647cb325c94fc949ef14f99b3be8b43ffddee6759e7da2f88287adf4dee413658afb5db SHA512 a003cae24cff6791a6281b1ab7cc1823fb08a74e03231bf846f8ebbd5fa447c8dd900357493108f6a2b22fd5dabd657fe42e1ce2f65a01746ce47a3222815459
 DIST rdma-core-41.0.tar.gz 1784540 BLAKE2B 3c153dcc3563427f32fa32d9a31527635c6bb3e63297c201f30de1328a68ac73ecb3af89074dfcc27d92c640d14d8d8ec61c001659d18336a4156cf8ed22996c SHA512 d8c1210ca078ea53879cee42c838cc88bcc98430471ae609d8c4a25218dbfd63a70f5bbd4e9ba6efabdfc467f7d5796ce618ec22013d414f17502d1257601a80
-EBUILD rdma-core-38.0.ebuild 2448 BLAKE2B 090f6b08a69860660d408a992637ca3e169483179cf2a711f85eef36e083b1f3ebf418a3e5ca803068a0405ca9debf5d0248d797af51962d727489c23ea346e4 SHA512 515fda3b404e98e0da4f21496657e8c375b5d22c452504bbe29bf5f0bc40ad125f565184730592d9a423559828906a6bf0038f73c713f81de0ed043a96c9d341
-EBUILD rdma-core-39.0.ebuild 2472 BLAKE2B f055ae93485aebe8fb916849b6d7c91a423fc7145a4ea572a47dce600c5f83dbb0ae27a53c3070f5dacc8bd05927a58b77d36d7963ee5352967a67da9a5f9247 SHA512 152476c57ba02cb370632dbfc388eff32cdb6286c544e41a38a097afef97d5be3a0419b9f887b9c94b8f1f0384bd56f399ef50883c56e9810740f1abc24c5f96
-EBUILD rdma-core-41.0.ebuild 2587 BLAKE2B efb123f796caedae389ddda11419af6d4f54fb704d9b4f2fdb4acf813c3e568a031acdccaab0e56617fb78ef12006cf92ed73bd8ee3dd0830136ea9d6c94f8eb SHA512 a79347a0042b919b65942c13a6353418fa8a74aa2548879b31cf2827a529c743b380941a032f75c30e017fa502ca8ee9ea56ac28b93bcdde5566250a6c2ddfe5
+EBUILD rdma-core-41.0.ebuild 2586 BLAKE2B 74f4c981476e0e000fd8bf7f01ae73ce3dea63f190843e6adce48f8a3ce56a0daf05e60ee6ceee58041764ff83c453bad5ce842c99938a630c8695d4438db733 SHA512 1e3558027f609bd19f173c045d34589dcaf968fb9dfb7770c29687baaca4551439c38d8774db477a22f3d7d70d2c7f3ff9c4489988efef2bcfd368f29a1e9d39
 EBUILD rdma-core-9999.ebuild 2418 BLAKE2B d2fa179a54139bcfd93f0c8bdbd9be1435a9df8df3b0fd7df671397704aa07495128ce32e7526cc76fa63e75cb6efc88906a0e405a2482aec98626027bfaedfe SHA512 98e1deb03db9be7d8cf69426deef07ced89999c84d63a903a6015717ec799d46dfc8207c0e1ced3df1b09b01d42e870df49f1371643ddf758d619013c3aec620
-MISC metadata.xml 560 BLAKE2B f76b4e81668b49b5bb5c3719c2bc2ae9e2d649d827193b60961864924fba1861865d3a55dd14d38f2d58fae0ce49bae8144946600233c63baf4b9a88b2422a06 SHA512 bde881700dedb23708d08b09b0e5317e49729323e8fd4acd2be90c74ddbc837adc228b7831920c8140b8162d494d02b0ccfb8244dfd545aca3cadde418370a6e
+MISC metadata.xml 516 BLAKE2B 2db35084ef333282bd361a31f9e000a4ced15a1d720ea032c795a870f5bf6105443ffe7c62711a9cbf0af1aa4cf7230637c9550035797b539a482cd930a3a5b5 SHA512 e821196c6340b3c652f123e797bdbc6d93a25559cebdcf6418422a711b080586ef7e546abe2805d449a08944312dd963ee7088a27926e92fa06c28d453a14419
diff --git a/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch b/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
deleted file mode 100644
index b3f92bfaa1a3..000000000000
--- a/sys-cluster/rdma-core/files/rdma-core-38.0-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cf11c3d888ae49374ed2d4871560c82e4639b85b Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 29 Jan 2022 11:57:38 +0100
-Subject: [PATCH] Do not use `__THROW` in prototypes
-
-`__THROW` is a glibc-internal macro, as indicated by the
-preceding double underscore. The absence of this macro breaks
-builds on musl.
-
-Bug: https://bugs.gentoo.org/828894
----
- libibverbs/neigh.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c
-index fa3cbf57..7eed95f1 100644
---- a/libibverbs/neigh.c
-+++ b/libibverbs/neigh.c
-@@ -30,7 +30,7 @@
- #if !HAVE_WORKING_IF_H
- /* We need this decl from net/if.h but old systems do not let use co-include
-    net/if.h and netlink/route/link.h */
--extern unsigned int if_nametoindex(__const char *__ifname) __THROW;
-+extern unsigned int if_nametoindex(__const char *__ifname);
- #endif
- 
- /* for PFX */
--- 
-2.35.0
-
diff --git a/sys-cluster/rdma-core/metadata.xml b/sys-cluster/rdma-core/metadata.xml
index 7b6cdee46e84..da97f392f607 100644
--- a/sys-cluster/rdma-core/metadata.xml
+++ b/sys-cluster/rdma-core/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>zlogene@gentoo.org</email>
-        <name>Mikle Kolyada</name>
-    </maintainer>
-    <use>
-        <flag name="neigh">Enable iwpmd support</flag>
-        <flag name="python">Enable pyverbs support</flag>
-        <flag name="valgrind">Enable valgrind notations</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">linux-rdma/rdma-core</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<use>
+		<flag name="neigh">Enable iwpmd support</flag>
+		<flag name="python">Enable pyverbs support</flag>
+		<flag name="valgrind">Enable valgrind notations</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">linux-rdma/rdma-core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/rdma-core/rdma-core-38.0.ebuild b/sys-cluster/rdma-core/rdma-core-38.0.ebuild
deleted file mode 100644
index 9d116917a5c9..000000000000
--- a/sys-cluster/rdma-core/rdma-core-38.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..10} )
-
-inherit cmake python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		')
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}""$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DNO_PYVERBS="$(usex python OFF ON)"
-		-DNO_MAN_PAGES=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${ED}"/etc/{udev,init.d} || die
-
-	if use neigh; then
-		newinitd "${FILESDIR}"/ibacm.init ibacm
-		newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	fi
-
-	newinitd "${FILESDIR}"/srpd.init srpd
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-39.0.ebuild b/sys-cluster/rdma-core/rdma-core-39.0.ebuild
deleted file mode 100644
index 18e127dbf861..000000000000
--- a/sys-cluster/rdma-core/rdma-core-39.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		')
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DNO_PYVERBS="$(usex !python)"
-		-DNO_MAN_PAGES=1
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${ED}"/etc/{udev,init.d} || die
-
-	if use neigh; then
-		newinitd "${FILESDIR}"/ibacm.init ibacm
-		newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	fi
-
-	newinitd "${FILESDIR}"/srpd.init srpd
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-41.0.ebuild b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
index d8d8ff54cdfb..79658d2d3d98 100644
--- a/sys-cluster/rdma-core/rdma-core-41.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
 	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"