gentoo resync : 16.01.2021

16 files changed, 29 insertions, 43 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index e340c355d582..ef57c450a172 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index caf1604f1c4f..88211007f5d5 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,6 +1,6 @@
 AUX fio-2.2.13-libmtd.patch 238 BLAKE2B da7843b4cb2b0fda12c2e950d4b51df661f229eb01b16b5a9d2a5d5e59b15f6c25d9865e607be8e1a86329964e2eb116ce0d1855dd1a80c156650db1ad5a3690 SHA512 66c905a79a78baaea0864d4fbf2432edfb2d98f2262ad638431d591154b1f8214dbc2ae6fed9cddd3cb4684932c830cc7402dc0a4c6b429dd955bb1a1f929f1a
 AUX fio-3.27-drop-raw.patch 3315 BLAKE2B 93cfc730e2feceae2cc20c76b93a4e1da2a6b0c8a3b3ba3231208d0074612a9a4e5836108aedb9dff03db61977c354a2fe1b2bf35c4e975b6e302a0357b78852 SHA512 67589a42e65be3821aac5043b910d589f735abb98d8b107ca9fc020d9c10b4c20f82b2e3dc9622d1f8b8ead5b69cc459470136c2d942a5690c7fdefebf57ecee
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
-EBUILD fio-3.27-r1.ebuild 4349 BLAKE2B eb818f1ded2de50842a2ac806314eb614f71655dfdceaef2ae38af7d84c2aa6e7c5ed679f1e992e7541ea9bffc980a7dca5ee79943269d2caf4fe0ad68540a57 SHA512 c2bc3b155503b290c936f287ce2d854ea48bab5081b0976954256b5b0a1660778386ce5be6db86fd2bd4b5f5688c63564152e48ee76d58c759678043f2db9b31
-EBUILD fio-3.27.ebuild 4248 BLAKE2B 3ce690dfcc7de7f55325128cd8e51d04b80226e8cdcf3811739b5dc4098b26894b4be622d45d05dc3966bb07e0692ff565699b44592e4cbf44ee134c3541bea4 SHA512 6202649f094e30df45cd9e40080c6dede7bf9ea59e69d91fb236c504c045c6e74f357569b2579d048a8f50b759ab26cdf545229c328607c5d89a416a9b1d792e
+EBUILD fio-3.27-r2.ebuild 4206 BLAKE2B 8800d344031e168b904e5fff61eb8a14a0ee92a44124f978e951ff38f5e3f388a6979d6303c9cf192bc9df7720a87af9bdb1cc5348b085f73524cd323f2cb964 SHA512 7415d1103be57a3af7ffc3c6608fe0a21d311218a70d3c381e293be592f68c2a213f928fea77b010894765e230bb2976e1fec008628912e0e31b3790db864f0e
+EBUILD fio-3.27-r3.ebuild 4307 BLAKE2B 26135cdc7985a68db5fda31c0de2617a42ccfa8b3f3b9624e05ba6edc1775d453df551c20b408787643f51b8dfb4fef0ef0593c9fd359f168ab32fb1996e3a93 SHA512 fc3248188e6eae72954bdb62137db9cc4305ff5886330e9a149cfd2f6342e55a5aefb1de8a31ecfee7c7e0f097a069f502532ba872806d8607801055acd0061f
 MISC metadata.xml 1173 BLAKE2B 757810c745c3639947d27c0d954ea2e46e00382d4293cff8f1e42f9d81f6d4a2ea8dc1b6570081fdf5c4f57f160bd880c894cfa6445e86d72b052cb282333d75 SHA512 8235e15b183df0f196ed038e74b6407805fd99114e34a792fee4521523b6f339fd932bdf3856b434b3a4a2bcef34da9eee43a83c3ebdf04c06e50c76fdd6d0a3
