gentoo resync : 16.01.2021

16 files changed, 83 insertions, 109 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 1aa0b53d5486..e947f489fd39 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/libibverbs/Manifest b/sys-fabric/libibverbs/Manifest
index d6c5b8d7e270..977af1673ced 100644
--- a/sys-fabric/libibverbs/Manifest
+++ b/sys-fabric/libibverbs/Manifest
@@ -1,4 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libibverbs-1.1.7-r1.ebuild 691 BLAKE2B c7e098706c2947662f4d82c94b3a830511cf40dc64af023769b3ea2fe77c286b3c3b9ea601f7d559bc6c85d35b99666b1f34b8f40c1a552542157e22667fec16 SHA512 a72421f2acd3b10fce40d467d3baec33493533d5e3515b73391b67a81279b5a7c5d912234d91171138814e963f5b9d302951248ffa5232d3a15aab439a01337e
-EBUILD libibverbs-1.1.7.ebuild 413 BLAKE2B d25fb471d39c1514ebedd6f025911f371c08d6c86c7e81e02b5c012a517f7da0acf44d8416bd825d2054fa408b5472400dc4b03eff4b282c22a2d3654bd3171d SHA512 687763f0c83d0132063cbef4498e6ff45acb17953ba78c6bd6206729472ea6c298ba218c6c8fa7e7947969b82218adbf1454e6273a8e771005bdb09ccb504f82
+EBUILD libibverbs-1.1.7-r2.ebuild 666 BLAKE2B 4c176bda048f23c52a42a79d06258ad2ad9c56f07ae8c6b8eca4ee85c85f377c1d6c085a06e28b0421ea6387828640c689aa3adb276d53763382f3d5e567e22d SHA512 9428989d99b29d98c929fc49288af72cd8916e6f618d472b7d3305df40bc625bbe17579d17ea6646143910c79655f505dcf28d82d60a6f736a91381aa65e2d76
 MISC metadata.xml 520 BLAKE2B 32a8337fcf0d735632588f4c8426955ba534570845d6c85239c4da4e4e427cf9cce2d6872c882cf39fe04cb1d0ec4bcb7a31bdbf2f8d2a21d812103992acda9e SHA512 06efb0b1865881d95b0ea6a37077c756e1e188636c72d5bee8750b78fbadd625e546c7c70b7db7c6d3be50410c6d93670ac5bd37927ad035c61a4a2367b98692
diff --git a/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7-r2.ebuild
index 36227d3bcda6..86e03dd440a2 100644
--- a/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.7-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1.gcbf2a35"
 
-inherit eutils openib multilib-minimal
+inherit openib multilib-minimal
 
 DESCRIPTION="A library to use InfiniBand 'verbs' for direct access to IB hardware"
 
