gentoo resync : 22.05.2021

42 files changed, 103 insertions, 61 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 5bdf90a689c5..dc1e3ce2271f 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/dapl/Manifest b/sys-fabric/dapl/Manifest
index 9941ef61ac93..91213873577d 100644
--- a/sys-fabric/dapl/Manifest
+++ b/sys-fabric/dapl/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD dapl-2.0.40.ebuild 441 BLAKE2B 78d167ca70679abbd08672855d6192fe536f82aac045c215395513ea41cb5c0162d9a58b2f0cdb2716b9d2a87e9c39ee251fcf9a40c45577b8e9b2e2c72250e4 SHA512 1965430b7b24ecca0e79ad60c3076f7380fbcaf3527c2ed6e31a8ad0f8ac2870df32c5a6d7c3eafc255303e96f26dc824d1bc76107e4649b37219470379ddde3
+EBUILD dapl-2.0.40.ebuild 437 BLAKE2B 47ba7eb66a5a382908f932e0b2bd90e58648b0dd9f7407286400de0dc7b92c1de6f96d03759e1bf71c3dce2b91b01cb39f5563860152e08c9d7cce8b5b7a0cd3 SHA512 c4910b4d57bde582a20dac73a251db204a039ef25e156d30f4e331bf601249909efb50be4b53df4e30c7cb869601d5649f516298a6cf251ce3cbac1771b18e2c
 MISC metadata.xml 517 BLAKE2B 5216c53922586aa9474737c08b1a86d4baa596d1a0d1872e59b0403ff0166aaeec433ed02cd4443d67aa3c255ca641c9cf170b6217ca6cab0bde98e907a57950 SHA512 b4660bcb112426f8c8e785c68b64c85fd5155917405d72271bdc418821c542eb8e0bc2cb16740188851d75820d25d580a9edf4a3a35715a709b84d0134b4b2a4
diff --git a/sys-fabric/dapl/dapl-2.0.40.ebuild b/sys-fabric/dapl/dapl-2.0.40.ebuild
index 1cc163d85d10..5eeb4085c365 100644
--- a/sys-fabric/dapl/dapl-2.0.40.ebuild
+++ b/sys-fabric/dapl/dapl-2.0.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB - Direct Access Provider Library"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="sys-fabric/libibverbs:${SLOT}
diff --git a/sys-fabric/ibacm/Manifest b/sys-fabric/ibacm/Manifest
index 1d68f3905353..118c605395cb 100644
--- a/sys-fabric/ibacm/Manifest
+++ b/sys-fabric/ibacm/Manifest
@@ -1,3 +1,4 @@
+AUX ibacm-1.0.8-fix-pthread-linkage.patch 718 BLAKE2B 39609a6f63f76959eacb27d8dd611ca1d20714ea6e2bc862d90162b432da8a7ab1551cd8c7917ce498fb8cfaa1b6a889c115616367aec21b80f8d68788f6fb6e SHA512 8bad15c765ada19ee020f7ae808b1300c7033834a0c9faa02081d00f27a95cacc48f9b5650ca6e8cc22b0ad0a4059666b6fd103a12bd7dbfb5e5386f35a8f0ba
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD ibacm-1.0.8.ebuild 413 BLAKE2B f31121dd3467ec5e9daf5222519ec02f82cb6f54222a5e832b77d6ea502e7b3625647dcbf4274bea9dfc99b9940570f32917265f96caa5521e8889a3099b8c33 SHA512 c4d711f56a53a3f95afbb38fe5c84cf1ce7d08cade000a2bc69e821064770964a6942ef46ad4cf0061648ff15203ead4dfbdd84c00b35f66ddcaebf1c9a4a174
+EBUILD ibacm-1.0.8.ebuild 553 BLAKE2B 7f839fd6dfb6ba37f2742e2dd231a05ddcba884c68762d5c3de0c992ea369d8871b995a0ab85f7f421f579e5049d691f38fe8f6f9554ecb94f4e073f19f1c67e SHA512 9cbe9bb5c6069f23d83c9e505e017db26ed5c0a0a2e9ddda207fe78632f50868697d1c8bbb1149db5581e5fa7012f7d43665bdae6b9c7ac3ad1b350fdad305bb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
new file mode 100644
index 000000000000..8a9e5b5f03e6
--- /dev/null
+++ b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
@@ -0,0 +1,20 @@
+https://github.com/ofiwg/ibacm/commit/7a781f6d554532995181b9efbe445599b25c271a.patch
+https://bugs.gentoo.org/611778
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,12 +1,13 @@
+ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"@rdmadir@\"
+-
++AM_LDFLAGS = -lpthread -ldl
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+ svc_ibacm_SOURCES = src/acm.c
+ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_linux.c src/parse.c
+ svc_ibacm_CFLAGS = $(AM_CFLAGS)
++svc_ibacm_LDFLAGS = -rdynamic $(AM_LDFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS)
+ 
+ ibacmincludedir = $(includedir)/infiniband
diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index 2872d490e173..2239f9c1e8e7 100644
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -1,22 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 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 openib
+inherit autotools openib
 
 DESCRIPTION="IB CM pre-connection service application"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND="
 	sys-fabric/libibumad:${SLOT}
 	sys-fabric/libibverbs:${SLOT}
 "
 DEPEND="${RDEPEND}"