diff --git a/sys-block/fio/fio-3.27.ebuild b/sys-block/fio/fio-3.27-r2.ebuild
index 1a61f8f61665..1e9e3cce92bf 100644
--- a/sys-block/fio/fio-3.27.ebuild
+++ b/sys-block/fio/fio-3.27-r2.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
@@ -36,10 +36,7 @@ LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
 	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? (
-		sys-fabric/libibverbs[static-libs(+)]
-		sys-fabric/librdmacm[static-libs(+)]
-	)
+	rdma? ( sys-cluster/rdma-core[static-libs(+)] )
 	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
 	zbc? ( >=sys-block/libzbc-5 )
 	zlib? ( sys-libs/zlib[static-libs(+)] )"
diff --git a/sys-block/fio/fio-3.27-r1.ebuild b/sys-block/fio/fio-3.27-r3.ebuild
index 0113cae7750f..7165d4e4ba9c 100644
--- a/sys-block/fio/fio-3.27-r1.ebuild
+++ b/sys-block/fio/fio-3.27-r3.ebuild
@@ -36,10 +36,7 @@ LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
 	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? (
-		sys-fabric/libibverbs[static-libs(+)]
-		sys-fabric/librdmacm[static-libs(+)]
-	)
+	rdma? ( sys-cluster/rdma-core[static-libs(+)] )
 	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
 	zbc? ( >=sys-block/libzbc-5 )
 	zlib? ( sys-libs/zlib[static-libs(+)] )"
diff --git a/sys-block/libfabric/Manifest b/sys-block/libfabric/Manifest
index 39c4e79ae3fc..ee12e96e3212 100644
--- a/sys-block/libfabric/Manifest
+++ b/sys-block/libfabric/Manifest
@@ -1,3 +1,3 @@
 DIST libfabric-1.11.2.tar.bz2 1480982 BLAKE2B df419a4282b21cb513708d035721b35861969934af3771b9781288d17761be2a341bbe23098110c3a6ecb119cd508fe9cf93c002b4861c7595d3b384a99b53a5 SHA512 79d9ce52287ead57dfec20bcca91d4ca186e709379b55669612e596f40f02c83fee1c69601927e1894a01395eff128bd918c8f23ffb198f1bbba9b8d484780ef
-EBUILD libfabric-1.11.2-r1.ebuild 1532 BLAKE2B 3882f2c38c79e0a92eeb04e9c9f21c5535946916c8f0dd1c9fc7fcea0f3c90ac95e4316072399bfef7fb16f107f6796f2955b46009144690259103694b1e6da8 SHA512 d83e5e18fda45da3a9a084a31c0dd9f858f3d5389179e1b221f45c8dab262c75667e560c250d05143ba1ad7c257f10b9e63e0cfea056bdf79ddd68417fe03b6c
+EBUILD libfabric-1.11.2-r2.ebuild 1530 BLAKE2B ce9d6f1988fabf848c817e22227c1a73b10828546aad2ea10b910d2aecda58cef6d282f9aaabb3a18383bb05e67271ef1ad0911fe10dd8324bf2949e80896d49 SHA512 13d73c430471076042aebf611f507e1138c12cd20b044eea177b5697cd780dbd3da84dc5bca443578c6e791a381d32f16a29b899850faede94cf1c6bda6cfc53
 MISC metadata.xml 624 BLAKE2B 2a89eabf67fc846dbcfa88a31568cb5b43eadd2357d0e0c00ea1e17dc694760c2da53e6b514b6104cd40a59f2b25798b65a9b3c4a8ebe666662e1fbabfd258be SHA512 c9c8eb3f5b0bc2ca123e70e0eb335a09f72dcce4a328ba627519cb031b33ad33b6220fbc5f78ef072a21ce7b18269fea5ab8fefbcb2b5b7bfd840079b4d57cf5
