gentoo resync : 05.12.2021

9 files changed, 6 insertions, 45 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 5b6b43982db2..0f53368c30fb 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/dapl/Manifest b/sys-fabric/dapl/Manifest
deleted file mode 100644
index 02f52b187112..000000000000
--- a/sys-fabric/dapl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD dapl-2.0.40.ebuild 437 BLAKE2B 47ba7eb66a5a382908f932e0b2bd90e58648b0dd9f7407286400de0dc7b92c1de6f96d03759e1bf71c3dce2b91b01cb39f5563860152e08c9d7cce8b5b7a0cd3 SHA512 c4910b4d57bde582a20dac73a251db204a039ef25e156d30f4e331bf601249909efb50be4b53df4e30c7cb869601d5649f516298a6cf251ce3cbac1771b18e2c
-MISC metadata.xml 518 BLAKE2B 16932817f6e6e610f92ef9376c0acb445c70a5aa43ed85d9ab53d5da675f4da1cf62eb2edeb3f6bb40d93afb6505dde72b1df1038443bd90f46238fa87811f36 SHA512 565378f9d0ad9a962b68862385b49bbe059e67b4da78ba543e44828e62e655c6a6264180aef27fc4e97f99a5fa0e76c4353b34c1b424f4d9e3d4c817a2740164
diff --git a/sys-fabric/dapl/dapl-2.0.40.ebuild b/sys-fabric/dapl/dapl-2.0.40.ebuild
deleted file mode 100644
index 5eeb4085c365..000000000000
--- a/sys-fabric/dapl/dapl-2.0.40.ebuild
+++ /dev/null
@@ -1,22 +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 - Direct Access Provider Library"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-fabric/libibverbs:${SLOT}
-		sys-fabric/librdmacm:${SLOT}"
-RDEPEND="${DEPEND}
-		!sys-fabric/openib-userspace"
-
-block_other_ofed_versions
diff --git a/sys-fabric/dapl/metadata.xml b/sys-fabric/dapl/metadata.xml
deleted file mode 100644
index 320740d0fe0c..000000000000
--- a/sys-fabric/dapl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-<longdescription>
-uDAPL is a transport neutral infrastructure that provides RDMA capabilities in
-user space.  It is the user space component of DAPL,  the Direct Access Provider
-Library for RDMA transports.  See http://www.datcollaborative.org/
-</longdescription>
-</pkgmetadata>
diff --git a/sys-fabric/infiniband-diags/Manifest b/sys-fabric/infiniband-diags/Manifest
index da51c5d56d83..eba572ab160a 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 577 BLAKE2B 50052e5dd4e5bc6abcdfcc2be088fb564cf4f0dc2d2a84785932987b00c3a820c153f6ab421fc40ad0e61fde2b76f23a34002b3ec8e5164b6c0f2de8a1c5a409 SHA512 9f5ca8a6e3ea2dbaba38f4c26da10d143da0c4b2929d59ed9de880db7b8bd565e51ac3a0454fea948436d91ec75f5dae1fc2a0029077c34fc54bff95f851ce0f
+EBUILD infiniband-diags-1.6.4.ebuild 592 BLAKE2B 08b0b717016fcfd73df86ab352596024113348f1e7035d66675dc21055a5a1f898c2eff3324d71a0f23ee021868353862aeee1fec7effbc8043c5ecec491b990 SHA512 8afe5e683bb221e7fcc01afc5be601101a94754f63f01653854f129f204a68d61135762dd6a0554a7b79e060b438ca11d6d5aa94a8db6e1ab5b16647bd9e0106
 MISC metadata.xml 258 BLAKE2B b832ddd16b2a0a4c37b2384ee33e5270040e0221200f92a78c56dd23acf25a7aec5fbf4ccfca8b82eeb669629681684c19b23bf535bc8b05a4f0bd4fb3fcb53e SHA512 0b1852169d6b1f525065559dee560e10c3fd818f197536da258fd1e4486622ac962f5fdb82a514592d8f70c98f6ea1a3fc48bd1349b31bf186b729a0e53f9037
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 b668343fe9d1..9eaa92740086 100644
--- a/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
+++ b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
@@ -17,7 +17,8 @@ IUSE=""
 DEPEND="
 	sys-fabric/libibumad:${SLOT}
 	sys-fabric/libibmad:${SLOT}
-	sys-fabric/opensm:${SLOT}"
+	sys-fabric/opensm:${SLOT}
+	dev-libs/glib"
 RDEPEND="${DEPEND}"
 block_other_ofed_versions
 
diff --git a/sys-fabric/ofed/Manifest b/sys-fabric/ofed/Manifest
index 946e441d75d5..360cac5abe87 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 4957 BLAKE2B c923b5555048e38834eecd0f94b538c3c2cadf80d4be97eafbe6b4a22d4649cdcf4f161bd2c261ad49004c1c0e7c523490d34d349be0e6eec1340aa5ea067232 SHA512 b23fc4c9093bd1e01da52f514cf65a8172c71a819b4c2bcd3ec30cd8f3102c3b7dcc4c084a8a4757a046940610d3b47b36bcd9a9cf42dab4ffd6f9f7ffd43186
-MISC metadata.xml 769 BLAKE2B 95fb6e12ae9b6009fca1ec5e95b36745c114a2fe58243acbe47761e360e1f02dade24a02a4083eb33add032652ec9609b26fddfbfe438644332cf82570e02590 SHA512 80c74fe123a69773ce6a02366c38ba682b7799c94e97e549731bceb3cafa69b47b68067406f3c7a8374e7a8ec2f279e37a626d64f9657872ceef4164c7e8b771
+EBUILD ofed-3.12_rc1.ebuild 4916 BLAKE2B 2bafa16f70b142d97bab166ab97e6dd709a92e373b9146d2792068518b38ce98238af83195f1ccdd9e72f0b4ce0dc235281e34452af53a68718c4df142927167 SHA512 33a1459c9a8517a0ee5d8aa2ef87807e7ee0ace99c2ddc2e748e4a15fe14d0743fda5295c36cd1fa6edcdb89872420bff2b86b7decbf08f0f1a31c8f96235b9d
+MISC metadata.xml 703 BLAKE2B 8d224de6b09721e65b23623aa37966524435ec9d87c57b5d851baecf620e70a2ca3afa94452bf40d522df5d51f66e24049fc12c8ef6715771da9e667645d64d7 SHA512 3bd102be0fda49f0c963e3f68b1c02716ecc225fdb00716c1eeae1b58cf19085b84fdf8a7052ec26e39a2c5e8a735584bdb5063fbf114d8b9e060e1c90a6617b
diff --git a/sys-fabric/ofed/metadata.xml b/sys-fabric/ofed/metadata.xml
index 8095275b9aac..28be22f462fd 100644
--- a/sys-fabric/ofed/metadata.xml
+++ b/sys-fabric/ofed/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
-		<flag name="dapl">Add support for DAPL abstraction layer</flag>
 		<flag name="diags">Add dignostic tools for infiniband</flag>
 		<flag name="ibacm">Add support for userspace pre-connection services</flag>
 		<flag name="opensm">Add OpenSM - Subnet manager for infiniband</flag>
diff --git a/sys-fabric/ofed/ofed-3.12_rc1.ebuild b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
index 16f98a9d1cd4..217d5fbb4248 100644
--- a/sys-fabric/ofed/ofed-3.12_rc1.ebuild
+++ b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
@@ -24,7 +24,7 @@ inherit openib udev toolchain-funcs
 
 DESCRIPTION="OpenIB system files"
 KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="dapl +diags ibacm +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
+IUSE="+diags ibacm +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
 
 RDEPEND="!sys-fabric/openib
 		!sys-fabric/openib-files
@@ -32,7 +32,6 @@ RDEPEND="!sys-fabric/openib
 		sys-fabric/libibmad:${SLOT}
 		sys-fabric/libibumad:${SLOT}
 		sys-fabric/librdmacm:${SLOT}
-		dapl? ( sys-fabric/dapl:${SLOT} )
 		diags? ( sys-fabric/infiniband-diags:${SLOT} )
 		ibacm? ( sys-fabric/ibacm:${SLOT} )
 		opensm? ( sys-fabric/opensm:${SLOT} )