+
 block_other_ofed_versions
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-pthread-linkage.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for pthread fix (bug #611778)
+	eautoreconf
+}
diff --git a/sys-fabric/infiniband-diags/Manifest b/sys-fabric/infiniband-diags/Manifest
index 813597d410bd..8bc06b7a34bf 100644
--- a/sys-fabric/infiniband-diags/Manifest
+++ b/sys-fabric/infiniband-diags/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD infiniband-diags-1.6.4.ebuild 578 BLAKE2B c2ad3bc627100baf2608a6cd6a5e82b101d100828447c73c5f4302584e51fbc6451b1142982c8597891b7eada167d477e30c4ef4641004b1d754d3d99dc9f260 SHA512 7d18c7c27e184c73350944b4a3dc64591f2b4be0288b1c8662c3bc47338817a6e21b019dfa727a2d78666c287c4fdfd52dd9d43f73fd57b53c802b02ed01ade1
+EBUILD infiniband-diags-1.6.4.ebuild 577 BLAKE2B 50052e5dd4e5bc6abcdfcc2be088fb564cf4f0dc2d2a84785932987b00c3a820c153f6ab421fc40ad0e61fde2b76f23a34002b3ec8e5164b6c0f2de8a1c5a409 SHA512 9f5ca8a6e3ea2dbaba38f4c26da10d143da0c4b2929d59ed9de880db7b8bd565e51ac3a0454fea948436d91ec75f5dae1fc2a0029077c34fc54bff95f851ce0f
 MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
index 6bda2d97ac74..b668343fe9d1 100644
--- a/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
+++ b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB diagnostic programs and scripts needed to diagnose an IB subnet"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/infinipath-psm/Manifest b/sys-fabric/infinipath-psm/Manifest
index b9f06444ebd3..fbf2eba75d3d 100644
--- a/sys-fabric/infinipath-psm/Manifest
+++ b/sys-fabric/infinipath-psm/Manifest
@@ -1,5 +1,5 @@
 AUX 42-infinipath-psm.rules 85 BLAKE2B fc740e6f5399879060a6f37f4a862fc398e0163e176d8f20e5dbec6c953b6febe49afd848135966eedec7da09ebeabb0e63cb2729618ccb2822e274b39829b24 SHA512 2113118500c9dce4d1faf2a9f5da1e540be82ed6cfbe5ad5edd2927f266d77a698f628ade289716e5f992b4d5a9ad49c6b1f522a2c2a9eda087953f9a082f6fc
 AUX infinipath-psm-3.2-fno-common.patch 2518 BLAKE2B 4cabe6924788235bbac230f0d5486d0ff713839dc48dd6ed673071d1f728497e0cfcd79660cac3468f43c731754947a0b4c293a7709a7cbd72ac35cfb9bca7d0 SHA512 125651c5527f0da432ab0fd3ee4fc6c866d2310ca8a2bf6f00a14056f80671f14ed4deffbec90950b23c2eeeed752c6e45103a5b225b1641ea7843d6a9757d3f
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD infinipath-psm-3.2.ebuild 733 BLAKE2B eed4b8311b735637a4fd5f573d71f45f9f8b0ba6ca524a10e2e695afbf7b0e6deb060c08a9e06f111ce700ad5249f1286027aedd5c52d35682c9658c28c5f145 SHA512 e71064e2e57a67f048ff753dd0116df2eaa3eb8a58210e0435fe81d8eea80aa22f34d057a16019e3de3ed30185111c43aa87845caa325f7e9bd0c5a4dbe65bfc
+EBUILD infinipath-psm-3.2.ebuild 732 BLAKE2B 8c318c33c349b62637dbb0c8dd84d73a3d3b4bef4cabada7677b508da2d13ea944513166ede6e60fba498f975a6cb4a20308662eb67d0f5878fbe498c62304e5 SHA512 3cf2d40cd5a596f0e84286cfb6cddbe7fcee5a79d27790f8f6aaa923b59e1956aade3c954c55c0bb4f9f3f46336e0d74b96b255ad8aef691ccdae4629a0287fc
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index 3df69cc34f9d..f6ba003caf62 100644
--- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ OFED_SRC_SNAPSHOT="1"
 inherit epatch openib udev
 
 DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
 DEPEND="${RDEPEND}
