Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/
Date: Sat, 27 Jan 2018 08:23:17
Message-Id: 1517041341.d2d7f8ea4bbfc013663711501a4fded66e3e6128.mgorny@gentoo
1 commit: d2d7f8ea4bbfc013663711501a4fded66e3e6128
2 Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
3 AuthorDate: Wed Jan 10 13:49:44 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 27 08:22:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d7f8ea
7
8 sys-cluster/openmpi: Fix dependency issue for Gentoo/FreeBSD.
9
10 Bug: https://bugs.gentoo.org/489984
11 Package-Manager: Portage-2.3.13, Repoman-2.3.3
12
13 sys-cluster/openmpi/openmpi-1.10.7.ebuild | 4 ++--
14 sys-cluster/openmpi/openmpi-1.4.3.ebuild | 4 ++--
15 sys-cluster/openmpi/openmpi-1.4.5.ebuild | 4 ++--
16 sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild | 4 ++--
17 sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 4 ++--
18 sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild | 4 ++--
19 sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild | 4 ++--
20 sys-cluster/openmpi/openmpi-1.8.8.ebuild | 4 ++--
21 sys-cluster/openmpi/openmpi-2.0.2.ebuild | 4 ++--
22 sys-cluster/openmpi/openmpi-2.0.4.ebuild | 4 ++--
23 sys-cluster/openmpi/openmpi-2.1.2.ebuild | 4 ++--
24 sys-cluster/openmpi/{openmpi-3.0.0.ebuild => openmpi-3.0.0-r1.ebuild} | 4 ++--
25 12 files changed, 24 insertions(+), 24 deletions(-)
26
27 diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
28 index b5f0b4edbf3..1e9755408ff 100644
29 --- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
30 +++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
31 @@ -1,4 +1,4 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 +# Copyright 1999-2018 Gentoo Foundation
34 # Distributed under the terms of the GNU General Public License v2
35
36 EAPI=6
37 @@ -63,7 +63,7 @@ CDEPEND="
38 >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
39 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
40 cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
41 - elibc_FreeBSD? ( dev-libs/libexecinfo )
42 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
43 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
44 openmpi_fabrics_knem? ( sys-cluster/knem )
45 openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
46
47 diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
48 index 4b8de0f2d9e..26a9f682d27 100644
49 --- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
50 +++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
51 @@ -1,4 +1,4 @@
52 -# Copyright 1999-2014 Gentoo Foundation
53 +# Copyright 1999-2018 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55
56 EAPI=5
57 @@ -23,7 +23,7 @@ RDEPEND="
58 !dev-libs/libotf
59 !app-text/lcdf-typetools
60 )
61 - elibc_FreeBSD? ( dev-libs/libexecinfo )
62 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
63 !sys-cluster/mpich
64 !sys-cluster/mpich2
65 !sys-cluster/mpiexec"
66
67 diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
68 index a810a5a3e3c..86fb9bf1eea 100644
69 --- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
70 +++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
71 @@ -1,4 +1,4 @@
72 -# Copyright 1999-2013 Gentoo Foundation
73 +# Copyright 1999-2018 Gentoo Foundation
74 # Distributed under the terms of the GNU General Public License v2
75
76 EAPI=5
77 @@ -25,7 +25,7 @@ RDEPEND="
78 !dev-libs/libotf
79 !app-text/lcdf-typetools
80 )
81 - elibc_FreeBSD? ( dev-libs/libexecinfo )
82 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
83 !sys-cluster/mpich
84 !sys-cluster/mpich2
85 !sys-cluster/mpiexec"
86
87 diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
88 index 51c493411e1..977ad9484e6 100644
89 --- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
90 +++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
91 @@ -1,4 +1,4 @@
92 -# Copyright 1999-2016 Gentoo Foundation
93 +# Copyright 1999-2018 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95
96 EAPI=5
97 @@ -54,7 +54,7 @@ RDEPEND="
98 !sys-cluster/mpiexec
99 >=sys-apps/hwloc-1.3
100 dev-libs/libltdl:0
101 - elibc_FreeBSD? ( dev-libs/libexecinfo )
102 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
103 openmpi_fabrics_dapl? ( sys-fabric/dapl )
104 openmpi_fabrics_ofed? ( sys-fabric/ofed )
105 openmpi_fabrics_knem? ( sys-cluster/knem )
106
107 diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
108 index ad59007d9d7..efe14693943 100644
109 --- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
110 +++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
111 @@ -1,4 +1,4 @@
112 -# Copyright 1999-2016 Gentoo Foundation
113 +# Copyright 1999-2018 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115
116 EAPI=5
117 @@ -59,7 +59,7 @@ RDEPEND="
118 dev-libs/libltdl:0
119 >=sys-apps/hwloc-1.7.2
120 cuda? ( dev-util/nvidia-cuda-toolkit )
121 - elibc_FreeBSD? ( dev-libs/libexecinfo )
122 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
123 openmpi_fabrics_ofed? ( sys-fabric/ofed )
124 openmpi_fabrics_knem? ( sys-cluster/knem )
125 openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
126
127 diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
128 index f028d430161..1eaa1042367 100644
129 --- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
130 +++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
131 @@ -1,4 +1,4 @@
132 -# Copyright 1999-2017 Gentoo Foundation
133 +# Copyright 1999-2018 Gentoo Foundation
134 # Distributed under the terms of the GNU General Public License v2
135
136 EAPI=5
137 @@ -62,7 +62,7 @@ RDEPEND="
138 >=sys-apps/hwloc-1.9.1[numa?]
139 sys-libs/zlib
140 cuda? ( dev-util/nvidia-cuda-toolkit )
141 - elibc_FreeBSD? ( dev-libs/libexecinfo )
142 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
143 openmpi_fabrics_ofed? ( sys-fabric/ofed )
144 openmpi_fabrics_knem? ( sys-cluster/knem )
145 openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
146
147 diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
148 index fccf7a7c828..7c24c4df122 100644
149 --- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
150 +++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
151 @@ -1,4 +1,4 @@
152 -# Copyright 1999-2017 Gentoo Foundation
153 +# Copyright 1999-2018 Gentoo Foundation
154 # Distributed under the terms of the GNU General Public License v2
155
156 EAPI=5
157 @@ -62,7 +62,7 @@ CDEPEND="
158 >=sys-apps/hwloc-1.9.1[numa?]
159 sys-libs/zlib
160 cuda? ( dev-util/nvidia-cuda-toolkit )
161 - elibc_FreeBSD? ( dev-libs/libexecinfo )
162 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
163 openmpi_fabrics_ofed? ( sys-fabric/ofed )
164 openmpi_fabrics_knem? ( sys-cluster/knem )
165 openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
166
167 diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
168 index af6407a8a70..a940676eb17 100644
169 --- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
170 +++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
171 @@ -1,4 +1,4 @@
172 -# Copyright 1999-2017 Gentoo Foundation
173 +# Copyright 1999-2018 Gentoo Foundation
174 # Distributed under the terms of the GNU General Public License v2
175
176 EAPI=5
177 @@ -62,7 +62,7 @@ CDEPEND="
178 >=sys-apps/hwloc-1.9.1[numa?]
179 sys-libs/zlib
180 cuda? ( dev-util/nvidia-cuda-toolkit )
181 - elibc_FreeBSD? ( dev-libs/libexecinfo )
182 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
183 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
184 openmpi_fabrics_knem? ( sys-cluster/knem )
185 openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
186
187 diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
188 index 5553a3fcd9c..6874cdda5d3 100644
189 --- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
190 +++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
191 @@ -1,4 +1,4 @@
192 -# Copyright 1999-2017 Gentoo Foundation
193 +# Copyright 1999-2018 Gentoo Foundation
194 # Distributed under the terms of the GNU General Public License v2
195
196 EAPI=6
197 @@ -57,7 +57,7 @@ CDEPEND="
198 >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
199 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
200 cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
201 - elibc_FreeBSD? ( dev-libs/libexecinfo )
202 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
203 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
204 openmpi_fabrics_knem? ( sys-cluster/knem )
205 openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
206
207 diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
208 index e1517dff800..4be809c2952 100644
209 --- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
210 +++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
211 @@ -1,4 +1,4 @@
212 -# Copyright 1999-2017 Gentoo Foundation
213 +# Copyright 1999-2018 Gentoo Foundation
214 # Distributed under the terms of the GNU General Public License v2
215
216 EAPI=6
217 @@ -57,7 +57,7 @@ CDEPEND="
218 <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
219 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
220 cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
221 - elibc_FreeBSD? ( dev-libs/libexecinfo )
222 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
223 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
224 openmpi_fabrics_knem? ( sys-cluster/knem )
225 openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
226
227 diff --git a/sys-cluster/openmpi/openmpi-2.1.2.ebuild b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
228 index 0ef453d9dc7..d27771af895 100644
229 --- a/sys-cluster/openmpi/openmpi-2.1.2.ebuild
230 +++ b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
231 @@ -1,4 +1,4 @@
232 -# Copyright 1999-2017 Gentoo Foundation
233 +# Copyright 1999-2018 Gentoo Foundation
234 # Distributed under the terms of the GNU General Public License v2
235
236 EAPI=6
237 @@ -53,7 +53,7 @@ CDEPEND="
238 >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
239 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
240 cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
241 - elibc_FreeBSD? ( dev-libs/libexecinfo )
242 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
243 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
244 openmpi_fabrics_knem? ( sys-cluster/knem )
245 openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
246
247 diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
248 similarity index 97%
249 rename from sys-cluster/openmpi/openmpi-3.0.0.ebuild
250 rename to sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
251 index b50c4f2ad16..3626af9f53e 100644
252 --- a/sys-cluster/openmpi/openmpi-3.0.0.ebuild
253 +++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
254 @@ -1,4 +1,4 @@
255 -# Copyright 1999-2017 Gentoo Foundation
256 +# Copyright 1999-2018 Gentoo Foundation
257 # Distributed under the terms of the GNU General Public License v2
258
259 EAPI=6
260 @@ -53,7 +53,7 @@ CDEPEND="
261 >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
262 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
263 cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
264 - elibc_FreeBSD? ( dev-libs/libexecinfo )
265 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
266 openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
267 openmpi_fabrics_knem? ( sys-cluster/knem )
268 openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )