sys-cluster/openmpi: sys-cluster/pmix blocker

Quick resolution of #652432.  The ideal fix would be to have openmpi use
the system install of pmix, but neither pmix nor most of its
dependencies are using multilib.  In the meantime, resolution is
blocking recent releases of openmpi (#656080).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

13 files changed, 15 insertions, 2 deletions

diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 24c15a5e73b2..d9445be72cf3 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -58,6 +58,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!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?]
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 13aa396266d9..1c7c5aaf0513 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
+	!sys-cluster/mpiexec
+	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 76e9393e8ff1..a533b92ca6ba 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
+	!sys-cluster/mpiexec
+	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 726682652f3a..a5befadf3e4b 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -52,6 +52,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=sys-apps/hwloc-1.3
 	dev-libs/libltdl:0
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index fafe8de40b9b..c3cccad1880c 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -55,6 +55,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.7.2
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index e18b5d76f1eb..1c5265167384 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index 9cfc540f108d..e744ac73c6ca 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -57,6 +57,7 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index fed24bd2c4fe..98a3502fcb43 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -57,6 +57,7 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index bdac184888c0..89dd842faa59 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -52,6 +52,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!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?]
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 68208b7b6553..37249c6d1c32 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -52,6 +52,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-2.1.3.ebuild b/sys-cluster/openmpi/openmpi-2.1.3.ebuild
index 823dd2c95def..a100f6b01cec 100644
--- a/sys-cluster/openmpi/openmpi-2.1.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.3.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!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?]
diff --git a/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
index 6393b65d02e2..c9ae7f37806b 100644
--- a/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!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?]
diff --git a/sys-cluster/openmpi/openmpi-3.0.1.ebuild b/sys-cluster/openmpi/openmpi-3.0.1.ebuild
index 6393b65d02e2..c9ae7f37806b 100644
--- a/sys-cluster/openmpi/openmpi-3.0.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.1.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!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?]