commit:     eb24de272582582bc5b0c2a1f035b44c1b0a7fff
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 18:37:59 2018 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Thu May 24 14:53:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb24de27

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

 sys-cluster/openmpi/openmpi-1.10.7.ebuild   | 1 +
 sys-cluster/openmpi/openmpi-1.4.3.ebuild    | 3 ++-
 sys-cluster/openmpi/openmpi-1.4.5.ebuild    | 3 ++-
 sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild | 1 +
 sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 1 +
 sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild | 1 +
 sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild | 1 +
 sys-cluster/openmpi/openmpi-1.8.8.ebuild    | 1 +
 sys-cluster/openmpi/openmpi-2.0.2.ebuild    | 1 +
 sys-cluster/openmpi/openmpi-2.0.4.ebuild    | 1 +
 sys-cluster/openmpi/openmpi-2.1.3.ebuild    | 1 +
 sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild | 1 +
 sys-cluster/openmpi/openmpi-3.0.1.ebuild    | 1 +
 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 24c15a5e73b..d9445be72cf 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 13aa396266d..1c7c5aaf051 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 76e9393e8ff..a533b92ca6b 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 726682652f3..a5befadf3e4 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 fafe8de40b9..c3cccad1880 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 e18b5d76f1e..1c526516738 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 9cfc540f108..e744ac73c6c 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 fed24bd2c4f..98a3502fcb4 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 bdac184888c..89dd842faa5 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 68208b7b655..37249c6d1c3 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 823dd2c95de..a100f6b01ce 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 6393b65d02e..c9ae7f37806 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 6393b65d02e..c9ae7f37806 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?]

Reply via email to