diff --git a/sys-fabric/libcxgb3/Manifest b/sys-fabric/libcxgb3/Manifest
index ccc1e1efda19..9cfc33082899 100644
--- a/sys-fabric/libcxgb3/Manifest
+++ b/sys-fabric/libcxgb3/Manifest
@@ -1,4 +1,4 @@
 AUX libcxgb3-1.3.1-fno-common.patch 1029 BLAKE2B d1aa234ee4bca9e705f420a2db003c5077c52cff6f24f37f235ffb5d00af9b156b66cf507be1712c7d447ded580427c07f5d6069e444011e2b835666cc965f55 SHA512 e136a40a76f0e3c4020f0ad052443204a501655586d253c5a0a0d5d8ce4ae19e7b99614e7599859c05bbb5ed615a386adebe6ef2939f3f1722c1b88578adabb9
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libcxgb3-1.3.1-r2.ebuild 556 BLAKE2B daead3805d55549ef29c8900508b76698c2244cf548c9a278e23e421c1e23c5e14840d60a158c972f71c050cf533ecefa57c66abe34875039babddcf4f07fe31 SHA512 286b56db78ed40b7201113abcbede6c52e6295ba8d8f2f61772911023e2cd4246d13c65744cfedde5e98853e7f334b1eec10ffd5bc6cd382edf970535cb2cb1c
+EBUILD libcxgb3-1.3.1-r2.ebuild 555 BLAKE2B 887553f51adb7da709442a142878ffabe94b82a48ae83d5f75f15b11f3a298882d93859fb2511ef8fa55371e35242175e4f3f213a04173f5ad2dcaa2ebb16f9d SHA512 6532360d28fce9abe71c1b0251304faed2250faf423d5702299862c2df5f3790186dd5c5d7b86ea304a77aeb38a872ebb076d728a407d75d93676efcb1d948b2
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
index 20ffdc32534e..fc27a4664076 100644
--- a/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
+++ b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="${DEPEND}"
diff --git a/sys-fabric/libcxgb4/Manifest b/sys-fabric/libcxgb4/Manifest
index 24b13b776c2c..c2c55bbc9712 100644
--- a/sys-fabric/libcxgb4/Manifest
+++ b/sys-fabric/libcxgb4/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libcxgb4-1.3.2.ebuild 517 BLAKE2B c26ce433084391d5026c32236b62bc1477ad47329d9b7fbc86d0dde7aa490b177f2ff52c8db894c7d435f42ece3b53fb8dbbc7eff2945d4a16ff2cd1098fe859 SHA512 2858c5c507dc5bf311960a9a6af9b79139f78f378b6ab733aab7704dcfb70ccdbaac490d4ac111297bf8ecb5223655ac84c19738e26b7488fd6de6a01d749e15
+EBUILD libcxgb4-1.3.2.ebuild 516 BLAKE2B 0aad321ffc45269224f9cc95565798f889d3b9640aba160462a0166167da8797755a4057f618a99ec2190ecac1f503c07f04b0b032c0e987110c35c64097ccc7 SHA512 a08033fd8d02578ca3c599e5cd2b48c768df6dc7fdb6c148123dc6103ddd3c0502a72410b6904318658f359d72754383bc6c7dd5165f19268a5912332e466638
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
index ff8ef23cbd6b..b4a7f4de7ad5 100644
--- a/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
+++ b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB - driver for Chelsio T4-based iWARP (RDMA over IP/ethernet)"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
diff --git a/sys-fabric/libibcm/Manifest b/sys-fabric/libibcm/Manifest
index 03bac7df8a67..5b7ea3ad9c70 100644
--- a/sys-fabric/libibcm/Manifest
+++ b/sys-fabric/libibcm/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libibcm-1.0.5-r3.ebuild 479 BLAKE2B abbfa39972f11d081af7d0df8e36fdea8cd18a0a5c6c5311556c8aca5111192366ee3c0d8a9f398c07e1dd93cf92f82d516e4ccf60861e5791fed7f1eca5aa6b SHA512 bdfb3816242ebfeb01feae9118338a75d6e966af0f1b9a727d0ac74214a5d7b755ccc3a0c8384e0cf660fa924664f84675e9ee719f8fa343cb8dd3cdbab94bd4
+EBUILD libibcm-1.0.5-r3.ebuild 478 BLAKE2B a1273b09be6434b963b67ef620a1fd117b92a8b85202db5025e622d09cdf01bddd87c4d27979f3b654f349fc692cbe826b3287fb441c80b58f36fd228c7c4c97 SHA512 db48d107a60a28cc4c34373b7e127758a9e8145950f89cc9fad8289ebe2e100aafcf9459c50dd2ab2ad3b239e0845c66739805dd48e6cd0cf6606b601dd879af
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
index 14e31272f463..161438b5f85b 100644
--- a/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
+++ b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB Userspace CM library"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-fabric/libibverbs:${SLOT}"
diff --git a/sys-fabric/libibmad/Manifest b/sys-fabric/libibmad/Manifest
index c3f31cdaf18c..2ba38cdb5474 100644
--- a/sys-fabric/libibmad/Manifest
+++ b/sys-fabric/libibmad/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libibmad-1.3.11.ebuild 533 BLAKE2B 1913a294d8bad40e86f49c3e9e978ff17174afccccabfedc8ecbe0d55889163f0d53a15e79677fa33ebc9f8f2c22e2732c5cbf352403976cbbe05ee3ca1973f1 SHA512 65dab1dcb820462228afc0e19b07285a09d928c319c438fde04b4d4f8c0d527070773684b6ebb56cfbe43ead22419ca198bf7f3ba73b8a8b5d5ee7d967b43b9d
+EBUILD libibmad-1.3.11.ebuild 532 BLAKE2B 2cfe2ba20e6a67590b865c3d295d1beabe06130e8b3e17d29ab121077d3b06d4e4a13e68d80d423f8544f0c058d5e0d35e5dffc07f8f8b399aca72fc5a96d4db SHA512 630e4028900df8ed60893642c3371ed00fed54bb3a4e9ae5617f04c9c8373b1362cc0d556aadbb1211f1b59ce0ede54d30d8d0bb3c06825f3d406aeec80f0241
 MISC metadata.xml 454 BLAKE2B e10e78fb3c911fbffbb73c6d651fbb109989ec91c7038491957a561584eb21079e96552fb2662143f35ddf3abf4a042dfdbb7f6a54103779e50d024bf5ad1dd9 SHA512 22297997f188da3ac0859c8d2d4483ae15edc7a0b482ee8d2717ef290b4390c7d6cce8cc48d7785a6d5fde0cc1988a3fe662315596a11e96ee1d029e7f549b6f