@@ -27,5 +27,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	use static-libs || find "${ED}/usr" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
deleted file mode 100644
index 865b9b3ef63f..000000000000
--- a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OFED_VER="3.12"
-OFED_RC="1"
-OFED_RC_VER="1"
-OFED_SUFFIX="1.gcbf2a35"
-
-inherit openib
-
-DESCRIPTION="A library to use InfiniBand 'verbs' for direct access to IB hardware"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sys-fabric/openib-userspace"
-block_other_ofed_versions
diff --git a/sys-fabric/librdmacm/Manifest b/sys-fabric/librdmacm/Manifest
index ce3d82ccf341..b259bdc11800 100644
--- a/sys-fabric/librdmacm/Manifest
+++ b/sys-fabric/librdmacm/Manifest
@@ -1,4 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD librdmacm-1.0.18-r1.ebuild 709 BLAKE2B e0a76e777dd91a5e25dcfb2335dd9a929830ca1f5c7a2154c0d17161806b4291a25ab41046c32f48699e87a96830066d105146a3114fe614007433aceeafaf8b SHA512 233944aacc663324d4dfc7ffd943326a6e5c7dc146ef54087195cb4d68ae6421018bb491e49763a87d6093c2e6cff828f24d23a60771c9a81b9aad254d154590
-EBUILD librdmacm-1.0.18.ebuild 398 BLAKE2B bbabd1ea8bbc1d1fdfe7bed4991a118447f9137e0b2cd8d7398f61f6c55f6aeabfd05d17e70185b9bee9f279863ba88fd413d42d4c7a86dabe0eed304b802c71 SHA512 6cf70d37bec05529bea335ddc8649807ffef2d31d4b8b158d2134e2b5d650c751accf67e161bb41be63f589311ee21fa895b16bf33a03a0143748bd0c8f3f6f7
+EBUILD librdmacm-1.0.18-r2.ebuild 684 BLAKE2B 683e9e076b064557572e577802839a43052fa9bcf809ccf5e156efce428980557db42dd3f2c8a3955f2e076afbfcfd91dee83d2f429b2183768644e292bf9680 SHA512 5c70f64214fdfb33ba78df05898d6c8358ec1ff534d9d6dd550df7402d4dd243902fa0488bd59fc86d3f39357c07af181f68e8d415449961624eb6a04147bd30
 MISC metadata.xml 254 BLAKE2B d6008c0af75d2c59696336153c1fbf23e23bb091b3786644f333d4c0bb9e43c13041ef756532814f203054bead254e98ee24c4e04b053a84e51c18e8714ec84c SHA512 49ac9b7f3e1a9e805c65e2288af69d49c40246ccd58241740afb44593e73c26fa89772185d6b6693db2778e14f5b493169f8b2def93e2d6bdde44cf3b5d66244
diff --git a/sys-fabric/librdmacm/librdmacm-1.0.18-r1.ebuild b/sys-fabric/librdmacm/librdmacm-1.0.18-r2.ebuild
index c6ab4d81f4e6..53b25cdd809d 100644
--- a/sys-fabric/librdmacm/librdmacm-1.0.18-r1.ebuild
+++ b/sys-fabric/librdmacm/librdmacm-1.0.18-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit eutils openib multilib-minimal
+inherit openib multilib-minimal
 
 DESCRIPTION="OpenIB userspace RDMA CM library"
 
@@ -27,5 +27,5 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	use static-libs || find "${ED}/usr" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild b/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
deleted file mode 100644
index 2d4e9357a19e..000000000000
--- a/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OFED_VER="3.12"
-OFED_RC="1"
-OFED_RC_VER="1"
-OFED_SUFFIX="1"
-
-inherit openib
-
-DESCRIPTION="OpenIB userspace RDMA CM library"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-fabric/libibverbs:${SLOT}"
-RDEPEND="${DEPEND}
-		!sys-fabric/openib-userspace"
-block_other_ofed_versions
diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index cd39e2ceab27..e64bf47d96c1 100644
--- a/sys-fabric/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
@@ -1,5 +1,3 @@
-DIST mstflint-4.16.0_p2.tar.gz 4534457 BLAKE2B c199cd0b4eed8ecc20b8ab89235035b7ad258fe583c464dafb31a1e5ba8f6cfd745b132ff12631fa0d98c2d94f16ca69c908c0b6ad94391ec1a3e56ba9967d59 SHA512 03a6b055384b9fab44a31ba6f2de02d1580e08af981c1cad5111a96279872ea960024bfa9debbbdb36019b88713906c3c59d3910a11f169ad5f3a0090bc6c7df
 DIST mstflint-4.18.0_p1.tar.gz 4877851 BLAKE2B 7fb995561155ccc73b0c36d2994c0398483a92788c5ce045f0263a3e5b0ff7230ca8bb0f5b821e957d5879e0629f11716b179e3bc581849335cc95715631c1d6 SHA512 aed2302dc88b9b95892eb6dd929a922ac6257ddae808db656c7fd01c393f9f0a0d3aa4e13da6c07fe0118cd48a43795f39cc16e619408b05e6bed7d085dbf0d4