diff --git a/sys-block/libfabric/libfabric-1.11.2-r1.ebuild b/sys-block/libfabric/libfabric-1.11.2-r2.ebuild
index 3573c62b85da..b39c2b6da40c 100644
--- a/sys-block/libfabric/libfabric-1.11.2-r1.ebuild
+++ b/sys-block/libfabric/libfabric-1.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="cuda efa usnic rocr verbs"
 DEPEND="
 	rocr? ( dev-libs/rocr-runtime:= )
 	usnic? ( dev-libs/libnl:= )
-	verbs? ( sys-fabric/libibverbs:= )
+	verbs? ( sys-cluster/rdma-core )
 "
 RDEPEND="
 	${DEPEND}
diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index ec4e47ba8ca1..47faf949c544 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,6 +1,6 @@
 AUX ndctl-71.1-bash-completion-configure.patch 1717 BLAKE2B 167bc8e1bdb8fb9c31451c7ca7ed0edd28ecdc03185a06d96b125a604b34816df1927788d5208d229704778c356d26cd41b2d031af29e66686d0dbd0c2206f74 SHA512 b688bc49e413cb41c0b611f304a91f074a99fbcd60393c18d36435a7e3fa0a4326bf2107ff731adda96d0f14b57cf37d265de6156e903f43beec225cf8a7474f
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
 DIST ndctl-72.1.tar.gz 365324 BLAKE2B 2e061bd1357c0b422f728e8624106d93e9eed2f5c7795428b0c61d041ab45569aa8bb6eb52544360ad538be85f3b7f84f8c9ab1037a8ca5498c2e1a13fa22186 SHA512 7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12
-EBUILD ndctl-71.1-r2.ebuild 1266 BLAKE2B eea6e5193230abe91775fade34483046f5bed0ac5a0fe2ff739fee84c1ec368d044b12ec3032c20f6219c038df1abcc656b948c352477570131ec4bfff639d86 SHA512 a6e207637e43d707b6263edf84b8eb1186e3da517d932767b66a1e1f6b78d4c072efec2b5a32e81c188bfb0d807c03ddb15a401c224b77a2c45cdec288505fee
-EBUILD ndctl-72.1.ebuild 1416 BLAKE2B ae72a2c145e025c8d9e3dcaa15f1386147eb65808f751458d983e0456577eb179139a8122079b98d0e5eb79b4a450ba59ebb632e424900e683cc32d9cbcb9ed1 SHA512 e230dc42c4414f9fe888f677e9bba640d7afbc82598c8d7c3f65a9ecf67cb4524e8469b9fed3954145480b56aa1840bfe296d12ef6bd76ccfe4f802ada0205ff
+EBUILD ndctl-71.1-r2.ebuild 1250 BLAKE2B 32a258fed028d6f3f17259b3377283373fc364c407bd6e925d4e15fda59402475f1a812d9a79656dccf7984cdbb0715a3b6ed118f466a1933b9d3037d1ae502f SHA512 a6b3797439595ed62a73e598d938d3c6213855e8771ee1b9e3d51ff2d6dfa5ccb70f110006ab26eb54fdd0c4d000b00ec55970eb2458db51d4d6484fbcb5666f
+EBUILD ndctl-72.1.ebuild 1400 BLAKE2B 7e02ccfdf667d270256678c3dd8afe0518b509144578ca32c823a49d49f163172f889fcbff25894ef05b2bd17b6f8828abd376a2da86dbf1c51c99e688a7be0a SHA512 965f02e6ac8d466e0b4e221a9557c30eb2b569287de8f9d4bbb5982da0d143f45a1d7fa72560d4933594ac65d881380ec7a0b4991e4fe71175198cdb91d3644d
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/sys-block/ndctl/ndctl-71.1-r2.ebuild b/sys-block/ndctl/ndctl-71.1-r2.ebuild
index d6c230f369cd..2114c59fe82e 100644
--- a/sys-block/ndctl/ndctl-71.1-r2.ebuild
+++ b/sys-block/ndctl/ndctl-71.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
 SLOT="0/6"
 KEYWORDS="amd64 ~x86"