diff --git a/sys-fabric/libibmad/libibmad-1.3.11.ebuild b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
index 133c5aee3ddc..9699bf07249f 100644
--- a/sys-fabric/libibmad/libibmad-1.3.11.ebuild
+++ b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB library provides the API for use interfacing with IB management programs"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/libipathverbs/Manifest b/sys-fabric/libipathverbs/Manifest
index 986cef90d7a6..aad141e6e6d3 100644
--- a/sys-fabric/libipathverbs/Manifest
+++ b/sys-fabric/libipathverbs/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libipathverbs-1.2.1.ebuild 508 BLAKE2B a28c100bcd6fc3f982d115ceb6ce2fbf264c0ba04ac16a11579a825fbe62cd6393b0cf2f8d30ea668a99ddda33c7b0153707b12967b667f4065fdba63df20445 SHA512 c98c5a54da03d437f19d6fcb8e8cb6c0e2ecd5cbd6609383732e9b73d75100b8948fd92bf69d6dee8c821201a3075234d910cfcad670a2b799a308be33521c49
+EBUILD libipathverbs-1.2.1.ebuild 507 BLAKE2B 1698ffd9d314ec22e643874a8ba7c8841ca3b0927c105cb3391f53aba88565e68dced16544031c9b6194bd7080de2cf9bbbf2147cf643d99bfcbdd8f39945d39 SHA512 8e16b521bab209abea9422be694f01de1fe5c166d4e86523cb0ae95692b7dbaa9c82ad6d03e6d12843dcae3ef78c826b3ef25241bae94993a2d307a7b6247c60
 MISC metadata.xml 514 BLAKE2B 11c8b4829425773dfe26245a4a4889cf3b630d39a6a7c22c476ec6fc9820cf9f023746b48806170aca1f16715168f53a41e0fecfe2fcf8117951c0a2a0b8de49 SHA512 9f48f100850338844956926c1a35a3a9c98d2a0de45bc5d1aa04b57cdb606189b442c2184692e4e823e57470131c7a80869179fd0ee194824bd72252ba97b2b0
diff --git a/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
index fc983278b0a2..a8e3e5749dad 100644
--- a/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
+++ b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
diff --git a/sys-fabric/libmlx4/Manifest b/sys-fabric/libmlx4/Manifest
index 29c486aae65d..55d6f7694717 100644
--- a/sys-fabric/libmlx4/Manifest
+++ b/sys-fabric/libmlx4/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libmlx4-1.0.5.ebuild 535 BLAKE2B f99242205ce84d4e6051a37a3ea15140901fcb038b797245ec586fd45f3b89fe21949d43321166ec0c2631fca488c54adadae5a36d186f750977b10f1fc64f34 SHA512 ef57a933bb3afaa19678136f8972fae0926eececec84470f51e076d8fbbce3421847c6cf5668c0c872f2bb1660532e311259eab8c400cef4795676520d34591e
+EBUILD libmlx4-1.0.5.ebuild 534 BLAKE2B ceca964361934dc466e455d34137902f1e2ece78ec201822f6af809f4fcb5cda692c583a2471ce5a54711aeb7041ff16a32beda627b16b1da724cd2b03817ca2 SHA512 4be22779ee9abb257b838122ac2f3551ac7508311c50549e630c01fb7ed44081fed287da768cadf490d5a6dba463b91d3e22e71616880575219aa45138850b61
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
index 7c98fbec8def..1d44f0ca4aae 100644
--- a/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
+++ b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1.gdc6ef69"
 inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Mellanox ConnectX HCA"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/libmlx5/Manifest b/sys-fabric/libmlx5/Manifest
