commit: 49b8228c170eedfc2bef83515b8b6605c1113a4c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:36:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:43:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b8228c
sys-cluster/openmpi: add hwloc subslot operator
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/openmpi/openmpi-1.10.7.ebuild | 4 ++--
.../openmpi/{openmpi-1.4.5.ebuild => openmpi-1.4.5-r1.ebuild} | 2 +-
.../openmpi/{openmpi-1.7.5-r1.ebuild => openmpi-1.7.5-r2.ebuild} | 4 ++--
.../openmpi/{openmpi-1.8.8.ebuild => openmpi-1.8.8-r1.ebuild} | 6 +++---
.../openmpi/{openmpi-2.0.4.ebuild => openmpi-2.0.4-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-2.1.6.ebuild => openmpi-2.1.6-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-3.1.4.ebuild => openmpi-3.0.4-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-3.0.4.ebuild => openmpi-3.1.4-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-4.0.4.ebuild => openmpi-4.0.2-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-4.0.2.ebuild => openmpi-4.0.3-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-4.0.3.ebuild => openmpi-4.0.4-r1.ebuild} | 4 ++--
.../openmpi/{openmpi-4.0.5.ebuild => openmpi-4.0.5-r2.ebuild} | 2 +-
.../openmpi/{openmpi-4.0.5-r1.ebuild => openmpi-4.0.5-r3.ebuild} | 2 +-
.../openmpi/{openmpi-4.0.6.ebuild => openmpi-4.0.6-r1.ebuild} | 2 +-
.../openmpi/{openmpi-4.1.1.ebuild => openmpi-4.1.1-r1.ebuild} | 2 +-
15 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 66292455600..2f7dc01da22 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -58,9 +58,9 @@ CDEPEND="
!sys-cluster/mpich2
!sys-cluster/nullmpi
!sys-cluster/pmix
- >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
+ >=dev-libs/libevent-2.0.21:=[${MULTILIB_USEDEP}]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+ <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 )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
b/sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-1.4.5.ebuild
rename to sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild
index 2a04e5e38eb..fb848dabe38 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
b/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
rename to sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild
index 2a01a1f2fb3..6c2e0849a42 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild
@@ -55,9 +55,9 @@ RDEPEND="
!sys-cluster/mpich
!sys-cluster/mpich2
!sys-cluster/pmix
- dev-libs/libevent
+ dev-libs/libevent:=
dev-libs/libltdl:0
- <sys-apps/hwloc-2
+ <sys-apps/hwloc-2:=
cuda? ( dev-util/nvidia-cuda-toolkit )
openmpi_fabrics_ofed? ( sys-fabric/ofed )
openmpi_fabrics_knem? ( sys-cluster/knem )
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
b/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-1.8.8.ebuild
rename to sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild
index 8c48f707e03..1fa495fae50 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,9 +56,9 @@ CDEPEND="
!sys-cluster/mpich
!sys-cluster/mpich2
!sys-cluster/pmix
- dev-libs/libevent
+ dev-libs/libevent:=
dev-libs/libltdl:0
- <sys-apps/hwloc-2[numa?]
+ <sys-apps/hwloc-2:=[numa?]
sys-libs/zlib
cuda? ( dev-util/nvidia-cuda-toolkit )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
b/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-2.0.4.ebuild
rename to sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild
index 93c7bfd018c..d9a4f81bf34 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild
@@ -52,9 +52,9 @@ CDEPEND="
!sys-cluster/mpich2
!sys-cluster/nullmpi
!sys-cluster/pmix
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+ >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+ <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:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
b/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-2.1.6.ebuild
rename to sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild
index bb8a65b2cf1..c37db55963e 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild
@@ -48,9 +48,9 @@ CDEPEND="
!sys-cluster/mpich2
!sys-cluster/nullmpi
!sys-cluster/pmix
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+ >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+ <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:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
b/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-3.1.4.ebuild
rename to sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild
index 6d1e97a1de5..d54b56e6cd2 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild
@@ -48,9 +48,9 @@ CDEPEND="
!sys-cluster/mpich2
!sys-cluster/nullmpi
!sys-cluster/pmix
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+ >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+ <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:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
b/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-3.0.4.ebuild
rename to sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild
index 6d1e97a1de5..d54b56e6cd2 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild
@@ -48,9 +48,9 @@ CDEPEND="
!sys-cluster/mpich2
!sys-cluster/nullmpi
!sys-cluster/pmix
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+ >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
+ <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:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.4.ebuild
b/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-4.0.4.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
index 082ecda8d6d..7dedbcb532f 100644
--- a/sys-cluster/openmpi/openmpi-4.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.2.ebuild
b/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-4.0.2.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
index 082ecda8d6d..7dedbcb532f 100644
--- a/sys-cluster/openmpi/openmpi-4.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.3.ebuild
b/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
similarity index 98%
rename from sys-cluster/openmpi/openmpi-4.0.3.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
index 082ecda8d6d..7dedbcb532f 100644
--- a/sys-cluster/openmpi/openmpi-4.0.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.5.ebuild
b/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-4.0.5.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
index 6f6f5b1017c..910b08a8e8f 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r2.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
index 6973f379e27..f7ced4a1d4a 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
diff --git a/sys-cluster/openmpi/openmpi-4.0.6.ebuild
b/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-4.0.6.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
index 47238b0329d..93df7d8495c 100644
--- a/sys-cluster/openmpi/openmpi-4.0.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.6-r1.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
diff --git a/sys-cluster/openmpi/openmpi-4.1.1.ebuild
b/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
similarity index 99%
rename from sys-cluster/openmpi/openmpi-4.1.1.ebuild
rename to sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
index 84d39a7da2a..6652c805f75 100644
--- a/sys-cluster/openmpi/openmpi-4.1.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.1.1-r1.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
!sys-cluster/nullmpi
>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+ >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