-IUSE="bash-completion systemd test"
+IUSE="systemd test"
 
 DEPEND="
 	dev-libs/json-c:=
diff --git a/sys-block/ndctl/ndctl-72.1.ebuild b/sys-block/ndctl/ndctl-72.1.ebuild
index e19869475171..47d1a8e6a3bc 100644
--- a/sys-block/ndctl/ndctl-72.1.ebuild
+++ b/sys-block/ndctl/ndctl-72.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion systemd test"
+IUSE="systemd test"
 
 DEPEND="
 	dev-libs/iniparser:0=
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 9e29549481cb..75c35c1d27ca 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,5 +3,5 @@ AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e
 AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-EBUILD open-iscsi-2.1.4-r1.ebuild 3988 BLAKE2B 4b9a31f62814f972afe4a18a43507882bf5887e5869d55e30c2030f466eb37472ae5977e80f15e9f30dab57ed13f34108d25d7dfa0103effe92f6d0e45f01a46 SHA512 3b15efc001bd8e226d49781b0fad7d96e76b3d199b995d555550e72bb9aa2b9c26ab584805d0cff4f5eef3f7bae06668b10118e8cc02b38bf59658a7038786b6
+EBUILD open-iscsi-2.1.4-r2.ebuild 3994 BLAKE2B 3ac697018584d5292168787c2827fdd9fe4167711a330c13efa3951dc49c6c0b6d2dbb694f2eb9cd10c6197863364a6a67c536e00b8a537fb79f95f6ee118385 SHA512 6bcb5d1ebccc34fb48e50b8f8996a34949d2675234b83321ceaef5213e4178b764e2b4589a536aa64b33c438960db9810a8abf84d84a17862b33592072166ecf
 MISC metadata.xml 459 BLAKE2B e9f49255c8b945db20b33b3fb030141e6c9fd0960593a066e9257b19c138db845d0d0868ed4438f0a5152756d918f30a2b7fb6694d7add7541b6558b3f5d0172 SHA512 1941299b204f8e69a9684c615c866fba2e8f6f4eaf8f9ddc2fec23ca05f8ba4df02e36a087a2cd67ea32ab62cf0d8ed8b85dbd20dbef641ba9cdea29486e558d
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.ebuild
index 23187db32401..3b00ebc379c0 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r2.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
@@ -18,7 +18,7 @@ DEPEND="
 	sys-apps/kmod
 	sys-block/open-isns:=
 	sys-kernel/linux-headers
-	infiniband? ( sys-fabric/ofed )
+	infiniband? ( sys-cluster/rdma-core )
 	dev-libs/openssl:0=
 	systemd? ( sys-apps/systemd )
 "
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 009040fffe3a..2d91f454d9d4 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,8 +1,8 @@
 AUX tgt-1.0.79-fno-common.patch 605 BLAKE2B e3673ec6f1dd9021da4a0b44b099ccbfed52ba75318e7e43b20d55b2bdff5bc28686792a5be36d753a36aa149ba5f6836211cd8953194d0fe468c167a32132ae SHA512 efcf1e28c52cbfb93ed16a1326b581c8027948e160b87b7fb692c38eebf6f3aa704f854b30a7e4ac36e9d5c9571d0e4b0a6c322d6c895ac02ecd81a8cb07812d
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
-DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07
+DIST tgt-1.0.79.tar.gz 297825 BLAKE2B 5b48e8390ce092d2b34a7ce4bb5845ba8beb0bd6965877d1109c80b78315eea970537601e7286e1eebcdfe8f8a8b545d58b5f64185ae016f887fe0d0854c2d52 SHA512 8cae6c43521e087fed72f98ae9659995961f987170c9799f8ebb018c0571ae78f79ce490a42dd0fddc6d1c3e946105e00b7cb02e3186026e4642d1711a990fe1
 DIST tgt-1.0.80.tar.gz 298256 BLAKE2B 3a678730b3c492832b96e160e9672354aa32a3cc463e2845b1b475c238172b99c1706d3d387697c199c4f3004d8b2c4230d17bd356ce9103028525f8007c89a9 SHA512 6e48013a7da527799f25dc224bb261f7c5cf0aa3893bc337b9f4878a45d116be701a373c533ab6fa79771ccd633501c83b48084828bf6167af72e35795bb1c4f
-EBUILD tgt-1.0.79.ebuild 1574 BLAKE2B 073d55d323fd8baa437414df07e42bc797cbcdf14f7d762e74d05a87d5d7b24d6c751931c2ff60fd9c416460dc7adddfdc75408e810c718a41c2a7d8c6d706f5 SHA512 027343c091ca27cb94645107034168f69306edf2831691c97b2f8b68ca362637f27eafd610682b36c64a985e821bb92951598108d376c457aebb3160bc6fc062
-EBUILD tgt-1.0.80.ebuild 1536 BLAKE2B 0bb3fe4a95eefa968a9e27eedf3c464b1c2d2ba21addded4411928f96e09cfada84a5c1fd4ececd3a71961eda4a703ab197f817293cc891f99d74e9124c2e1bb SHA512 c9156f87c19e0f39b55dfda24d0bdea341567699beab60a6d3f7cb994faff0e35db9bbf6a583e1e9cbcf47ce2a33e0d3816f75d6b0e0c32a4c57547dd4d18106
+EBUILD tgt-1.0.79-r1.ebuild 1507 BLAKE2B 337c12c08b063bea7e8c672cd0ee0a25abc0a09796d4a5527f89661f9c534891407497f36c6fdd6232884cdc5059ef4dcf1be83a302ab0940e5af249358b8e94 SHA512 8e07f56c0b0d560cd40e672fe55a1dfdf464a7d3bef22fb7789aeb646487b468f5065e76e6a788b5c822416cbcec8f196cb71bdc30127a5efc1dd612dd2ee949
+EBUILD tgt-1.0.80-r1.ebuild 1507 BLAKE2B 5ba5dbaeb2446f2079f7d870a3dcd1eb71a67b8e309c0229afda1c334042219bbf6c53c3dc5150866f65618cfc4ce7f5e5ffef7f167d246dc6376338013a7aac SHA512 331d3165e2090abea2cecf36bca266c3be4969efad835a313eb6d69fcdbafd1d27fc17f23c61e4452d738a120c79361011c9569b7458b55b86675940ea3d2290
 MISC metadata.xml 749 BLAKE2B 0bc71ded3e2d650bd34edcb3e5515926248ff71354db504d94c548ec951ded4f71e5af1d5127d8fa3a0a3b398204436743d016fbd1cc1e765b6303a8bd734fd8 SHA512 94f7b923adade87a471854f469731094b00872727c7a668ea7e34e558eb87e661ab01c42fbe920a885f28c394f2bc9bf0fba0e48b84893ecade9c3d967e4c2ea
diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79-r1.ebuild
index 961f8dd234c7..3ab65a930348 100644
--- a/sys-block/tgt/tgt-1.0.79.ebuild
+++ b/sys-block/tgt/tgt-1.0.79-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-MY_TREE="b43dbc6"
-
 DESCRIPTION="Linux SCSI target framework (tgt)"
 HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/fujita/tgt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,16 +18,12 @@ DEPEND="
 	dev-libs/libxslt
 	dev-perl/Config-General
 	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
+	infiniband? ( sys-cluster/rdma-core )
+"
 RDEPEND="${DEPEND}
 	dev-libs/libaio
 	sys-apps/sg3_utils"
 
