eclass/openib.eclass: Clean up ancient versions

Also move to sys-fabric category

124 files changed, 189 insertions, 197 deletions

diff --git a/eclass/openib.eclass b/eclass/openib.eclass
index 1b2102ae0403..0001db89cb6f 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 7afa5aa982f0..7afa5aa982f0 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 eca7f4e06ab0..32638676f840 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 0dcc685509f1..0dcc685509f1 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 ca457c585395..ca457c585395 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 5a65b3b486c5..66a2fb9ec262 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 57d2171e590f..0cce84992156 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 0dcc685509f1..0dcc685509f1 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 ca457c585395..ca457c585395 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 4e4adfc41a5e..02edd62abbd7 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 db57b5dc5a57..277b3d1e2a3d 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 f1a406d0b751..f1a406d0b751 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 ca457c585395..ca457c585395 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 9c5fef022ee4..9d7276561ce8 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 b87cc603b9dd..0443700b6072 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 0dcc685509f1..0dcc685509f1 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 ca457c585395..ca457c585395 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 520d56c16721..984abed9a599 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 94b67fec6807..be5c31c8fd88 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 a941bea1995c..a941bea1995c 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 ca457c585395..ca457c585395 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 8cc1339c16e9..8cc1339c16e9 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 dd13ae0d1501..dd13ae0d1501 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 09fd73c04f08..a5f3391afcd8 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 b184cdce97ba..205e3fe83fd1 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 4a09d7ba8d61..4a09d7ba8d61 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 ca457c585395..ca457c585395 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 1f8741deeb33..6b6204e8d950 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 2e6af2f23332..c8936390ea60 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 6bf09024e3e4..6bf09024e3e4 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 ca457c585395..ca457c585395 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 f4ff3ec88c86..b4733fc86d9d 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 b7289fc8673c..2d09b87fd16e 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 6bf09024e3e4..6bf09024e3e4 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 ca457c585395..ca457c585395 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 c2ea30c2c8f7..7de1fc499df2 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 5168f638c11a..9076aa6e88a0 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 6cc225f82f62..6cc225f82f62 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 ca457c585395..ca457c585395 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 f48cb38fb1c4..825d6f4f6164 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 37ae27bb9e1d..9ae71936a31a 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 f1a406d0b751..f1a406d0b751 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 ca457c585395..ca457c585395 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 13c6c3a61be7..d1f3d9d58435 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 ba52ed252015..d314c8b0b4c2 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 498c88269c98..498c88269c98 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 ca457c585395..ca457c585395 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 a371b0274eec..fb19d2c9c266 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 f6170b7b6dfe..c2d3cc1e78ac 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 f0e58703dcaa..f0e58703dcaa 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 ca457c585395..ca457c585395 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 fcfa0e0319d2..879dbd6c7ef2 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 c45f6072ea2e..812412cb7aa1 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 98dc6c52bb2c..98dc6c52bb2c 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 85fbc64398c4..85fbc64398c4 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 5d22b9a81f31..c43394e518f1 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 7b39e0aaf17e..7b39e0aaf17e 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 ca457c585395..ca457c585395 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 14c26bdca491..22f3e43a8069 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 cbad6afc7057..d02aace5c2ab 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 cf6568d178bc..cf6568d178bc 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 ca457c585395..ca457c585395 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 b6b77b41a676..fb51c36f226e 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 a84151c8c42a..2c2fbef024f5 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 98dc6c52bb2c..98dc6c52bb2c 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 a6c7bd74e5e8..a6c7bd74e5e8 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 63e21a003759..3cb8c3475b19 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 4a09d7ba8d61..4a09d7ba8d61 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 ca457c585395..ca457c585395 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 e706f888c1ab..b88e6651fc31 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 71b81e28e5ee..995c68e8acd3 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 98dc6c52bb2c..98dc6c52bb2c 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 ca457c585395..ca457c585395 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 0588d92d2a2d..72d522c125fc 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 578e9ad53af6..f2d6c459b6f8 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 98dc6c52bb2c..98dc6c52bb2c 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 a6c7bd74e5e8..a6c7bd74e5e8 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 cf007d9a03ce..2d4aab0be857 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 98dc6c52bb2c..98dc6c52bb2c 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 ca457c585395..ca457c585395 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 e57b14d78eca..356741c5f400 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 a4007c058831..ade45012bc99 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 7a6d65bc038b..7a6d65bc038b 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 4debfb570508..c226ec5fd1c2 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 ca457c585395..ca457c585395 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 f1a406d0b751..f1a406d0b751 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 c446fb714782..e83f0cec0724 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 5e16bf71fca4..f3592bb7bfdf 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 ca457c585395..ca457c585395 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 789668486c8c..789668486c8c 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 3a6c75715908..dddc857359b4 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 9b4eb292857c..9b4eb292857c 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 2e34cf22f96b..2e34cf22f96b 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 52828fb3bf65..52828fb3bf65 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 d0db584755a6..d0db584755a6 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 36b5310de050..2b083e6880ee 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 5fb9390cd636..0bd95bf18a11 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 ca457c585395..ca457c585395 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 1300d923eb7d..1300d923eb7d 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 d7eb3ec24b9b..d7eb3ec24b9b 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 4f0cd49a4bc5..4f0cd49a4bc5 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 2e8cdda4dd6e..30ef8c124762 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 ee0e88750310..ee0e88750310 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 e5eab845f620..73aff61b1eb5 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 e2e73452a40a..e2e73452a40a 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 85400d568fa4..b9b7fbeca50c 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 1382532e2b87..4eb75cd58ff6 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 ca457c585395..ca457c585395 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 9d257e102d27..9d257e102d27 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 1c68b6b7da15..6a8e581c0bc5 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 c62e468c1480..63f61f7a474e 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 a6c7bd74e5e8..a6c7bd74e5e8 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 98dc6c52bb2c..98dc6c52bb2c 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 c87f63c90be3..836ddbdda4bd 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 ca457c585395..ca457c585395 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 0a8e1a575c4a..0a8e1a575c4a 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 0dcc685509f1..0dcc685509f1 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 21aaa51a2453..e11ca252fa9f 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 c7011eec971d..fa4bd15f19b3 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 ca457c585395..ca457c585395 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 02393251ee6b..d386df8396ac 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 785fc5394edb..785fc5394edb 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 09e617260f20..da45e738e556 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 e5870d22c4c4..2de71bc03263 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