-EBUILD mstflint-4.16.0_p2.ebuild 1144 BLAKE2B f2dcd54ad815640f54a82c07d7aa58a3e910562e380b4c5696c42ccb8388954a93a4a5b50b2764ec26e4978331bb1ee66a1c11b9c3e3056b129e15b357e09bf1 SHA512 6a001b874d1d3ad3973b0719dfb84da6127466ae001b8d307e82fdc6927cb9548f97e6098b77a91835d45a6331c56ec2e1f63027acd5ef80653df0fc17c6fdad
-EBUILD mstflint-4.18.0_p1.ebuild 1144 BLAKE2B c87698fcd5b9b7c41e59cb7d62fcb7e0b0987ce7c2b08702ddb93b3250652a0015566cd10a66dfd32c941fd22b065dce0c9860719679a4d6aac090709c0dd98b SHA512 8295d4e3a0d8c6771f66aef78ed634ca51bc8241589aba92ed72fd0cc6f311628be587a88c29d997d39b98545f61880a9f6a4b1de8aac3fb31f4848eecfe914a
+EBUILD mstflint-4.18.0_p1-r1.ebuild 1146 BLAKE2B 755ea9ca06654fef57db5b9214070e2f50fafdeed8abe7fb7c65b58847356d22e09e155a07bcdb9d5f7b27a9c50cca8f364d3ef95ae23b5d654cbf3f63083901 SHA512 762063171c8b955e99b056effa180ca807748a978b09c41ba724854b4510fe6a763e8b946eac2db6f39f18e608b992c8fdc610dfbdb5336c94f6a797b2341501
 MISC metadata.xml 535 BLAKE2B 1e72f523ffe6502539cb60113b7c5c65528552aff7b5aab7e944afa982b0551a8c561cd58b516ba6daa76380598d8f24ec47eb63b7890c092f2aa40ba5f1af41 SHA512 5b95d56f53b0e89ace5a1032a063a3f606c44f5a913e87e9d7c2b61e7dac1a9c44c44819648996668c53c106bb085e9f50c10050fca6e457f39b40d48fea79c8
diff --git a/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild b/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild
deleted file mode 100644
index bac06d183ae9..000000000000
--- a/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware Tools)"
-HOMEPAGE="https://github.com/Mellanox/mstflint"
-LICENSE="|| ( GPL-2 BSD-2 )"
-KEYWORDS="~amd64 ~x86"
-EGIT_COMMIT="bd8852742cbd5d4d5eb0d67e000275c953cc0820"
-MY_PV=${PV/_p/-}
-MY_P=""
-SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-IUSE="adb-generic-tools inband ssl"
-SLOT="0"
-RDEPEND="dev-db/sqlite:3=
-	sys-libs/zlib:=
-	inband? ( sys-fabric/libibmad )
-	adb-generic-tools? (
-		dev-libs/boost:=
-		dev-libs/expat:=
-	)
-	ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	echo '#define TOOLS_GIT_SHA "'${EGIT_COMMIT}'"' > ./common/gitversion.h || die
-}
-
-src_configure() {
-	eautoreconf
-	econf $(use_enable inband) $(use_enable ssl openssl) $(use adb-generic-tools && printf -- '--enable-adb-generic-tools')
-}
-
-src_compile() {
-	if use adb-generic-tools; then
-		pushd ext_libs/json >/dev/null || die
-		emake
-		popd >/dev/null || die
-	fi
-	default
-}
diff --git a/sys-fabric/mstflint/mstflint-4.18.0_p1.ebuild b/sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
index 642fdcf4600f..810536121d18 100644
--- a/sys-fabric/mstflint/mstflint-4.18.0_p1.ebuild
+++ b/sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="adb-generic-tools inband ssl"
 SLOT="0"
 RDEPEND="dev-db/sqlite:3=
 	sys-libs/zlib:=