index 5bd2dd30968f..f01b11702166 100644
--- a/sys-fabric/libmlx5/Manifest
+++ b/sys-fabric/libmlx5/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libmlx5-1.0.1.ebuild 599 BLAKE2B 0d15672c76eac63270fec4a1e0a46283ef9e84217dc5897b56c6cc70820fa7f6ef48fafa5b599ae1c8c601cf706bb1b2040938733763a20a9c724d7b36b7f392 SHA512 6b8df0f6ccbabfe0bfc467d9b9d279ce487cfb8122969ab0228cdc77ac6e054dc497dfb5eadf4deb59942df9c6caddef6dd50e6d2873868ef2aed6831564e6cc
+EBUILD libmlx5-1.0.1.ebuild 598 BLAKE2B a403237eeebdcd73e22b5d4d775eede1d80ce8f1278fd61dfbed78c62b5b562bd2a3a8133c12f63a8ecb494a495102b515712e5bff5ce8ef91fed09aab316fbe SHA512 431ee429bc1a3c0ad4e6cd54c671318d6cde54d22881aa18efe9727d9ad309d808266c5224550c3ca9dd2f609844d23bade45e4471b74991f82ee8b77e7b42be
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
index 52884509e40b..9205ba7f42c0 100644
--- a/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
+++ b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Mellanox ConnectIB HCA"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="!sys-fabric/openib-userspace"
diff --git a/sys-fabric/libmthca/Manifest b/sys-fabric/libmthca/Manifest
index 27105e39b160..455a0f2e7521 100644
--- a/sys-fabric/libmthca/Manifest
+++ b/sys-fabric/libmthca/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libmthca-1.0.6.ebuild 534 BLAKE2B 0448830d5cebc02f8b735b4118471a24e37947877771cbea333b724cce6ad14328864828525f3f4d3a08b9171188a66c8b2ede4ebb530649b7fabb73c9c51c0f SHA512 84f46c595e19854acf92c8e012eba7fd49bb217f6f1bab085cccebe9c2efe06c5b191cbcb7d2e85755855846f85aa3e5755dfa90bf76f26540929390068741c7
+EBUILD libmthca-1.0.6.ebuild 533 BLAKE2B a58dfb0877a8314929c86117f417284ff1f7c7078b61bfefbcff41f5bc6a3e658e3312d6062abe17c5c96f276c20cc19da69f42e573dcc3f865064b3bca93025 SHA512 3360ec715dfbba6899459c6e275c5fb942dfe17feb9752f2204c07c570d7d930bc47f39cc65b497beb685ee4878fd8d890c150eafc47e0ba9644b9c0e938faef
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libmthca/libmthca-1.0.6.ebuild b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
index 498608f416a9..d1c8c256b09e 100644
--- a/sys-fabric/libmthca/libmthca-1.0.6.ebuild
+++ b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Mellanox InfiniBand HCAs"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
diff --git a/sys-fabric/libnes/Manifest b/sys-fabric/libnes/Manifest
index 5304f4b7cbc4..328f707fecaf 100644
--- a/sys-fabric/libnes/Manifest
+++ b/sys-fabric/libnes/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libnes-1.1.4.ebuild 558 BLAKE2B cbcb94d1ec6d77a0a0c11158d18d13cb6513572e50dbf4fe770664b7d045aee89e038957afeab642baf38148b43961cd2774a3edb136199130cc413ac124ecc1 SHA512 8de3e257571462da73003be498ce292ed63960dcde056d23f6423b8941cb3539eb4e2b83b4803d35d239554c9bafd63436b0ab8a6f4400fc6b1dc44488271d35
+EBUILD libnes-1.1.4.ebuild 834 BLAKE2B 76d040ecd50c95a8ee65d9ed666c5cd910010d0876db7e1d6b8d1b89322e23b6d88df4a5e164c0da8294deee9a0813fb531bcb5471c4770cba963577d8597906 SHA512 aa89c90e8da26fee244ff4a1b865eca84ac47a765ccc270a0c18c583e95b90fbeb847ba17e25e8d84edbc9350f1d8010a043acb1c39af1d0a87809996951e837
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libnes/libnes-1.1.4.ebuild b/sys-fabric/libnes/libnes-1.1.4.ebuild
index 0b48b23ebcdc..8e4ee7f1871a 100644
--- a/sys-fabric/libnes/libnes-1.1.4.ebuild
+++ b/sys-fabric/libnes/libnes-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ OFED_SUFFIX="0"
 inherit openib
 
 DESCRIPTION="NetEffect RNIC Userspace Library"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="static-libs"
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
@@ -19,6 +19,16 @@ RDEPEND="${DEPEND}
 	!sys-fabric/openib-userspace"
 block_other_ofed_versions
 
