sys-cluster/openmpi: Fix dependency issue for Gentoo/FreeBSD.

Bug: https://bugs.gentoo.org/489984
Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index b5f0b4edbf3045970e4847da7c1c6352bc3b9402..1e9755408ffe15d448716d1ce9129b9493291692 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.10.0-r2[${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 )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )

diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 4b8de0f2d9e858f367a5b8f7dee3d52ee40dd3d2..26a9f682d2767ad6baa5b5a184c00138aeb4b788 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="
                !dev-libs/libotf
                !app-text/lcdf-typetools
        )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        !sys-cluster/mpich
        !sys-cluster/mpich2
        !sys-cluster/mpiexec"

diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index a810a5a3e3ce81314029a3b3dee50aeb014dc11f..86fb9bf1eeaab2e5eb6b3c10779b1e5d4f1fc7a3 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="
                !dev-libs/libotf
                !app-text/lcdf-typetools
        )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        !sys-cluster/mpich
        !sys-cluster/mpich2
        !sys-cluster/mpiexec"

diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 51c493411e1790fe2fa136408c2f691cbef1a12a..977ad9484e682af75a996193bf9d1987773255f2 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -54,7 +54,7 @@ RDEPEND="
        !sys-cluster/mpiexec
        >=sys-apps/hwloc-1.3
        dev-libs/libltdl:0
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_dapl? ( sys-fabric/dapl )
        openmpi_fabrics_ofed? ( sys-fabric/ofed )
        openmpi_fabrics_knem? ( sys-cluster/knem )

diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index ad59007d9d7be17bd9dd034b1ab9a5bc8e01cba0..efe14693943d60a651e1fe03bd33bc917ecd73cb 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,7 +59,7 @@ RDEPEND="
        dev-libs/libltdl:0
        >=sys-apps/hwloc-1.7.2
        cuda? ( dev-util/nvidia-cuda-toolkit )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_open-mx? ( sys-cluster/open-mx )

diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index f028d4301614b8021281491aaa78f3769e2c9153..1eaa1042367ac9878ebe71a703710c8dee5c68fe 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ RDEPEND="
        >=sys-apps/hwloc-1.9.1[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_open-mx? ( sys-cluster/open-mx )

diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index fccf7a7c8285270d158fa28043f1a75bbad52a2f..7c24c4df1221ebba21b8d6c4041a1fc984a03f52 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.9.1[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_open-mx? ( sys-cluster/open-mx )

diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index af6407a8a709989e67e8408aac2c892fd8074687..a940676eb17f14667268f11c7ae44eb11a6f19cd 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.9.1[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
-       elibc_FreeBSD? ( dev-libs/libexecinfo )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_open-mx? ( sys-cluster/open-mx )

diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 5553a3fcd9ce29e1d7c52abdc558addd75f35337..6874cdda5d301f22ba59bcdae72e46e117b0c24d 100644 (file)
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.11.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 )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )

diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index e1517dff800ce10aae0ac5ba3058fc3e141c00c0..4be809c2952b46a6b8a37539df4aa3012dfbfb54 100644 (file)
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ CDEPEND="
        <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 )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )

diff --git a/sys-cluster/openmpi/openmpi-2.1.2.ebuild b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
index 0ef453d9dc782cf0fde2ab33fc17a37e44d93d10..d27771af895ec29e58923ef5aec37edbbedc28a1 100644 (file)
--- a/sys-cluster/openmpi/openmpi-2.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.11.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 )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )

diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
similarity index 97%
rename from sys-cluster/openmpi/openmpi-3.0.0.ebuild
rename to sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
index b50c4f2ad1639b174dad68c08b0b6211326eefe9..3626af9f53e857c3c070afbe633be1fbd6bf58f7 100644 (file)
--- a/sys-cluster/openmpi/openmpi-3.0.0.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
        >=sys-apps/hwloc-1.11.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 )
+       elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )