summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/openib.eclass14
-rw-r--r--sys-fabric/compat-dapl/Manifest (renamed from sys-infiniband/compat-dapl/Manifest)0
-rw-r--r--sys-fabric/compat-dapl/compat-dapl-1.2.19-r1.ebuild (renamed from sys-infiniband/compat-dapl/compat-dapl-1.2.19-r1.ebuild)8
-rw-r--r--sys-fabric/compat-dapl/metadata.xml (renamed from sys-infiniband/compat-dapl/metadata.xml)0
-rw-r--r--sys-fabric/dapl/Manifest (renamed from sys-infiniband/dapl/Manifest)0
-rw-r--r--sys-fabric/dapl/dapl-2.0.36.ebuild (renamed from sys-infiniband/dapl/dapl-2.0.36.ebuild)8
-rw-r--r--sys-fabric/dapl/dapl-2.0.40.ebuild (renamed from sys-infiniband/dapl/dapl-2.0.40.ebuild)8
-rw-r--r--sys-fabric/dapl/metadata.xml (renamed from sys-infiniband/dapl/metadata.xml)0
-rw-r--r--sys-fabric/ibacm/Manifest (renamed from sys-infiniband/ibacm/Manifest)0
-rw-r--r--sys-fabric/ibacm/ibacm-1.0.7.ebuild (renamed from sys-infiniband/ibacm/ibacm-1.0.7.ebuild)4
-rw-r--r--sys-fabric/ibacm/ibacm-1.0.8.ebuild (renamed from sys-infiniband/ibacm/ibacm-1.0.8.ebuild)6
-rw-r--r--sys-fabric/ibacm/metadata.xml (renamed from sys-infiniband/ibacm/metadata.xml)0
-rw-r--r--sys-fabric/ibutils/Manifest (renamed from sys-infiniband/ibutils/Manifest)0
-rw-r--r--sys-fabric/ibutils/ibutils-1.5.7-r2.ebuild (renamed from sys-infiniband/ibutils/ibutils-1.5.7-r2.ebuild)6
-rw-r--r--sys-fabric/ibutils/ibutils-1.5.7-r3.ebuild (renamed from sys-infiniband/ibutils/ibutils-1.5.7-r3.ebuild)6
-rw-r--r--sys-fabric/ibutils/metadata.xml (renamed from sys-infiniband/ibutils/metadata.xml)0
-rw-r--r--sys-fabric/infiniband-diags/Manifest (renamed from sys-infiniband/infiniband-diags/Manifest)0
-rw-r--r--sys-fabric/infiniband-diags/infiniband-diags-1.6.1.ebuild (renamed from sys-infiniband/infiniband-diags/infiniband-diags-1.6.1.ebuild)8
-rw-r--r--sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild (renamed from sys-infiniband/infiniband-diags/infiniband-diags-1.6.4.ebuild)8
-rw-r--r--sys-fabric/infiniband-diags/metadata.xml (renamed from sys-infiniband/infiniband-diags/metadata.xml)0
-rw-r--r--sys-fabric/infinipath-psm/Manifest (renamed from sys-infiniband/infinipath-psm/Manifest)0
-rw-r--r--sys-fabric/infinipath-psm/files/42-infinipath-psm.rules (renamed from sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules)0
-rw-r--r--sys-fabric/infinipath-psm/files/infinipath-psm-include.patch (renamed from sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch)0
-rw-r--r--sys-fabric/infinipath-psm/infinipath-psm-3.0.1.ebuild (renamed from sys-infiniband/infinipath-psm/infinipath-psm-3.0.1.ebuild)4
-rw-r--r--sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild (renamed from sys-infiniband/infinipath-psm/infinipath-psm-3.2.ebuild)4
-rw-r--r--sys-fabric/infinipath-psm/metadata.xml (renamed from sys-infiniband/infinipath-psm/metadata.xml)0
-rw-r--r--sys-fabric/libcxgb3/Manifest (renamed from sys-infiniband/libcxgb3/Manifest)0
-rw-r--r--sys-fabric/libcxgb3/libcxgb3-1.3.1-r1.ebuild (renamed from sys-infiniband/libcxgb3/libcxgb3-1.3.1-r1.ebuild)4
-rw-r--r--sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild (renamed from sys-infiniband/libcxgb3/libcxgb3-1.3.1-r2.ebuild)4
-rw-r--r--sys-fabric/libcxgb3/metadata.xml (renamed from sys-infiniband/libcxgb3/metadata.xml)0
-rw-r--r--sys-fabric/libcxgb4/Manifest (renamed from sys-infiniband/libcxgb4/Manifest)0
-rw-r--r--sys-fabric/libcxgb4/libcxgb4-1.2.0-r1.ebuild (renamed from sys-infiniband/libcxgb4/libcxgb4-1.2.0-r1.ebuild)4
-rw-r--r--sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild (renamed from sys-infiniband/libcxgb4/libcxgb4-1.3.2.ebuild)4
-rw-r--r--sys-fabric/libcxgb4/metadata.xml (renamed from sys-infiniband/libcxgb4/metadata.xml)0
-rw-r--r--sys-fabric/libehca/Manifest (renamed from sys-infiniband/libehca/Manifest)0
-rw-r--r--sys-fabric/libehca/libehca-1.2.2-r2.ebuild (renamed from sys-infiniband/libehca/libehca-1.2.2-r2.ebuild)4
-rw-r--r--sys-fabric/libehca/libehca-1.2.2-r3.ebuild (renamed from sys-infiniband/libehca/libehca-1.2.2-r3.ebuild)4
-rw-r--r--sys-fabric/libehca/metadata.xml (renamed from sys-infiniband/libehca/metadata.xml)0
-rw-r--r--sys-fabric/libibcm/Manifest (renamed from sys-infiniband/libibcm/Manifest)0
-rw-r--r--sys-fabric/libibcm/libibcm-1.0.5-r2.ebuild (renamed from sys-infiniband/libibcm/libibcm-1.0.5-r2.ebuild)4
-rw-r--r--sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild (renamed from sys-infiniband/libibcm/libibcm-1.0.5-r3.ebuild)4
-rw-r--r--sys-fabric/libibcm/metadata.xml (renamed from sys-infiniband/libibcm/metadata.xml)0
-rw-r--r--sys-fabric/libibmad/Manifest (renamed from sys-infiniband/libibmad/Manifest)0
-rw-r--r--sys-fabric/libibmad/libibmad-1.3.11.ebuild (renamed from sys-infiniband/libibmad/libibmad-1.3.11.ebuild)4
-rw-r--r--sys-fabric/libibmad/libibmad-1.3.9.ebuild (renamed from sys-infiniband/libibmad/libibmad-1.3.9.ebuild)4
-rw-r--r--sys-fabric/libibmad/metadata.xml (renamed from sys-infiniband/libibmad/metadata.xml)0
-rw-r--r--sys-fabric/libibumad/Manifest (renamed from sys-infiniband/libibumad/Manifest)0
-rw-r--r--sys-fabric/libibumad/libibumad-1.3.8.ebuild (renamed from sys-infiniband/libibumad/libibumad-1.3.8.ebuild)4
-rw-r--r--sys-fabric/libibumad/libibumad-1.3.9.ebuild (renamed from sys-infiniband/libibumad/libibumad-1.3.9.ebuild)4
-rw-r--r--sys-fabric/libibumad/metadata.xml (renamed from sys-infiniband/libibumad/metadata.xml)0
-rw-r--r--sys-fabric/libibverbs/Manifest (renamed from sys-infiniband/libibverbs/Manifest)0
-rw-r--r--sys-fabric/libibverbs/libibverbs-1.1.6.ebuild (renamed from sys-infiniband/libibverbs/libibverbs-1.1.6.ebuild)4
-rw-r--r--sys-fabric/libibverbs/libibverbs-1.1.7.ebuild (renamed from sys-infiniband/libibverbs/libibverbs-1.1.7.ebuild)4
-rw-r--r--sys-fabric/libibverbs/metadata.xml (renamed from sys-infiniband/libibverbs/metadata.xml)0
-rw-r--r--sys-fabric/libibvpp/Manifest (renamed from sys-infiniband/libibvpp/Manifest)0
-rw-r--r--sys-fabric/libibvpp/libibvpp-0.1.ebuild (renamed from sys-infiniband/libibvpp/libibvpp-0.1.ebuild)4
-rw-r--r--sys-fabric/libibvpp/metadata.xml (renamed from sys-infiniband/libibvpp/metadata.xml)0
-rw-r--r--sys-fabric/libipathverbs/Manifest (renamed from sys-infiniband/libipathverbs/Manifest)0
-rw-r--r--sys-fabric/libipathverbs/libipathverbs-1.2-r2.ebuild (renamed from sys-infiniband/libipathverbs/libipathverbs-1.2-r2.ebuild)4
-rw-r--r--sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild (renamed from sys-infiniband/libipathverbs/libipathverbs-1.2.1.ebuild)4
-rw-r--r--sys-fabric/libipathverbs/metadata.xml (renamed from sys-infiniband/libipathverbs/metadata.xml)0
-rw-r--r--sys-fabric/libmlx4/Manifest (renamed from sys-infiniband/libmlx4/Manifest)0
-rw-r--r--sys-fabric/libmlx4/libmlx4-1.0.4.ebuild (renamed from sys-infiniband/libmlx4/libmlx4-1.0.4.ebuild)6
-rw-r--r--sys-fabric/libmlx4/libmlx4-1.0.5.ebuild (renamed from sys-infiniband/libmlx4/libmlx4-1.0.5.ebuild)6
-rw-r--r--sys-fabric/libmlx4/metadata.xml (renamed from sys-infiniband/libmlx4/metadata.xml)0
-rw-r--r--sys-fabric/libmlx5/Manifest (renamed from sys-infiniband/libmlx5/Manifest)0
-rw-r--r--sys-fabric/libmlx5/libmlx5-1.0.1.ebuild (renamed from sys-infiniband/libmlx5/libmlx5-1.0.1.ebuild)6
-rw-r--r--sys-fabric/libmlx5/metadata.xml (renamed from sys-infiniband/libmlx5/metadata.xml)0
-rw-r--r--sys-fabric/libmthca/Manifest (renamed from sys-infiniband/libmthca/Manifest)0
-rw-r--r--sys-fabric/libmthca/libmthca-1.0.5-r4.ebuild (renamed from sys-infiniband/libmthca/libmthca-1.0.5-r4.ebuild)6
-rw-r--r--sys-fabric/libmthca/libmthca-1.0.6.ebuild (renamed from sys-infiniband/libmthca/libmthca-1.0.6.ebuild)6
-rw-r--r--sys-fabric/libmthca/metadata.xml (renamed from sys-infiniband/libmthca/metadata.xml)0
-rw-r--r--sys-fabric/libnes/Manifest (renamed from sys-infiniband/libnes/Manifest)0
-rw-r--r--sys-fabric/libnes/libnes-1.1.3-r1.ebuild (renamed from sys-infiniband/libnes/libnes-1.1.3-r1.ebuild)6
-rw-r--r--sys-fabric/libnes/libnes-1.1.4.ebuild (renamed from sys-infiniband/libnes/libnes-1.1.4.ebuild)6
-rw-r--r--sys-fabric/libnes/metadata.xml (renamed from sys-infiniband/libnes/metadata.xml)0
-rw-r--r--sys-fabric/libocrdma/Manifest (renamed from sys-infiniband/libocrdma/Manifest)0
-rw-r--r--sys-fabric/libocrdma/libocrdma-1.0.2.ebuild (renamed from sys-infiniband/libocrdma/libocrdma-1.0.2.ebuild)6
-rw-r--r--sys-fabric/libocrdma/metadata.xml (renamed from sys-infiniband/libocrdma/metadata.xml)0
-rw-r--r--sys-fabric/librdmacm/Manifest (renamed from sys-infiniband/librdmacm/Manifest)0
-rw-r--r--sys-fabric/librdmacm/librdmacm-1.0.16.ebuild (renamed from sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild)6
-rw-r--r--sys-fabric/librdmacm/librdmacm-1.0.18.ebuild (renamed from sys-infiniband/librdmacm/librdmacm-1.0.18.ebuild)6
-rw-r--r--sys-fabric/librdmacm/metadata.xml (renamed from sys-infiniband/librdmacm/metadata.xml)0
-rw-r--r--sys-fabric/metadata.xml (renamed from sys-infiniband/metadata.xml)4
-rw-r--r--sys-fabric/mstflint/Manifest (renamed from sys-infiniband/mstflint/Manifest)0
-rw-r--r--sys-fabric/mstflint/metadata.xml (renamed from sys-infiniband/mstflint/metadata.xml)0
-rw-r--r--sys-fabric/mstflint/mstflint-1.4-r1.ebuild (renamed from sys-infiniband/mstflint/mstflint-1.4-r1.ebuild)2
-rw-r--r--sys-fabric/mstflint/mstflint-3.5.0.ebuild (renamed from sys-infiniband/mstflint/mstflint-3.5.0.ebuild)2
-rw-r--r--sys-fabric/ofed/Manifest (renamed from sys-infiniband/ofed/Manifest)0
-rw-r--r--sys-fabric/ofed/files/90-ib.rules (renamed from sys-infiniband/ofed/files/90-ib.rules)0
-rw-r--r--sys-fabric/ofed/files/openib (renamed from sys-infiniband/ofed/files/openib)2
-rw-r--r--sys-fabric/ofed/files/openib.conf (renamed from sys-infiniband/ofed/files/openib.conf)0
-rw-r--r--sys-fabric/ofed/files/openib.env (renamed from sys-infiniband/ofed/files/openib.env)0
-rw-r--r--sys-fabric/ofed/files/openib.modprobe (renamed from sys-infiniband/ofed/files/openib.modprobe)0
-rw-r--r--sys-fabric/ofed/metadata.xml (renamed from sys-infiniband/ofed/metadata.xml)0
-rw-r--r--sys-fabric/ofed/ofed-3.12_rc1.ebuild (renamed from sys-infiniband/ofed/ofed-3.12_rc1.ebuild)52
-rw-r--r--sys-fabric/ofed/ofed-3.5.ebuild (renamed from sys-infiniband/ofed/ofed-3.5.ebuild)46
-rw-r--r--sys-fabric/opensm/Manifest (renamed from sys-infiniband/opensm/Manifest)0
-rw-r--r--sys-fabric/opensm/files/opensm-3.3.17-norpm.patch (renamed from sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch)0
-rw-r--r--sys-fabric/opensm/files/opensm-3.3.17-sldd.patch (renamed from sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch)0
-rw-r--r--sys-fabric/opensm/files/opensm.conf.d (renamed from sys-infiniband/opensm/files/opensm.conf.d)0
-rw-r--r--sys-fabric/opensm/files/opensm.init.d (renamed from sys-infiniband/opensm/files/opensm.init.d)2
-rw-r--r--sys-fabric/opensm/files/sldd.conf.d (renamed from sys-infiniband/opensm/files/sldd.conf.d)0
-rw-r--r--sys-fabric/opensm/files/sldd.init.d (renamed from sys-infiniband/opensm/files/sldd.init.d)2
-rw-r--r--sys-fabric/opensm/metadata.xml (renamed from sys-infiniband/opensm/metadata.xml)0
-rw-r--r--sys-fabric/opensm/opensm-3.3.15.ebuild (renamed from sys-infiniband/opensm/opensm-3.3.15.ebuild)6
-rw-r--r--sys-fabric/opensm/opensm-3.3.17-r1.ebuild (renamed from sys-infiniband/opensm/opensm-3.3.17-r1.ebuild)6
-rw-r--r--sys-fabric/perftest/Manifest (renamed from sys-infiniband/perftest/Manifest)0
-rw-r--r--sys-fabric/perftest/metadata.xml (renamed from sys-infiniband/perftest/metadata.xml)0
-rw-r--r--sys-fabric/perftest/perftest-1.4.0.ebuild (renamed from sys-infiniband/perftest/perftest-1.4.0.ebuild)8
-rw-r--r--sys-fabric/perftest/perftest-2.0.ebuild (renamed from sys-infiniband/perftest/perftest-2.0.ebuild)8
-rw-r--r--sys-fabric/qperf/Manifest (renamed from sys-infiniband/qperf/Manifest)0
-rw-r--r--sys-fabric/qperf/metadata.xml (renamed from sys-infiniband/qperf/metadata.xml)0
-rw-r--r--sys-fabric/qperf/qperf-0.4.9.ebuild (renamed from sys-infiniband/qperf/qperf-0.4.9.ebuild)8
-rw-r--r--sys-fabric/rds-tools/Manifest (renamed from sys-infiniband/rds-tools/Manifest)0
-rw-r--r--sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch (renamed from sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch)0
-rw-r--r--sys-fabric/rds-tools/metadata.xml (renamed from sys-infiniband/rds-tools/metadata.xml)0
-rw-r--r--sys-fabric/rds-tools/rds-tools-2.0.4-r2.ebuild (renamed from sys-infiniband/rds-tools/rds-tools-2.0.4-r2.ebuild)6
-rw-r--r--sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild (renamed from sys-infiniband/rds-tools/rds-tools-2.0.4-r3.ebuild)6
-rw-r--r--sys-fabric/srptools/Manifest (renamed from sys-infiniband/srptools/Manifest)0
-rw-r--r--sys-fabric/srptools/files/srpd.initd (renamed from sys-infiniband/srptools/files/srpd.initd)2
-rw-r--r--sys-fabric/srptools/metadata.xml (renamed from sys-infiniband/srptools/metadata.xml)0
-rw-r--r--sys-fabric/srptools/srptools-0.0.4-r2.ebuild (renamed from sys-infiniband/srptools/srptools-0.0.4-r2.ebuild)6
-rw-r--r--sys-fabric/srptools/srptools-1.0.2.ebuild (renamed from sys-infiniband/srptools/srptools-1.0.2.ebuild)6
124 files changed, 189 insertions, 197 deletions
diff --git a/eclass/openib.eclass b/eclass/openib.eclass
index 1b2102ae040..0001db89cb6 100644
--- a/eclass/openib.eclass
+++ b/eclass/openib.eclass
@@ -42,7 +42,6 @@ SLOT="${OFED_VER}"
# Defines array of ofed version supported by eclass
OFED_VERSIONS=(
- "1.5.4.1"
"3.5"
"3.12"
)
@@ -52,10 +51,10 @@ OFED_VERSIONS=(
# function that creates blockers list for ofed
block_other_ofed_versions() {
local slot
- RDEPEND="${RDEPEND} !sys-infiniband/${PN}:0"
+ RDEPEND="${RDEPEND} !sys-fabric/${PN}:0"
for slot in ${OFED_VERSIONS[@]}; do
if [[ ${slot} != ${SLOT} ]]; then
- RDEPEND+=" !sys-infiniband/${PN}:${slot}"
+ RDEPEND+=" !sys-fabric/${PN}:${slot}"
fi
done
}
@@ -70,14 +69,7 @@ fi
case ${PN} in
ofed)
- case ${PV} in
- 1.5.*|1.5.*.*)
- MY_PN="ofa_kernel"
- ;;
- *)
- MY_PN="compat-rdma"
- ;;
- esac
+ MY_PN="compat-rdma"
;;
*)
MY_PN="${PN}"
diff --git a/sys-infiniband/compat-dapl/Manifest b/sys-fabric/compat-dapl/Manifest
index 7afa5aa982f..7afa5aa982f 100644
--- a/sys-infiniband/compat-dapl/Manifest
+++ b/sys-fabric/compat-dapl/Manifest
diff --git a/sys-infiniband/compat-dapl/compat-dapl-1.2.19-r1.ebuild b/sys-fabric/compat-dapl/compat-dapl-1.2.19-r1.ebuild
index eca7f4e06ab..32638676f84 100644
--- a/sys-infiniband/compat-dapl/compat-dapl-1.2.19-r1.ebuild
+++ b/sys-fabric/compat-dapl/compat-dapl-1.2.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,9 @@ DESCRIPTION="OpenIB - Direct Access Provider Library v1.2"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/librdmacm:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}
+ sys-fabric/librdmacm:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/compat-dapl/metadata.xml b/sys-fabric/compat-dapl/metadata.xml
index 0dcc685509f..0dcc685509f 100644
--- a/sys-infiniband/compat-dapl/metadata.xml
+++ b/sys-fabric/compat-dapl/metadata.xml
diff --git a/sys-infiniband/dapl/Manifest b/sys-fabric/dapl/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/dapl/Manifest
+++ b/sys-fabric/dapl/Manifest
diff --git a/sys-infiniband/dapl/dapl-2.0.36.ebuild b/sys-fabric/dapl/dapl-2.0.36.ebuild
index 5a65b3b486c..66a2fb9ec26 100644
--- a/sys-infiniband/dapl/dapl-2.0.36.ebuild
+++ b/sys-fabric/dapl/dapl-2.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,9 @@ DESCRIPTION="OpenIB - Direct Access Provider Library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/librdmacm:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}
+ sys-fabric/librdmacm:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/dapl/dapl-2.0.40.ebuild b/sys-fabric/dapl/dapl-2.0.40.ebuild
index 57d2171e590..0cce8499215 100644
--- a/sys-infiniband/dapl/dapl-2.0.40.ebuild
+++ b/sys-fabric/dapl/dapl-2.0.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,9 @@ DESCRIPTION="OpenIB - Direct Access Provider Library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/librdmacm:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}
+ sys-fabric/librdmacm:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/dapl/metadata.xml b/sys-fabric/dapl/metadata.xml
index 0dcc685509f..0dcc685509f 100644
--- a/sys-infiniband/dapl/metadata.xml
+++ b/sys-fabric/dapl/metadata.xml
diff --git a/sys-infiniband/ibacm/Manifest b/sys-fabric/ibacm/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/ibacm/Manifest
+++ b/sys-fabric/ibacm/Manifest
diff --git a/sys-infiniband/ibacm/ibacm-1.0.7.ebuild b/sys-fabric/ibacm/ibacm-1.0.7.ebuild
index 4e4adfc41a5..02edd62abbd 100644
--- a/sys-infiniband/ibacm/ibacm-1.0.7.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="IB CM pre-connection service application"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-RDEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/ibacm/ibacm-1.0.8.ebuild b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index db57b5dc5a5..277b3d1e2a3 100644
--- a/sys-infiniband/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
RDEPEND="
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
DEPEND="${RDEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/ibacm/metadata.xml b/sys-fabric/ibacm/metadata.xml
index f1a406d0b75..f1a406d0b75 100644
--- a/sys-infiniband/ibacm/metadata.xml
+++ b/sys-fabric/ibacm/metadata.xml
diff --git a/sys-infiniband/ibutils/Manifest b/sys-fabric/ibutils/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/ibutils/Manifest
+++ b/sys-fabric/ibutils/Manifest
diff --git a/sys-infiniband/ibutils/ibutils-1.5.7-r2.ebuild b/sys-fabric/ibutils/ibutils-1.5.7-r2.ebuild
index 9c5fef022ee..9d7276561ce 100644
--- a/sys-infiniband/ibutils/ibutils-1.5.7-r2.ebuild
+++ b/sys-fabric/ibutils/ibutils-1.5.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,9 +16,9 @@ DESCRIPTION="OpenIB userspace tools"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}
+DEPEND="sys-fabric/libibverbs:${SLOT}
>=dev-lang/tk-8.4"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/ibutils/ibutils-1.5.7-r3.ebuild b/sys-fabric/ibutils/ibutils-1.5.7-r3.ebuild
index b87cc603b9d..0443700b607 100644
--- a/sys-infiniband/ibutils/ibutils-1.5.7-r3.ebuild
+++ b/sys-fabric/ibutils/ibutils-1.5.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,9 +16,9 @@ DESCRIPTION="OpenIB userspace tools"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}
+DEPEND="sys-fabric/libibverbs:${SLOT}
>=dev-lang/tk-8.4"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/ibutils/metadata.xml b/sys-fabric/ibutils/metadata.xml
index 0dcc685509f..0dcc685509f 100644
--- a/sys-infiniband/ibutils/metadata.xml
+++ b/sys-fabric/ibutils/metadata.xml
diff --git a/sys-infiniband/infiniband-diags/Manifest b/sys-fabric/infiniband-diags/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/infiniband-diags/Manifest
+++ b/sys-fabric/infiniband-diags/Manifest
diff --git a/sys-infiniband/infiniband-diags/infiniband-diags-1.6.1.ebuild b/sys-fabric/infiniband-diags/infiniband-diags-1.6.1.ebuild
index 520d56c1672..984abed9a59 100644
--- a/sys-infiniband/infiniband-diags/infiniband-diags-1.6.1.ebuild
+++ b/sys-fabric/infiniband-diags/infiniband-diags-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/opensm:${SLOT}"
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/libibmad:${SLOT}
+ sys-fabric/opensm:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/infiniband-diags/infiniband-diags-1.6.4.ebuild b/sys-fabric/infiniband-diags/infiniband-diags-1.6.4.ebuild
index 94b67fec680..be5c31c8fd8 100644
--- a/sys-infiniband/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-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/opensm:${SLOT}"
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/libibmad:${SLOT}
+ sys-fabric/opensm:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/infiniband-diags/metadata.xml b/sys-fabric/infiniband-diags/metadata.xml
index a941bea1995..a941bea1995 100644
--- a/sys-infiniband/infiniband-diags/metadata.xml
+++ b/sys-fabric/infiniband-diags/metadata.xml
diff --git a/sys-infiniband/infinipath-psm/Manifest b/sys-fabric/infinipath-psm/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/infinipath-psm/Manifest
+++ b/sys-fabric/infinipath-psm/Manifest
diff --git a/sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules b/sys-fabric/infinipath-psm/files/42-infinipath-psm.rules
index 8cc1339c16e..8cc1339c16e 100644
--- a/sys-infiniband/infinipath-psm/files/42-infinipath-psm.rules
+++ b/sys-fabric/infinipath-psm/files/42-infinipath-psm.rules
diff --git a/sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch b/sys-fabric/infinipath-psm/files/infinipath-psm-include.patch
index dd13ae0d150..dd13ae0d150 100644
--- a/sys-infiniband/infinipath-psm/files/infinipath-psm-include.patch
+++ b/sys-fabric/infinipath-psm/files/infinipath-psm-include.patch
diff --git a/sys-infiniband/infinipath-psm/infinipath-psm-3.0.1.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.0.1.ebuild
index 09fd73c04f0..a5f3391afcd 100644
--- a/sys-infiniband/infinipath-psm/infinipath-psm-3.0.1.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-RDEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/sys-infiniband/infinipath-psm/infinipath-psm-3.2.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index b184cdce97b..205e3fe83fd 100644
--- a/sys-infiniband/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-RDEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/sys-infiniband/infinipath-psm/metadata.xml b/sys-fabric/infinipath-psm/metadata.xml
index 4a09d7ba8d6..4a09d7ba8d6 100644
--- a/sys-infiniband/infinipath-psm/metadata.xml
+++ b/sys-fabric/infinipath-psm/metadata.xml
diff --git a/sys-infiniband/libcxgb3/Manifest b/sys-fabric/libcxgb3/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libcxgb3/Manifest
+++ b/sys-fabric/libcxgb3/Manifest
diff --git a/sys-infiniband/libcxgb3/libcxgb3-1.3.1-r1.ebuild b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r1.ebuild
index 1f8741deeb3..6b6204e8d95 100644
--- a/sys-infiniband/libcxgb3/libcxgb3-1.3.1-r1.ebuild
+++ b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libcxgb3/libcxgb3-1.3.1-r2.ebuild b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
index 2e6af2f2333..c8936390ea6 100644
--- a/sys-infiniband/libcxgb3/libcxgb3-1.3.1-r2.ebuild
+++ b/sys-fabric/libcxgb3/libcxgb3-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB - driver for Chelsio T3-based iWARP (RDMA over IP/ethernet)"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libcxgb3/metadata.xml b/sys-fabric/libcxgb3/metadata.xml
index 6bf09024e3e..6bf09024e3e 100644
--- a/sys-infiniband/libcxgb3/metadata.xml
+++ b/sys-fabric/libcxgb3/metadata.xml
diff --git a/sys-infiniband/libcxgb4/Manifest b/sys-fabric/libcxgb4/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libcxgb4/Manifest
+++ b/sys-fabric/libcxgb4/Manifest
diff --git a/sys-infiniband/libcxgb4/libcxgb4-1.2.0-r1.ebuild b/sys-fabric/libcxgb4/libcxgb4-1.2.0-r1.ebuild
index f4ff3ec88c8..b4733fc86d9 100644
--- a/sys-infiniband/libcxgb4/libcxgb4-1.2.0-r1.ebuild
+++ b/sys-fabric/libcxgb4/libcxgb4-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB - driver for Chelsio T4-based iWARP (RDMA over IP/ethernet)"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libcxgb4/libcxgb4-1.3.2.ebuild b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
index b7289fc8673..2d09b87fd16 100644
--- a/sys-infiniband/libcxgb4/libcxgb4-1.3.2.ebuild
+++ b/sys-fabric/libcxgb4/libcxgb4-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB - driver for Chelsio T4-based iWARP (RDMA over IP/ethernet)"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libcxgb4/metadata.xml b/sys-fabric/libcxgb4/metadata.xml
index 6bf09024e3e..6bf09024e3e 100644
--- a/sys-infiniband/libcxgb4/metadata.xml
+++ b/sys-fabric/libcxgb4/metadata.xml
diff --git a/sys-infiniband/libehca/Manifest b/sys-fabric/libehca/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libehca/Manifest
+++ b/sys-fabric/libehca/Manifest
diff --git a/sys-infiniband/libehca/libehca-1.2.2-r2.ebuild b/sys-fabric/libehca/libehca-1.2.2-r2.ebuild
index c2ea30c2c8f..7de1fc499df 100644
--- a/sys-infiniband/libehca/libehca-1.2.2-r2.ebuild
+++ b/sys-fabric/libehca/libehca-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,6 +16,6 @@ DESCRIPTION="OpenIB - IBM eServer eHCA Infiniband device driver for Linux on POW
KEYWORDS=""
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libehca/libehca-1.2.2-r3.ebuild b/sys-fabric/libehca/libehca-1.2.2-r3.ebuild
index 5168f638c11..9076aa6e88a 100644
--- a/sys-infiniband/libehca/libehca-1.2.2-r3.ebuild
+++ b/sys-fabric/libehca/libehca-1.2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,6 +16,6 @@ DESCRIPTION="OpenIB - IBM eServer eHCA Infiniband device driver for Linux on POW
KEYWORDS=""
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libehca/metadata.xml b/sys-fabric/libehca/metadata.xml
index 6cc225f82f6..6cc225f82f6 100644
--- a/sys-infiniband/libehca/metadata.xml
+++ b/sys-fabric/libehca/metadata.xml
diff --git a/sys-infiniband/libibcm/Manifest b/sys-fabric/libibcm/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libibcm/Manifest
+++ b/sys-fabric/libibcm/Manifest
diff --git a/sys-infiniband/libibcm/libibcm-1.0.5-r2.ebuild b/sys-fabric/libibcm/libibcm-1.0.5-r2.ebuild
index f48cb38fb1c..825d6f4f616 100644
--- a/sys-infiniband/libibcm/libibcm-1.0.5-r2.ebuild
+++ b/sys-fabric/libibcm/libibcm-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB Userspace CM library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-RDEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibcm/libibcm-1.0.5-r3.ebuild b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
index 37ae27bb9e1..9ae71936a31 100644
--- a/sys-infiniband/libibcm/libibcm-1.0.5-r3.ebuild
+++ b/sys-fabric/libibcm/libibcm-1.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB Userspace CM library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-RDEPEND="sys-infiniband/libibverbs:${SLOT}"
+RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibcm/metadata.xml b/sys-fabric/libibcm/metadata.xml
index f1a406d0b75..f1a406d0b75 100644
--- a/sys-infiniband/libibcm/metadata.xml
+++ b/sys-fabric/libibcm/metadata.xml
diff --git a/sys-infiniband/libibmad/Manifest b/sys-fabric/libibmad/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libibmad/Manifest
+++ b/sys-fabric/libibmad/Manifest
diff --git a/sys-infiniband/libibmad/libibmad-1.3.11.ebuild b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
index 13c6c3a61be..d1f3d9d5843 100644
--- a/sys-infiniband/libibmad/libibmad-1.3.11.ebuild
+++ b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibumad:${SLOT}
+ sys-fabric/libibumad:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibmad/libibmad-1.3.9.ebuild b/sys-fabric/libibmad/libibmad-1.3.9.ebuild
index ba52ed25201..d314c8b0b4c 100644
--- a/sys-infiniband/libibmad/libibmad-1.3.9.ebuild
+++ b/sys-fabric/libibmad/libibmad-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibumad:${SLOT}
+ sys-fabric/libibumad:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibmad/metadata.xml b/sys-fabric/libibmad/metadata.xml
index 498c88269c9..498c88269c9 100644
--- a/sys-infiniband/libibmad/metadata.xml
+++ b/sys-fabric/libibmad/metadata.xml
diff --git a/sys-infiniband/libibumad/Manifest b/sys-fabric/libibumad/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libibumad/Manifest
+++ b/sys-fabric/libibumad/Manifest
diff --git a/sys-infiniband/libibumad/libibumad-1.3.8.ebuild b/sys-fabric/libibumad/libibumad-1.3.8.ebuild
index a371b0274ee..fb19d2c9c26 100644
--- a/sys-infiniband/libibumad/libibumad-1.3.8.ebuild
+++ b/sys-fabric/libibumad/libibumad-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibumad/libibumad-1.3.9.ebuild b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
index f6170b7b6df..c2d3cc1e78a 100644
--- a/sys-infiniband/libibumad/libibumad-1.3.9.ebuild
+++ b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libibumad/metadata.xml b/sys-fabric/libibumad/metadata.xml
index f0e58703dca..f0e58703dca 100644
--- a/sys-infiniband/libibumad/metadata.xml
+++ b/sys-fabric/libibumad/metadata.xml
diff --git a/sys-infiniband/libibverbs/Manifest b/sys-fabric/libibverbs/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libibverbs/Manifest
+++ b/sys-fabric/libibverbs/Manifest
diff --git a/sys-infiniband/libibverbs/libibverbs-1.1.6.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.6.ebuild
index fcfa0e0319d..879dbd6c7ef 100644
--- a/sys-infiniband/libibverbs/libibverbs-1.1.6.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,5 +17,5 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libibverbs/libibverbs-1.1.7.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
index c45f6072ea2..812412cb7aa 100644
--- a/sys-infiniband/libibverbs/libibverbs-1.1.7.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,5 +17,5 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libibverbs/metadata.xml b/sys-fabric/libibverbs/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/libibverbs/metadata.xml
+++ b/sys-fabric/libibverbs/metadata.xml
diff --git a/sys-infiniband/libibvpp/Manifest b/sys-fabric/libibvpp/Manifest
index 85fbc64398c..85fbc64398c 100644
--- a/sys-infiniband/libibvpp/Manifest
+++ b/sys-fabric/libibvpp/Manifest
diff --git a/sys-infiniband/libibvpp/libibvpp-0.1.ebuild b/sys-fabric/libibvpp/libibvpp-0.1.ebuild
index 5d22b9a81f3..c43394e518f 100644
--- a/sys-infiniband/libibvpp/libibvpp-0.1.ebuild
+++ b/sys-fabric/libibvpp/libibvpp-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,5 +14,5 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs"
+ sys-fabric/libibverbs"
RDEPEND="${DEPEND}"
diff --git a/sys-infiniband/libibvpp/metadata.xml b/sys-fabric/libibvpp/metadata.xml
index 7b39e0aaf17..7b39e0aaf17 100644
--- a/sys-infiniband/libibvpp/metadata.xml
+++ b/sys-fabric/libibvpp/metadata.xml
diff --git a/sys-infiniband/libipathverbs/Manifest b/sys-fabric/libipathverbs/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libipathverbs/Manifest
+++ b/sys-fabric/libipathverbs/Manifest
diff --git a/sys-infiniband/libipathverbs/libipathverbs-1.2-r2.ebuild b/sys-fabric/libipathverbs/libipathverbs-1.2-r2.ebuild
index 14c26bdca49..22f3e43a806 100644
--- a/sys-infiniband/libipathverbs/libipathverbs-1.2-r2.ebuild
+++ b/sys-fabric/libipathverbs/libipathverbs-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libipathverbs/libipathverbs-1.2.1.ebuild b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
index cbad6afc705..d02aace5c2a 100644
--- a/sys-infiniband/libipathverbs/libipathverbs-1.2.1.ebuild
+++ b/sys-fabric/libipathverbs/libipathverbs-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,6 +15,6 @@ DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/libipathverbs/metadata.xml b/sys-fabric/libipathverbs/metadata.xml
index cf6568d178b..cf6568d178b 100644
--- a/sys-infiniband/libipathverbs/metadata.xml
+++ b/sys-fabric/libipathverbs/metadata.xml
diff --git a/sys-infiniband/libmlx4/Manifest b/sys-fabric/libmlx4/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libmlx4/Manifest
+++ b/sys-fabric/libmlx4/Manifest
diff --git a/sys-infiniband/libmlx4/libmlx4-1.0.4.ebuild b/sys-fabric/libmlx4/libmlx4-1.0.4.ebuild
index b6b77b41a67..fb51c36f226 100644
--- a/sys-infiniband/libmlx4/libmlx4-1.0.4.ebuild
+++ b/sys-fabric/libmlx4/libmlx4-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libmlx4/libmlx4-1.0.5.ebuild b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
index a84151c8c42..2c2fbef024f 100644
--- a/sys-infiniband/libmlx4/libmlx4-1.0.5.ebuild
+++ b/sys-fabric/libmlx4/libmlx4-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libmlx4/metadata.xml b/sys-fabric/libmlx4/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/libmlx4/metadata.xml
+++ b/sys-fabric/libmlx4/metadata.xml
diff --git a/sys-infiniband/libmlx5/Manifest b/sys-fabric/libmlx5/Manifest
index a6c7bd74e5e..a6c7bd74e5e 100644
--- a/sys-infiniband/libmlx5/Manifest
+++ b/sys-fabric/libmlx5/Manifest
diff --git a/sys-infiniband/libmlx5/libmlx5-1.0.1.ebuild b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
index 63e21a00375..3cb8c3475b1 100644
--- a/sys-infiniband/libmlx5/libmlx5-1.0.1.ebuild
+++ b/sys-fabric/libmlx5/libmlx5-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libmlx5/metadata.xml b/sys-fabric/libmlx5/metadata.xml
index 4a09d7ba8d6..4a09d7ba8d6 100644
--- a/sys-infiniband/libmlx5/metadata.xml
+++ b/sys-fabric/libmlx5/metadata.xml
diff --git a/sys-infiniband/libmthca/Manifest b/sys-fabric/libmthca/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libmthca/Manifest
+++ b/sys-fabric/libmthca/Manifest
diff --git a/sys-infiniband/libmthca/libmthca-1.0.5-r4.ebuild b/sys-fabric/libmthca/libmthca-1.0.5-r4.ebuild
index e706f888c1a..b88e6651fc3 100644
--- a/sys-infiniband/libmthca/libmthca-1.0.5-r4.ebuild
+++ b/sys-fabric/libmthca/libmthca-1.0.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ DESCRIPTION="OpenIB userspace driver for Mellanox InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libmthca/libmthca-1.0.6.ebuild b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
index 71b81e28e5e..995c68e8acd 100644
--- a/sys-infiniband/libmthca/libmthca-1.0.6.ebuild
+++ b/sys-fabric/libmthca/libmthca-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB userspace driver for Mellanox InfiniBand HCAs"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libmthca/metadata.xml b/sys-fabric/libmthca/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/libmthca/metadata.xml
+++ b/sys-fabric/libmthca/metadata.xml
diff --git a/sys-infiniband/libnes/Manifest b/sys-fabric/libnes/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/libnes/Manifest
+++ b/sys-fabric/libnes/Manifest
diff --git a/sys-infiniband/libnes/libnes-1.1.3-r1.ebuild b/sys-fabric/libnes/libnes-1.1.3-r1.ebuild
index 0588d92d2a2..72d522c125f 100644
--- a/sys-infiniband/libnes/libnes-1.1.3-r1.ebuild
+++ b/sys-fabric/libnes/libnes-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,9 @@ DESCRIPTION="NetEffect RNIC Userspace Library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="static-libs"
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
src_configure() {
diff --git a/sys-infiniband/libnes/libnes-1.1.4.ebuild b/sys-fabric/libnes/libnes-1.1.4.ebuild
index 578e9ad53af..f2d6c459b6f 100644
--- a/sys-infiniband/libnes/libnes-1.1.4.ebuild
+++ b/sys-fabric/libnes/libnes-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,9 +15,9 @@ DESCRIPTION="NetEffect RNIC Userspace Library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="static-libs"
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
src_configure() {
diff --git a/sys-infiniband/libnes/metadata.xml b/sys-fabric/libnes/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/libnes/metadata.xml
+++ b/sys-fabric/libnes/metadata.xml
diff --git a/sys-infiniband/libocrdma/Manifest b/sys-fabric/libocrdma/Manifest
index a6c7bd74e5e..a6c7bd74e5e 100644
--- a/sys-infiniband/libocrdma/Manifest
+++ b/sys-fabric/libocrdma/Manifest
diff --git a/sys-infiniband/libocrdma/libocrdma-1.0.2.ebuild b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
index cf007d9a03c..2d4aab0be85 100644
--- a/sys-infiniband/libocrdma/libocrdma-1.0.2.ebuild
+++ b/sys-fabric/libocrdma/libocrdma-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
"
RDEPEND="
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/libocrdma/metadata.xml b/sys-fabric/libocrdma/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/libocrdma/metadata.xml
+++ b/sys-fabric/libocrdma/metadata.xml
diff --git a/sys-infiniband/librdmacm/Manifest b/sys-fabric/librdmacm/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/librdmacm/Manifest
+++ b/sys-fabric/librdmacm/Manifest
diff --git a/sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild b/sys-fabric/librdmacm/librdmacm-1.0.16.ebuild
index e57b14d78ec..356741c5f40 100644
--- a/sys-infiniband/librdmacm/librdmacm-1.0.16.ebuild
+++ b/sys-fabric/librdmacm/librdmacm-1.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB userspace RDMA CM library"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/librdmacm/librdmacm-1.0.18.ebuild b/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
index a4007c05883..ade45012bc9 100644
--- a/sys-infiniband/librdmacm/librdmacm-1.0.18.ebuild
+++ b/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ DESCRIPTION="OpenIB userspace RDMA CM library"
KEYWORDS="amd64 x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/librdmacm/metadata.xml b/sys-fabric/librdmacm/metadata.xml
index 7a6d65bc038..7a6d65bc038 100644
--- a/sys-infiniband/librdmacm/metadata.xml
+++ b/sys-fabric/librdmacm/metadata.xml
diff --git a/sys-infiniband/metadata.xml b/sys-fabric/metadata.xml
index 4debfb57050..c226ec5fd1c 100644
--- a/sys-infiniband/metadata.xml
+++ b/sys-fabric/metadata.xml
@@ -2,10 +2,10 @@
<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
- The sys-infiniband category contains OFED software stack and other infiniband related software.
+ The sys-fabric category contains OFED software stack and other infiniband related software.
</longdescription>
<longdescription lang="es">
- La categoría sys-infiniband contiene la pila de software OFED y
+ La categoría sys-fabric contiene la pila de software OFED y
otro software relacionado con infiniband.
</longdescription>
</catmetadata>
diff --git a/sys-infiniband/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
diff --git a/sys-infiniband/mstflint/metadata.xml b/sys-fabric/mstflint/metadata.xml
index f1a406d0b75..f1a406d0b75 100644
--- a/sys-infiniband/mstflint/metadata.xml
+++ b/sys-fabric/mstflint/metadata.xml
diff --git a/sys-infiniband/mstflint/mstflint-1.4-r1.ebuild b/sys-fabric/mstflint/mstflint-1.4-r1.ebuild
index c446fb71478..e83f0cec072 100644
--- a/sys-infiniband/mstflint/mstflint-1.4-r1.ebuild
+++ b/sys-fabric/mstflint/mstflint-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/mstflint/mstflint-3.5.0.ebuild b/sys-fabric/mstflint/mstflint-3.5.0.ebuild
index 5e16bf71fca..f3592bb7bfd 100644
--- a/sys-infiniband/mstflint/mstflint-3.5.0.ebuild
+++ b/sys-fabric/mstflint/mstflint-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/ofed/Manifest b/sys-fabric/ofed/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/ofed/Manifest
+++ b/sys-fabric/ofed/Manifest
diff --git a/sys-infiniband/ofed/files/90-ib.rules b/sys-fabric/ofed/files/90-ib.rules
index 789668486c8..789668486c8 100644
--- a/sys-infiniband/ofed/files/90-ib.rules
+++ b/sys-fabric/ofed/files/90-ib.rules
diff --git a/sys-infiniband/ofed/files/openib b/sys-fabric/ofed/files/openib
index 3a6c7571590..dddc857359b 100644
--- a/sys-infiniband/ofed/files/openib
+++ b/sys-fabric/ofed/files/openib
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/ofed/files/openib.conf b/sys-fabric/ofed/files/openib.conf
index 9b4eb292857..9b4eb292857 100644
--- a/sys-infiniband/ofed/files/openib.conf
+++ b/sys-fabric/ofed/files/openib.conf
diff --git a/sys-infiniband/ofed/files/openib.env b/sys-fabric/ofed/files/openib.env
index 2e34cf22f96..2e34cf22f96 100644
--- a/sys-infiniband/ofed/files/openib.env
+++ b/sys-fabric/ofed/files/openib.env
diff --git a/sys-infiniband/ofed/files/openib.modprobe b/sys-fabric/ofed/files/openib.modprobe
index 52828fb3bf6..52828fb3bf6 100644
--- a/sys-infiniband/ofed/files/openib.modprobe
+++ b/sys-fabric/ofed/files/openib.modprobe
diff --git a/sys-infiniband/ofed/metadata.xml b/sys-fabric/ofed/metadata.xml
index d0db584755a..d0db584755a 100644
--- a/sys-infiniband/ofed/metadata.xml
+++ b/sys-fabric/ofed/metadata.xml
diff --git a/sys-infiniband/ofed/ofed-3.12_rc1.ebuild b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
index 36b5310de05..2b083e6880e 100644
--- a/sys-infiniband/ofed/ofed-3.12_rc1.ebuild
+++ b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,31 +27,31 @@ DESCRIPTION="OpenIB system files"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="dapl +diags ibacm mstflint +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
-RDEPEND="!sys-infiniband/openib
- !sys-infiniband/openib-files
- sys-infiniband/libibcm:${SLOT}
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/librdmacm:${SLOT}
- dapl? ( sys-infiniband/dapl:${SLOT} )
- diags? ( sys-infiniband/infiniband-diags:${SLOT} )
- ibacm? ( sys-infiniband/ibacm:${SLOT} )
- mstflint? ( sys-infiniband/mstflint:${SLOT} )
- opensm? ( sys-infiniband/opensm:${SLOT} )
- perftest? ( sys-infiniband/perftest:${SLOT} )
- qperf? ( sys-infiniband/qperf:${SLOT} )
- srp? ( sys-infiniband/srptools:${SLOT} )
- rds? ( sys-infiniband/rds-tools:${SLOT} )
- ofed_drivers_cxgb3? ( sys-infiniband/libcxgb3:${SLOT} )
- ofed_drivers_cxgb4? ( sys-infiniband/libcxgb4:${SLOT} )
- ofed_drivers_ehca? ( sys-infiniband/libehca:${SLOT} )
- ofed_drivers_ipath? ( sys-infiniband/libipathverbs:${SLOT} )
- ofed_drivers_mlx4? ( sys-infiniband/libmlx4:${SLOT} )
- ofed_drivers_mlx5? ( sys-infiniband/libmlx5:${SLOT} )
- ofed_drivers_mthca? ( sys-infiniband/libmthca:${SLOT} )
- ofed_drivers_nes? ( sys-infiniband/libnes:${SLOT} )
- ofed_drivers_ocrdma? ( sys-infiniband/libocrdma:${SLOT} )
- ofed_drivers_psm? ( sys-infiniband/infinipath-psm:${SLOT} )
+RDEPEND="!sys-fabric/openib
+ !sys-fabric/openib-files
+ sys-fabric/libibcm:${SLOT}
+ 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} )
+ mstflint? ( sys-fabric/mstflint:${SLOT} )
+ opensm? ( sys-fabric/opensm:${SLOT} )
+ perftest? ( sys-fabric/perftest:${SLOT} )
+ qperf? ( sys-fabric/qperf:${SLOT} )
+ srp? ( sys-fabric/srptools:${SLOT} )
+ rds? ( sys-fabric/rds-tools:${SLOT} )
+ ofed_drivers_cxgb3? ( sys-fabric/libcxgb3:${SLOT} )
+ ofed_drivers_cxgb4? ( sys-fabric/libcxgb4:${SLOT} )
+ ofed_drivers_ehca? ( sys-fabric/libehca:${SLOT} )
+ ofed_drivers_ipath? ( sys-fabric/libipathverbs:${SLOT} )
+ ofed_drivers_mlx4? ( sys-fabric/libmlx4:${SLOT} )
+ ofed_drivers_mlx5? ( sys-fabric/libmlx5:${SLOT} )
+ ofed_drivers_mthca? ( sys-fabric/libmthca:${SLOT} )
+ ofed_drivers_nes? ( sys-fabric/libnes:${SLOT} )
+ ofed_drivers_ocrdma? ( sys-fabric/libocrdma:${SLOT} )
+ ofed_drivers_psm? ( sys-fabric/infinipath-psm:${SLOT} )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/sys-infiniband/ofed/ofed-3.5.ebuild b/sys-fabric/ofed/ofed-3.5.ebuild
index 5fb9390cd63..0bd95bf18a1 100644
--- a/sys-infiniband/ofed/ofed-3.5.ebuild
+++ b/sys-fabric/ofed/ofed-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,28 +26,28 @@ SCRIPTDIR="${S}/ofed_scripts"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="compat-dapl dapl +diags ibacm mstflint +opensm perftest rds sdp srp ${IUSE_OFED_DRIVERS}"
-RDEPEND="!sys-infiniband/openib
- !sys-infiniband/openib-files
- sys-infiniband/libibcm:${SLOT}
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/librdmacm:${SLOT}
- compat-dapl? ( sys-infiniband/compat-dapl:${SLOT} )
- dapl? ( sys-infiniband/dapl:${SLOT} )
- diags? ( sys-infiniband/infiniband-diags:${SLOT} )
- ibacm? ( sys-infiniband/ibacm:${SLOT} )
- mstflint? ( sys-infiniband/mstflint:${SLOT} )
- opensm? ( sys-infiniband/opensm:${SLOT} )
- perftest? ( sys-infiniband/perftest:${SLOT} )
- srp? ( sys-infiniband/srptools:${SLOT} )
- ofed_drivers_cxgb3? ( sys-infiniband/libcxgb3:${SLOT} )
- ofed_drivers_cxgb4? ( sys-infiniband/libcxgb4:${SLOT} )
- ofed_drivers_ehca? ( sys-infiniband/libehca:${SLOT} )
- ofed_drivers_ipath? ( sys-infiniband/libipathverbs:${SLOT} )
- ofed_drivers_mlx4? ( sys-infiniband/libmlx4:${SLOT} )
- ofed_drivers_mthca? ( sys-infiniband/libmthca:${SLOT} )
- ofed_drivers_nes? ( sys-infiniband/libnes:${SLOT} )
- ofed_drivers_psm? ( sys-infiniband/infinipath-psm:${SLOT} )
+RDEPEND="!sys-fabric/openib
+ !sys-fabric/openib-files
+ sys-fabric/libibcm:${SLOT}
+ sys-fabric/libibmad:${SLOT}
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/librdmacm:${SLOT}
+ compat-dapl? ( sys-fabric/compat-dapl:${SLOT} )
+ dapl? ( sys-fabric/dapl:${SLOT} )
+ diags? ( sys-fabric/infiniband-diags:${SLOT} )
+ ibacm? ( sys-fabric/ibacm:${SLOT} )
+ mstflint? ( sys-fabric/mstflint:${SLOT} )
+ opensm? ( sys-fabric/opensm:${SLOT} )
+ perftest? ( sys-fabric/perftest:${SLOT} )
+ srp? ( sys-fabric/srptools:${SLOT} )
+ ofed_drivers_cxgb3? ( sys-fabric/libcxgb3:${SLOT} )
+ ofed_drivers_cxgb4? ( sys-fabric/libcxgb4:${SLOT} )
+ ofed_drivers_ehca? ( sys-fabric/libehca:${SLOT} )
+ ofed_drivers_ipath? ( sys-fabric/libipathverbs:${SLOT} )
+ ofed_drivers_mlx4? ( sys-fabric/libmlx4:${SLOT} )
+ ofed_drivers_mthca? ( sys-fabric/libmthca:${SLOT} )
+ ofed_drivers_nes? ( sys-fabric/libnes:${SLOT} )
+ ofed_drivers_psm? ( sys-fabric/infinipath-psm:${SLOT} )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/sys-infiniband/opensm/Manifest b/sys-fabric/opensm/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/opensm/Manifest
+++ b/sys-fabric/opensm/Manifest
diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch b/sys-fabric/opensm/files/opensm-3.3.17-norpm.patch
index 1300d923eb7..1300d923eb7 100644
--- a/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch
+++ b/sys-fabric/opensm/files/opensm-3.3.17-norpm.patch
diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch b/sys-fabric/opensm/files/opensm-3.3.17-sldd.patch
index d7eb3ec24b9..d7eb3ec24b9 100644
--- a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
+++ b/sys-fabric/opensm/files/opensm-3.3.17-sldd.patch
diff --git a/sys-infiniband/opensm/files/opensm.conf.d b/sys-fabric/opensm/files/opensm.conf.d
index 4f0cd49a4bc..4f0cd49a4bc 100644
--- a/sys-infiniband/opensm/files/opensm.conf.d
+++ b/sys-fabric/opensm/files/opensm.conf.d
diff --git a/sys-infiniband/opensm/files/opensm.init.d b/sys-fabric/opensm/files/opensm.init.d
index 2e8cdda4dd6..30ef8c12476 100644
--- a/sys-infiniband/opensm/files/opensm.init.d
+++ b/sys-fabric/opensm/files/opensm.init.d
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/opensm/files/sldd.conf.d b/sys-fabric/opensm/files/sldd.conf.d
index ee0e8875031..ee0e8875031 100644
--- a/sys-infiniband/opensm/files/sldd.conf.d
+++ b/sys-fabric/opensm/files/sldd.conf.d
diff --git a/sys-infiniband/opensm/files/sldd.init.d b/sys-fabric/opensm/files/sldd.init.d
index e5eab845f62..73aff61b1eb 100644
--- a/sys-infiniband/opensm/files/sldd.init.d
+++ b/sys-fabric/opensm/files/sldd.init.d
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/opensm/metadata.xml b/sys-fabric/opensm/metadata.xml
index e2e73452a40..e2e73452a40 100644
--- a/sys-infiniband/opensm/metadata.xml
+++ b/sys-fabric/opensm/metadata.xml
diff --git a/sys-infiniband/opensm/opensm-3.3.15.ebuild b/sys-fabric/opensm/opensm-3.3.15.ebuild
index 85400d568fa..b9b7fbeca50 100644
--- a/sys-infiniband/opensm/opensm-3.3.15.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/libibumad:${SLOT}"
+ sys-fabric/libibmad:${SLOT}
+ sys-fabric/libibumad:${SLOT}"
RDEPEND="$DEPEND
net-misc/iputils"
block_other_ofed_versions
diff --git a/sys-infiniband/opensm/opensm-3.3.17-r1.ebuild b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
index 1382532e2b8..4eb75cd58ff 100644
--- a/sys-infiniband/opensm/opensm-3.3.17-r1.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="tools"
DEPEND="
- sys-infiniband/libibmad:${SLOT}
- sys-infiniband/libibumad:${SLOT}"
+ sys-fabric/libibmad:${SLOT}
+ sys-fabric/libibumad:${SLOT}"
RDEPEND="$DEPEND
tools? (
net-misc/iputils
diff --git a/sys-infiniband/perftest/Manifest b/sys-fabric/perftest/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/perftest/Manifest
+++ b/sys-fabric/perftest/Manifest
diff --git a/sys-infiniband/perftest/metadata.xml b/sys-fabric/perftest/metadata.xml
index 9d257e102d2..9d257e102d2 100644
--- a/sys-infiniband/perftest/metadata.xml
+++ b/sys-fabric/perftest/metadata.xml
diff --git a/sys-infiniband/perftest/perftest-1.4.0.ebuild b/sys-fabric/perftest/perftest-1.4.0.ebuild
index 1c68b6b7da1..6a8e581c0bc 100644
--- a/sys-infiniband/perftest/perftest-1.4.0.ebuild
+++ b/sys-fabric/perftest/perftest-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,9 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/librdmacm:${SLOT}"
+ sys-fabric/libibverbs:${SLOT}
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/librdmacm:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/perftest/perftest-2.0.ebuild b/sys-fabric/perftest/perftest-2.0.ebuild
index c62e468c148..63f61f7a474 100644
--- a/sys-infiniband/perftest/perftest-2.0.ebuild
+++ b/sys-fabric/perftest/perftest-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,9 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/libibumad:${SLOT}
- sys-infiniband/librdmacm:${SLOT}"
+ sys-fabric/libibverbs:${SLOT}
+ sys-fabric/libibumad:${SLOT}
+ sys-fabric/librdmacm:${SLOT}"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/qperf/Manifest b/sys-fabric/qperf/Manifest
index a6c7bd74e5e..a6c7bd74e5e 100644
--- a/sys-infiniband/qperf/Manifest
+++ b/sys-fabric/qperf/Manifest
diff --git a/sys-infiniband/qperf/metadata.xml b/sys-fabric/qperf/metadata.xml
index 98dc6c52bb2..98dc6c52bb2 100644
--- a/sys-infiniband/qperf/metadata.xml
+++ b/sys-fabric/qperf/metadata.xml
diff --git a/sys-infiniband/qperf/qperf-0.4.9.ebuild b/sys-fabric/qperf/qperf-0.4.9.ebuild
index c87f63c90be..836ddbdda4b 100644
--- a/sys-infiniband/qperf/qperf-0.4.9.ebuild
+++ b/sys-fabric/qperf/qperf-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/librdmacm:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
+ sys-fabric/librdmacm:${SLOT}
"
RDEPEND="
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
diff --git a/sys-infiniband/rds-tools/Manifest b/sys-fabric/rds-tools/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/rds-tools/Manifest
+++ b/sys-fabric/rds-tools/Manifest
diff --git a/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
index 0a8e1a575c4..0a8e1a575c4 100644
--- a/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch
+++ b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
diff --git a/sys-infiniband/rds-tools/metadata.xml b/sys-fabric/rds-tools/metadata.xml
index 0dcc685509f..0dcc685509f 100644
--- a/sys-infiniband/rds-tools/metadata.xml
+++ b/sys-fabric/rds-tools/metadata.xml
diff --git a/sys-infiniband/rds-tools/rds-tools-2.0.4-r2.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r2.ebuild
index 21aaa51a245..e11ca252fa9 100644
--- a/sys-infiniband/rds-tools/rds-tools-2.0.4-r2.ebuild
+++ b/sys-fabric/rds-tools/rds-tools-2.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,9 +16,9 @@ DESCRIPTION="OpenIB userspace rds-tools"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
DOCS=( README )
diff --git a/sys-infiniband/rds-tools/rds-tools-2.0.4-r3.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
index c7011eec971..fa4bd15f19b 100644
--- a/sys-infiniband/rds-tools/rds-tools-2.0.4-r3.ebuild
+++ b/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,9 +16,9 @@ DESCRIPTION="OpenIB userspace rds-tools"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
-DEPEND="sys-infiniband/libibverbs:${SLOT}"
+DEPEND="sys-fabric/libibverbs:${SLOT}"
RDEPEND="${DEPEND}
- !sys-infiniband/openib-userspace"
+ !sys-fabric/openib-userspace"
block_other_ofed_versions
DOCS=( README )
diff --git a/sys-infiniband/srptools/Manifest b/sys-fabric/srptools/Manifest
index ca457c58539..ca457c58539 100644
--- a/sys-infiniband/srptools/Manifest
+++ b/sys-fabric/srptools/Manifest
diff --git a/sys-infiniband/srptools/files/srpd.initd b/sys-fabric/srptools/files/srpd.initd
index 02393251ee6..d386df8396a 100644
--- a/sys-infiniband/srptools/files/srpd.initd
+++ b/sys-fabric/srptools/files/srpd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-infiniband/srptools/metadata.xml b/sys-fabric/srptools/metadata.xml
index 785fc5394ed..785fc5394ed 100644
--- a/sys-infiniband/srptools/metadata.xml
+++ b/sys-fabric/srptools/metadata.xml
diff --git a/sys-infiniband/srptools/srptools-0.0.4-r2.ebuild b/sys-fabric/srptools/srptools-0.0.4-r2.ebuild
index 09e617260f2..da45e738e55 100644
--- a/sys-infiniband/srptools/srptools-0.0.4-r2.ebuild
+++ b/sys-fabric/srptools/srptools-0.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/libibumad:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
+ sys-fabric/libibumad:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions
diff --git a/sys-infiniband/srptools/srptools-1.0.2.ebuild b/sys-fabric/srptools/srptools-1.0.2.ebuild
index e5870d22c4c..2de71bc0326 100644
--- a/sys-infiniband/srptools/srptools-1.0.2.ebuild
+++ b/sys-fabric/srptools/srptools-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
DEPEND="
- sys-infiniband/libibverbs:${SLOT}
- sys-infiniband/libibumad:${SLOT}
+ sys-fabric/libibverbs:${SLOT}
+ sys-fabric/libibumad:${SLOT}
"
RDEPEND="${DEPEND}"
block_other_ofed_versions