+src_unpack() {
+	default
+
+	# /var/tmp/portage/sys-fabric/libnes-1.1.4/work/OFED-3.12-rc1/SRPMS/libnes-1.1.4-0..src.rpm
+	# bug #514258
+	mv "${WORKDIR}"/OFED-3.12-rc1/SRPMS/libnes-1.1.4-0..src.rpm "${WORKDIR}"/OFED-3.12-rc1/SRPMS/libnes-1.1.4-0.src.rpm || die
+
+	openib_src_unpack
+}
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/sys-fabric/libocrdma/Manifest b/sys-fabric/libocrdma/Manifest
index 62bebc86fe8b..dd60093df7c6 100644
--- a/sys-fabric/libocrdma/Manifest
+++ b/sys-fabric/libocrdma/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD libocrdma-1.0.2.ebuild 527 BLAKE2B fe8277d9bf2ea1ac196b4bf21df8f89c07cf4b05d0bf150e4dae134be0199d7e51efc081c92e04761a90db828947f429661e83647440e76f1ab2d1533a5ce0f5 SHA512 5645579bdf1d2f6f3fae90c77b80a78ea4cd92224f077ce18bfe93a471e41eb1dbc52b001b09d768c0843b4732031b5bd811f91abc2fff6945bf42c896837434
+EBUILD libocrdma-1.0.2.ebuild 526 BLAKE2B cb8684f42215c14018498b47fe739e008185fa82773cd3c3f74e0c15a948320dda0afcfb59b14ed5b6e3c62ef46002f631c72be18f7ecd6455ea12a3c3923044 SHA512 fde33028252ee15ba4a33471ab8796d2279c3d4a772854e9e5b934cd356fe7c7217a141d529494460a8b1307aaacab3883ae6c90d25e90123b9a2e53b3f483e1
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
index 539124d24d1c..c55bf8c75fed 100644
--- a/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
+++ b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="OpenIB userspace driver for Emulex OneConnect RDMA"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/ofed/Manifest b/sys-fabric/ofed/Manifest
index ea25c180161e..d90a749dab9c 100644
--- a/sys-fabric/ofed/Manifest
+++ b/sys-fabric/ofed/Manifest
@@ -4,5 +4,5 @@ AUX openib.conf 498 BLAKE2B 7baf227d87d242fce7c3cdcb8c813b519118f79f315ddeb172b7
 AUX openib.env 19 BLAKE2B 104f0dc5edba1e190be5402a0cc39262830415b576a5348cce936330e7b8114fa25ff3fba7b4371d0cc977d474507cfccd713604f464c3680bb0f1f014ff2eff SHA512 016e4f49809d696f63ecd376d31f9f588cd12afde9bc7d42582219a1ce2bbb53851aa0e340c5def498a5013570cd2f1cf7502df85fa998c978ce9d5bcf41f064
 AUX openib.modprobe 350 BLAKE2B 1f7f1dbf0120a47d81c83cae47c2c44f418d5065f288a1f85102ec84367120b9356a194dcdad897e8f1bc3d5362d1d356429ec5a4f2fc6c16dc1833d4492bcb7 SHA512 580fd9f53ecf4661181c3d423770e9db75bd767d2efc26115d418b032663f7397637fae5f736d3acc803152af76946b1851b1444da1c4472ca42ca32c84b5d1c
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD ofed-3.12_rc1.ebuild 4961 BLAKE2B 9a96b9602f08475d72ff10357fa133968beb3e6192f296a390213cbe2128d62c6d1ee605317d55cf4d5bd4ec08219b6dc2803d7b600dad7a36ae0e82ab3ebdca SHA512 b6ee8001e131e5f631399a110c08f8593a846a596a858b586d4b1a76d2587c19392ff32ba8443925cbca2ebb3cae8e1df3297a9c76ffcf3011fccb153fd22e3f
+EBUILD ofed-3.12_rc1.ebuild 4957 BLAKE2B c923b5555048e38834eecd0f94b538c3c2cadf80d4be97eafbe6b4a22d4649cdcf4f161bd2c261ad49004c1c0e7c523490d34d349be0e6eec1340aa5ea067232 SHA512 b23fc4c9093bd1e01da52f514cf65a8172c71a819b4c2bcd3ec30cd8f3102c3b7dcc4c084a8a4757a046940610d3b47b36bcd9a9cf42dab4ffd6f9f7ffd43186
 MISC metadata.xml 768 BLAKE2B 4c8740492275cb9a4a8029160527a5ef527c6a7924fe3686f4ada8beefc436f174804a66471d59a7501ff25df8ff330d7f6f373490ff9f496e2677b6052831a3 SHA512 2541690251a5363047f9faefd8380e982bc24fbf79aa964d67d83fafbf517f6a78cc8c29b9e83b551c98c87f6c50657c3a1c58110882002cf3a6e363d655be59
diff --git a/sys-fabric/ofed/ofed-3.12_rc1.ebuild b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
index b0494089fe08..16f98a9d1cd4 100644
--- a/sys-fabric/ofed/ofed-3.12_rc1.ebuild
+++ b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -23,7 +23,7 @@ IUSE_OFED_DRIVERS="
 inherit openib udev toolchain-funcs
 
 DESCRIPTION="OpenIB system files"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="dapl +diags ibacm +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
 
 RDEPEND="!sys-fabric/openib