-	inband? ( sys-fabric/libibmad )
+	inband? ( sys-cluster/rdma-core )
 	adb-generic-tools? (
 		dev-libs/boost:=
 		dev-libs/expat:=
diff --git a/sys-fabric/opensm/Manifest b/sys-fabric/opensm/Manifest
index a36c43bedb11..e26e456bf501 100644
--- a/sys-fabric/opensm/Manifest
+++ b/sys-fabric/opensm/Manifest
@@ -7,6 +7,8 @@ AUX sldd.conf.d 459 BLAKE2B 6a61a958a295812153ad254d38503c967d029375b9fcc40231ce
 AUX sldd.init.d 612 BLAKE2B 970ac3512d62e5dd849a7a4a897bc96d32fbed84f9b8806bcc0cc962b0e30cc69a0fc8ada2cea7ef03d7ffbe0f6a171f9eeaf0e914c7816da99474c340e35259 SHA512 e939ddd800e9f077aff28e30b1e1a7ffa07b1fe779cb212f34e789b4f2bb421da34fcf5b5c186971ebea9b419e2307bfa02296350451938a48646b3bcac1a882
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 DIST opensm-3.3.23.tar.gz 1357906 BLAKE2B 7f085dc1e0a1f284baf1410661aa247ef7e48cdaa696c38ef8a38d5a214e03966b54fb75c035103ac0d6ab9e0a37500d5fad51b0b52c7f5edffb3c3ddfa86eb4 SHA512 249143fcf2cac0504923992d46dfbd6821aad3da55ecc12c92b273b4e59196f88d9d1802d9f58ae6f1ace49958e0222424aea9b48e5aba519e5a5736fc51c3fe
+DIST opensm-3.3.24.tar.gz 1359599 BLAKE2B 0498ea95e83f47d2a60696bbec7242ecd5f538fa3bcdeb083a5473c3f0fd660382cd661b8bce0ac152f64bf7bcd934ca8007e7a9f528b7bd15c25af963780b85 SHA512 292449b1282008589ce6cf6a649bb64afabf359d23a8fa4afa38217801256a6a5f06912c9e463c0fdac30039aff9eceb212e8560bf05c7253c4e73080e16072e
 EBUILD opensm-3.3.17-r1.ebuild 1365 BLAKE2B 5b1110ba3b6fa014ff2cad78f0ae559ca6cc723e541ae57a938bffddd2754faa8573c2991551772e15ae34c5b3ba4ea2daef634aab383e8125382117904f9416 SHA512 4e2074d3d4aa27ff2224f5d95facded79d998e30d83f9341625f375b5ec8d2c81b01c6a401838881d5388798a3c46ef42b61ed19df5d1c31441c04a1db3f3397
 EBUILD opensm-3.3.23-r1.ebuild 1382 BLAKE2B 0cb70c6e55a5d5b3ed3926825a4395bf9dee9d1e030462d0940bb6e30c79b7796be294a368c786a5c13c3810c5b155ac9f760f21ab84a43fe3ae4038d2c0d9bd SHA512 6c5ea2c14cdb8db5aa820387bad8266cd42b27f09cff669bdf8155ff934a4a0b9ba4c2918756e88274a239c6d58d3d985405ed5fe393b0f726e5badc3d49dc25
+EBUILD opensm-3.3.24.ebuild 1421 BLAKE2B fa410ae1d9d25cdc39b5aff0d95ff25b029ca22351c9831d9803e8485d70f77a3111517a30bf937ec2eb60b489013ca25950800dacfb449d16cc8050f2b78f2b SHA512 d446d9dd919677041525e39935fd906dc8b31d436ee20220d4b4e462a688e786749c65d5fa0324458752f86a52beaa47e8633929f70e23cbc9211d89ba8d76e7
 MISC metadata.xml 580 BLAKE2B fab05a96ab931792c27ab807b71c77f4fafba4120f9eab33f1d457c1c7de027893c63e08407126730e774474dabd0b0fa7128b2ee8ae085a7c918c45b1b31284 SHA512 4d08c63f85944e69ca7acd64295210989fa9344176eba815ff181fa404aed8122216a10cb80795fddf8f2011b096dbbeebcb11e602bf1c54d3e1c542835f6a66
diff --git a/sys-fabric/opensm/opensm-3.3.24.ebuild b/sys-fabric/opensm/opensm-3.3.24.ebuild
new file mode 100644
index 000000000000..b80d8348a508
--- /dev/null
+++ b/sys-fabric/opensm/opensm-3.3.24.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
+HOMEPAGE="https://github.com/linux-rdma/opensm/"
+SRC_URI="https://github.com/linux-rdma/opensm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="tools"
+
+DEPEND="sys-cluster/rdma-core"
+RDEPEND="${DEPEND}
+	 tools? (
+		net-misc/iputils
+		net-misc/openssh
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.17-sldd.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-perf-mgr \
+		--enable-default-event-plugin \
+		--with-osmv="openib"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/opensm.conf.d opensm
+	newinitd "${FILESDIR}"/opensm.init.d.2 opensm
+
+	insinto /etc/logrotate.d
+	newins scripts/opensm.logrotate opensm
+	# we dont need this int script
+	rm "${ED}"/etc/init.d/opensmd || die "Dropping of upstream initscript failed"
+
+	if use tools; then
+		dosbin scripts/sldd.sh
+		newconfd "${FILESDIR}"/sldd.conf.d sldd
+		newinitd "${FILESDIR}"/sldd.init.d sldd
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	einfo "To automatically configure the infiniband subnet manager on boot,"
+	einfo "edit /etc/opensm.conf and add opensm to your start-up scripts:"
+	einfo "\`rc-update add opensm default\`"
+}
diff --git a/sys-fabric/perftest/Manifest b/sys-fabric/perftest/Manifest
index 7046f910f5e0..989415d85088 100644
--- a/sys-fabric/perftest/Manifest
+++ b/sys-fabric/perftest/Manifest
@@ -1,5 +1,5 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 DIST perftest-4.4.0.37.tar.gz 146362 BLAKE2B f84c3cd9e7d56bcffc700131e23bcff23e6515d0a198b4223d9784fad73601f493c9881a46fd94ca62dd9b7c76233fe5d47d8789775f77cf8c5008ee7341010a SHA512 3f1b29f1de4a9cea118d0d258cba007933e6530bbc50e1d0980a46429715b73230092240bbd436b7d0ae605fe7337c20bad27c0ff3d4ae08e60af8f8fff46893
 EBUILD perftest-2.0.ebuild 509 BLAKE2B 399c56b912e1decb1eca0274de2a650702e30528f7f35d2ff5fde836aad72f58ad84a9ddb8cfbccc4a3d365d8b159d29761f1606d47a005f17f336c5ca77245a SHA512 d7ea96c6e86fd6f6e542287c87cbf4c0058235d559cc278aeca5c7f282c98773e69167e408e40d18cc0b4ae51071a2e7e3704a977e13b164e87821dca2956d42
-EBUILD perftest-4.4.0.37.ebuild 640 BLAKE2B 12a35a2ce47341f99e97e1383623dfc21c8109b68d55f905372dcf93faa3c18fb8cd12bec56622375a9a4351756bd7b79b5757d65fb172abc444acc7d63fa2d2 SHA512 63ceea340897b82e507700e1f51aa7afa3ea996927e989ad6fad2db5df4707e387042a6204c1bf8df9486347a601590b750feab8f0fdae498b5fb042aebf2573
+EBUILD perftest-4.4.0.37.ebuild 638 BLAKE2B afeb32372bb0b50e9704aa2c5cf8990cc326ce2d86ff1fb186a9abdb6090c7a072b26d1eb36c12dd3f840d65ece9420b7467c218b01df101a14ad35853ce2af9 SHA512 ff345cca9bffef9c120f6e711643d730254d911374332bbb76e8694856de73466976684040cc15b75e6be56e3b1ea15c45a0d4504e6157d535b5f17e113df4f0
 MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
diff --git a/sys-fabric/perftest/perftest-4.4.0.37.ebuild b/sys-fabric/perftest/perftest-4.4.0.37.ebuild
index 2b04e19d6f98..8b5a88dceb74 100644
--- a/sys-fabric/perftest/perftest-4.4.0.37.ebuild
+++ b/sys-fabric/perftest/perftest-4.4.0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 DEPEND="
 	sys-apps/pciutils
diff --git a/sys-fabric/qperf/Manifest b/sys-fabric/qperf/Manifest
index b4aef691c2e1..7da55bc65904 100644
--- a/sys-fabric/qperf/Manifest
+++ b/sys-fabric/qperf/Manifest
@@ -1,5 +1,5 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 DIST qperf-0.4.11.tar.gz 60027 BLAKE2B b82131b3bf9f3ef4a1674287ebf4717b6824dd014d141d3aac45d258b1d7cdc1847222ea9e46d216fbcac2e9c82d42ebc27807914e0e67047b3f1d107a3b084c SHA512 303f14267d0410b0b4703f1821043a0e06be2ce36ad182d694804c9c63ea2b5b15efcb9b35102f74320e45de5127c190fea786ce2b31bff227f973c01f1f8695
-EBUILD qperf-0.4.11.ebuild 501 BLAKE2B b1653efe27574d827972ffbfb9359c0bee958e1a0b1c2fa867d290c4e4c44c4777047a8e3c3ead884bf994640fe468113578610d2cf22bfd16ff34a064f19b3d SHA512 3959d18184d9d6fdd39976d1a34e7e68b201cf252fe8a74b9449e0e3f1e4a312c4595ee38041987200edce3c1b5e174ec305af22f701a3f211b5ecc11beb6c8a
+EBUILD qperf-0.4.11.ebuild 499 BLAKE2B 08868f84a2a25ff690212b03317d8f65778738a428e36db469efbae8f91b1004e336022aa4fbf83951a96aa606734b3c3521188a84fa2828a1ce5497bdec227c SHA512 e0ac4050da787ad8183847f4abecd46e31aa2a899854a2b76fe14dc211b8ba339e8f23c789fee5259e1a3add606083092f261031a3a9e670742e7516e6a1d060
 EBUILD qperf-0.4.9.ebuild 422 BLAKE2B 48490a090ce095121009a7fa16047fe36045ffabb511c4b830c839ecf969461a9c514085f3fb2d577712e90c19f1aa7e3440115541be1c598879f6691ddf9663 SHA512 1ce3ac0075dcb3685b1233db24b72cfdd0459cbd4d410853c9af549f9485cfc8fe02541ff2f993fcc8ddac3254dd255ceaafcb04dabe75e171656253a5f85dc3
 MISC metadata.xml 520 BLAKE2B 32a8337fcf0d735632588f4c8426955ba534570845d6c85239c4da4e4e427cf9cce2d6872c882cf39fe04cb1d0ec4bcb7a31bdbf2f8d2a21d812103992acda9e SHA512 06efb0b1865881d95b0ea6a37077c756e1e188636c72d5bee8750b78fbadd625e546c7c70b7db7c6d3be50410c6d93670ac5bd37927ad035c61a4a2367b98692
diff --git a/sys-fabric/qperf/qperf-0.4.11.ebuild b/sys-fabric/qperf/qperf-0.4.11.ebuild
index 596a222382b4..5dd4a4c319ad 100644
--- a/sys-fabric/qperf/qperf-0.4.11.ebuild
+++ b/sys-fabric/qperf/qperf-0.4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-rdma/qperf/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="|| ( GPL-2 BSD-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 DEPEND="sys-cluster/rdma-core"
 RDEPEND="