-S=${WORKDIR}/fujita-tgt-${MY_TREE}
-
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 pkg_setup() {
diff --git a/sys-block/tgt/tgt-1.0.80.ebuild b/sys-block/tgt/tgt-1.0.80-r1.ebuild
index 6b69bccd3612..bec1b9856298 100644
--- a/sys-block/tgt/tgt-1.0.80.ebuild
+++ b/sys-block/tgt/tgt-1.0.80-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
@@ -18,10 +18,8 @@ DEPEND="
 	dev-libs/libxslt
 	dev-perl/Config-General
 	rbd? ( sys-cluster/ceph )
-	infiniband? (
-		sys-fabric/libibverbs:=
-		sys-fabric/librdmacm:=
-	)"
+	infiniband? ( sys-cluster/rdma-core )
+"
 RDEPEND="${DEPEND}
 	dev-libs/libaio
 	sys-apps/sg3_utils"
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 9663f5a6b634..82bc827765ef 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -3,6 +3,6 @@ AUX thin-provisioning-tools-0.7.0-build-fixes.patch 1077 BLAKE2B 540efcaff8a0f82
 DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d0d2a9662bd0fd3ae5404d5895427f169640b469780f554c22c6a93187058e6399c76ba14a6fa8d73f2bb09aa79927dd458b58ffa9 SHA512 cb6c44c7215aadd72292d73e2374d8c0c28566adcb10c7a3de83576dbd28649ebba6e2cc59945a28921e423540969cb21f648c37e375d68f48e56a8be4a4c7b8
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
 EBUILD thin-provisioning-tools-0.7.0.ebuild 1288 BLAKE2B fe429bd318ab608b2161086cff3015440fd1feeaa21c03fe86c330a1045ab3c9a6efbddb6a5d414faa31757b81643299608b77fad174be8a1560523d6c8e857d SHA512 75e81c6096febf78c05d6cf9c7b9e1fb12975f5685742cd9ae48b4311343041e7af48325e6b13224c854b78882f879ede476fc915215a574d21872d846cc829e
-EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1555 BLAKE2B 6617967f20f9fb73aacac9aea09e21042a2b6ac8b1b9da4cb7854ebf142224dff80757eb44c0c6bed37d5daa792ed9a3be88c788266b4ace867e515ed1e4b209 SHA512 8bb19d3cbdb17b1aac2dd061fd1c86da666934d169a8076c8b8fd48132ae40619e12b2ad329194ed623f5dcff2ebadcad97030db040add42cd5957be1878bf99
+EBUILD thin-provisioning-tools-0.9.0-r1.ebuild 1561 BLAKE2B c03ce00a1252d1102c8adb3a0796ba22b1bc82667dbc95c24d8b29f48fadaa62316713e713e640ac4bbf7cb6f676ce3c26fbdad3193fbf677394a50ddbb5b3c1 SHA512 cee079ccc2315c9dfe9c1532a5c55c396c4318515f158e3e763a738e47bc59d57d37a83dd919fc865a514d915fef526600b1916be073989fbe5e4dd1e896fd07
 EBUILD thin-provisioning-tools-9999.ebuild 1513 BLAKE2B e96e3b15a980ec75e4ba1fdefbe6e5fcdb0595a11ec73e165b58acfec7e1e85e31755054325d82d0883f51f63bcd9fe366405e0c3ed4b878f9fc04752f5f2934 SHA512 7c33894d4b96487a91be560db7b43bdd08833ba7fc56173b4e6fc2368a6f1939f7c32f861ce1741c2329bf91a2616ff29d7c3349f6614d559a3611c05899d12f
 MISC metadata.xml 435 BLAKE2B 158935bdfedea370ca481492bd55c0de5c21e8dc3ecc56bf0428459b11ea624c23d2e050557d84f06eeac019acfba806997e9600f29ed13f27c523c13c0b57cb SHA512 fba525dba8ae7985731ef7542a248e9a4fffae4d511488a162174ccf24dcfcc96e312c1ea56754252595bd63513063c22312d33aef83b5b89c2279139539d128
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
index 3db697229d75..b00ab931548e 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.9.0-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
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
 
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git'