diff --git a/sys-fabric/opensm/Manifest b/sys-fabric/opensm/Manifest
index 59c31e9f3012..3ee0164b3953 100644
--- a/sys-fabric/opensm/Manifest
+++ b/sys-fabric/opensm/Manifest
@@ -7,6 +7,6 @@ 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
-EBUILD opensm-3.3.17-r1.ebuild 1366 BLAKE2B 36217ff0fa63e61da3cda26ab371c35f0f6c33d006723311d8e5b6a3aab3960d9955d9d99d3db9c2afe11dee0e40119589acf9dcc40e7fc0813a5c0e04ec92a2 SHA512 73d04df7890aca6331d5a010500d6bbd5fb8bd8c764334c9a0505d1bc3d17be21b7953577c54170566b8a95b6093c53f013c0cf27246411274f55e7de378e33c
+EBUILD opensm-3.3.17-r1.ebuild 1365 BLAKE2B 5b1110ba3b6fa014ff2cad78f0ae559ca6cc723e541ae57a938bffddd2754faa8573c2991551772e15ae34c5b3ba4ea2daef634aab383e8125382117904f9416 SHA512 4e2074d3d4aa27ff2224f5d95facded79d998e30d83f9341625f375b5ec8d2c81b01c6a401838881d5388798a3c46ef42b61ed19df5d1c31441c04a1db3f3397
 EBUILD opensm-3.3.23-r1.ebuild 1384 BLAKE2B 086ef56a9d7de765d36bbfbdfced331b64e9c0ed211c80a3d0bde678736c26ec218eb070e09a9c6ba631508e394863f89f8083d99a4c3795c72270da3443ded4 SHA512 7ad91036366dec5cafce6aab28b508b6a14596784915a330447f1bae3e07ad9ebcc622e1b5e2da01865a6f9b486194f771f72c7664727ba12b3d83ae8fcd3a3b
 MISC metadata.xml 579 BLAKE2B 02d654e22523ce9662d2cee069e3a0e8bbc40054a781801d1d1b0db1e3d4022230108f0e49062493b9480762c58e41fffdb6df52b18297ed93ac5ea1a05b0cc3 SHA512 b795ddb33400618477f6deec90e0e45207c85b8d5c2170cb9d2e01745144903dd998a1c01280f2e127ca3d2c7efb2ccc081a783d4c7af5d90a3196241b373803
diff --git a/sys-fabric/opensm/opensm-3.3.17-r1.ebuild b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
index 734bf09bc043..f612001e3792 100644
--- a/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit autotools epatch openib
 
 DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="tools"
 
 DEPEND="
diff --git a/sys-fabric/perftest/Manifest b/sys-fabric/perftest/Manifest
index 5fb390b48a43..354aea2a2452 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 513 BLAKE2B 7cfdeacfe8da71a9838e035bc4c3249f2a67fa83e3fb40e47ebfe1b2ee422b656f1895f1793a8b8e6eb56933cfad232704c5df364d3e657d8ee51d08f48cb1dd SHA512 f8323f445c55c96d6679821cf5e284aaf6df524449587fe8b50f37d73798721869a9571b515362f63a2512be80c99d9d406193e267a897275c8002bb97e5c64d
+EBUILD perftest-2.0.ebuild 509 BLAKE2B 399c56b912e1decb1eca0274de2a650702e30528f7f35d2ff5fde836aad72f58ad84a9ddb8cfbccc4a3d365d8b159d29761f1606d47a005f17f336c5ca77245a SHA512 d7ea96c6e86fd6f6e542287c87cbf4c0058235d559cc278aeca5c7f282c98773e69167e408e40d18cc0b4ae51071a2e7e3704a977e13b164e87821dca2956d42
 EBUILD perftest-4.4.0.37.ebuild 640 BLAKE2B 12a35a2ce47341f99e97e1383623dfc21c8109b68d55f905372dcf93faa3c18fb8cd12bec56622375a9a4351756bd7b79b5757d65fb172abc444acc7d63fa2d2 SHA512 63ceea340897b82e507700e1f51aa7afa3ea996927e989ad6fad2db5df4707e387042a6204c1bf8df9486347a601590b750feab8f0fdae498b5fb042aebf2573
 MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/sys-fabric/perftest/perftest-2.0.ebuild b/sys-fabric/perftest/perftest-2.0.ebuild
index de51e5133e34..7ed0b078e654 100644
--- a/sys-fabric/perftest/perftest-2.0.ebuild
+++ b/sys-fabric/perftest/perftest-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ inherit openib
 
 DESCRIPTION="OpenIB uverbs micro-benchmarks"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/qperf/Manifest b/sys-fabric/qperf/Manifest
