diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index d9445be72cf37..0e6ce190c374a 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -61,7 +61,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index a5befadf3e4b5..3600523ee5a22 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	!sys-cluster/pmix
-	>=sys-apps/hwloc-1.3
+	<sys-apps/hwloc-2
 	dev-libs/libltdl:0
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_dapl? ( sys-fabric/dapl )
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index c3cccad1880cd..8c0bcae38a87f 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
-	>=sys-apps/hwloc-1.7.2
+	<sys-apps/hwloc-2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index 1c5265167384f..bd218f14d8dcf 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
-	>=sys-apps/hwloc-1.9.1[numa?]
+	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index e744ac73c6cac..3607234253574 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
-	>=sys-apps/hwloc-1.9.1[numa?]
+	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 98a3502fcb438..3e7db1e7dfd5c 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
-	>=sys-apps/hwloc-1.9.1[numa?]
+	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 89dd842faa597..4c907476d293f 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -55,7 +55,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-2.1.5.ebuild b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
index a100f6b01cec2..48a9ae2b37711 100644
--- a/sys-cluster/openmpi/openmpi-2.1.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-3.0.2.ebuild b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
index c9ae7f37806b2..4143e0808050c 100644
--- a/sys-cluster/openmpi/openmpi-3.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-3.1.2.ebuild b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
index c9ae7f37806b2..4143e0808050c 100644
--- a/sys-cluster/openmpi/openmpi-3.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )