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

diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 24c15a5e73b2de91a1b5a2fea6692ab70dbc6a67..d9445be72cf37016995a4e71cf91a6c1881a8f83 100644 (file)
--- 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 13aa396266d96247c4c69dce5fe7e397f1687c23..1c7c5aaf05131d0267ac7a29999774542bec5a53 100644 (file)
--- 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 76e9393e8ff1af96019532142e871ebd715983c1..a533b92ca6ba4d0c320892cd7b72ef8e892ac0b8 100644 (file)
--- 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 726682652f3ab95826991920a6eaf08b57c506a9..a5befadf3e4b582e10b2fddbe3f12f3f68564842 100644 (file)
--- 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 fafe8de40b9b06cdfcfc33a57d2a62a3c2bb34c8..c3cccad1880cd555f12d5a4591b93a9aac9f18ca 100644 (file)
--- 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 e18b5d76f1eb25113d79fa2319fc6cd95d1fa8ae..1c5265167384f13ba64459bb043fa33c65351bda 100644 (file)
--- 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 9cfc540f108d31499cd2d5871a6ea2a9f1fb20d6..e744ac73c6caccaac23159e3725d37e60827c683 100644 (file)
--- 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 fed24bd2c4fe556d3c09480c9fd7f42a04aef35a..98a3502fcb4386292f0ff7b94e02c34358b4f117 100644 (file)
--- 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 bdac184888c01afa5b540e2d8c62364faecfb357..89dd842faa597e4ce4b443cbda495f989df4e4db 100644 (file)
--- 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 68208b7b655303fdc0472eee0bb7f4d7f7d122d9..37249c6d1c32362ed7032f331d51ab20440f6f92 100644 (file)
--- 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 823dd2c95defcdb18caecffadd880271987035e6..a100f6b01cec210ae265337c140e3418e8a09145 100644 (file)
--- 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 6393b65d02e243e8fc9935261b4370c0d00c1107..c9ae7f37806b27500fbfaf4e37265840c765b1ad 100644 (file)
--- 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 6393b65d02e243e8fc9935261b4370c0d00c1107..c9ae7f37806b27500fbfaf4e37265840c765b1ad 100644 (file)
--- 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?]