index c1546423c7e7..303451194dfd 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.9.ebuild 426 BLAKE2B 1ddc244831d2ab78174bcb394547700e499f0ce658411f58f8665e7a9e05533d2e88c8d9327ed3863e94f80441dda96b924d77a022271b57e6b2fb86abb53925 SHA512 392d273776b0e5658e9ac579654f67863c12c50eb37fab411de5ddc62efd7f12d5c2bfa27c5f63b9d66aa53660bc3f6aac9ebeb772827a85642e41c5389f0685
+EBUILD qperf-0.4.9.ebuild 422 BLAKE2B 48490a090ce095121009a7fa16047fe36045ffabb511c4b830c839ecf969461a9c514085f3fb2d577712e90c19f1aa7e3440115541be1c598879f6691ddf9663 SHA512 1ce3ac0075dcb3685b1233db24b72cfdd0459cbd4d410853c9af549f9485cfc8fe02541ff2f993fcc8ddac3254dd255ceaafcb04dabe75e171656253a5f85dc3
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/qperf/qperf-0.4.9.ebuild b/sys-fabric/qperf/qperf-0.4.9.ebuild
index cf7fdace529d..f60302913051 100644
--- a/sys-fabric/qperf/qperf-0.4.9.ebuild
+++ b/sys-fabric/qperf/qperf-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="Measure RDMA and IP performance"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sys-fabric/rds-tools/Manifest b/sys-fabric/rds-tools/Manifest
index 78fe3c7bb4ea..6ba7eb44719a 100644
--- a/sys-fabric/rds-tools/Manifest
+++ b/sys-fabric/rds-tools/Manifest
@@ -1,4 +1,4 @@
 AUX rds-tools-2.0.4-qa.patch 1682 BLAKE2B b3824aa80b2646381114ad84842dae9dad163e334fcf914844d76188f0dd6731592b52b89ff7de82a4575699d63a2d629e3e700f04647a26fd9539caedb86f0c SHA512 27da05d3859abed1c5304df00c2372c2a46454f7b4cc04a11bc828c0ce5c5d66620200afe63549005bc0418047266f44a940bddbb73b929c203d8268ecb59024
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD rds-tools-2.0.4-r4.ebuild 491 BLAKE2B 5627bec5e3c4175b52466a69cd9a8d6904058127a44f313b118f8080884f798ca2056a029b71b58450479a725d70df801eb14e16ad8444f816b418e9a0bf4869 SHA512 e77f91dee0a5de2ab9e65f0edd472ac606dba8bd2d5a8a141dde16a6a16a2a47e157ab153501cb1754f80f9e8d68c71edb00032216c2a9146ca49a8d28887aa7
+EBUILD rds-tools-2.0.4-r4.ebuild 490 BLAKE2B a5b96c7277b97a334341fcd94dadf1248a6ebbcd379e3b2cdd93ac697ba62ffeb5f236b9e27514043f8bca34918957aa466590c4846a1d299aaafd8d674e78d3 SHA512 366128160ca00e6d73ac05c6aa3c7cbd389cf2d535b1415bcacc418e940b50e75459389892b7eb5b2bf67c0ce077da9ec8e788887a6aec558ddf9e3758e62396
 MISC metadata.xml 517 BLAKE2B 5216c53922586aa9474737c08b1a86d4baa596d1a0d1872e59b0403ff0166aaeec433ed02cd4443d67aa3c255ca641c9cf170b6217ca6cab0bde98e907a57950 SHA512 b4660bcb112426f8c8e785c68b64c85fd5155917405d72271bdc418821c542eb8e0bc2cb16740188851d75820d25d580a9edf4a3a35715a709b84d0134b4b2a4
diff --git a/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
index 3a143a8889fe..19a035e4d32b 100644
--- a/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
+++ b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
@@ -12,7 +12,7 @@ inherit openib toolchain-funcs
 
 DESCRIPTION="OpenIB userspace rds-tools"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
 RDEPEND="
diff --git a/sys-fabric/srptools/Manifest b/sys-fabric/srptools/Manifest
index fa755e88befd..2384d46dbebc 100644
--- a/sys-fabric/srptools/Manifest
+++ b/sys-fabric/srptools/Manifest
@@ -1,4 +1,4 @@
 AUX srpd.initd 797 BLAKE2B 484e8578af06ae400dc4b12e04ddfe0a5e3d5331e501911ee90a5b4a6b66b4bd78b04f995c5a99bb63cecd91eb5111d67a3e08229a01c5dd3e523b70ec195e60 SHA512 eb9b1ea587c4bc96ba6fb8a730e9c434f911d481962de7964eca9168e353f3803eb17553e3095ddb1cbd9b83a660ef4286c737c2d654588990fda6c65a5ba0cb
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD srptools-1.0.2.ebuild 519 BLAKE2B b2a266fc78e583f5b6e67f6a723bb7fa2b16640d5a59483789411b570de8ca07d7df9e99a41912e88d6a367cb7a18b2106022eefdfe5ab27f531b520c111b45d SHA512 e23ad7b4d8a408d26162f087312890032a8cde4137cc1109045bc6eb6156e3cae60f7835670d692465054ed25d1dab69eddcffd099ba696cc4b442b6a427277f
+EBUILD srptools-1.0.2.ebuild 515 BLAKE2B 869aab31b5f2f931badbe1d30c9c68b65b080b8314241a5532d6c91d06bcd523ea6681cf40c0f148cbffbeba0beda86c8e08922220f6e39009d506178e28d26a SHA512 5cb81b795e7f31d14008a5b630f3a9ebe0616cfdcf0af08d7dc52b6077a7daa2a23f8bc04e902f5c2cf276fd35a9ed34eea6961bf2238b27a27bc45e27277fa1
 MISC metadata.xml 527 BLAKE2B 8ad158aed487d947db44d1bfb79ba78dc1544e83970855d81a0fc4c66c4dea5092642cec534230694741a2ad67e6e6b4b884ce47e45fee74027a216764d5ffe7 SHA512 27ae66a797f390de6e188a584b6e0714e5ebb2c4b784b7ce708830f8503d7f3fa0df0824ae22f97d6e00ca61328c7730155fc09a606486f83da1aa191e82b1f2
diff --git a/sys-fabric/srptools/srptools-1.0.2.ebuild b/sys-fabric/srptools/srptools-1.0.2.ebuild
index e6db4592f57e..2e610b7912ab 100644
--- a/sys-fabric/srptools/srptools-1.0.2.ebuild
+++ b/sys-fabric/srptools/srptools-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ inherit openib
 
 DESCRIPTION="Tools for discovering and connecting to SRP CSI targets on InfiniBand fabrics"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="