From 516c6ec881fc37358d3a60e327130e0d3ca58e5d Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gentoo.org>
Date: Tue, 11 Sep 2018 10:22:48 -0400
Subject: sys-cluster/openmpi: dep on v1 hwloc

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
 sys-cluster/openmpi/openmpi-1.10.7.ebuild | 2 +-
 sys-cluster/openmpi/openmpi-1.8.8.ebuild  | 2 +-
 sys-cluster/openmpi/openmpi-2.1.5.ebuild  | 2 +-
 sys-cluster/openmpi/openmpi-3.0.2.ebuild  | 2 +-
 sys-cluster/openmpi/openmpi-3.1.2.ebuild  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys-cluster')

diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 95b8a3b1b..de982dc42 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -56,7 +56,7 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	>=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 )
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 7106182d8..b7fa7fabd 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -57,7 +57,7 @@ MPI_UNCLASSED_DEP_STR="
 RDEPEND="
 	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 )
diff --git a/sys-cluster/openmpi/openmpi-2.1.5.ebuild b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
index d7beac31f..9e32c2c2a 100644
--- a/sys-cluster/openmpi/openmpi-2.1.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
@@ -49,7 +49,7 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	>=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 )
diff --git a/sys-cluster/openmpi/openmpi-3.0.2.ebuild b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
index 10ba14eca..fd6168349 100644
--- a/sys-cluster/openmpi/openmpi-3.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
@@ -49,7 +49,7 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	>=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 )
diff --git a/sys-cluster/openmpi/openmpi-3.1.2.ebuild b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
index 10ba14eca..fd6168349 100644
--- a/sys-cluster/openmpi/openmpi-3.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
@@ -49,7 +49,7 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	>=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 )
-- 
cgit v1.2.3-18-g5258