sys-cluster/openmpi: fix SLOT operators

Package-Manager: portage-2.2.17

7 files changed, 37 insertions, 32 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 33e1bdf8c..0fa386e78 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  openmpi-1.6.5.ebuild, openmpi-1.7.3.ebuild, openmpi-1.8.1.ebuild,
+  openmpi-1.8.3.ebuild, openmpi-1.8.4-r2.ebuild:
+  sys-cluster/openmpi: fix SLOT operators
+
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +files/openmpi-ltdl.patch,
   openmpi-1.8.4-r2.ebuild:
   added fortran workaround and missing patch
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 1f00ad224..4dd7acd26 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<maintainer>
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='cma'>Enable the CMA (Cross Memory Attach) MCA</flag>
-		<flag name='cuda'>Add GPU direct support</flag>
-		<flag name='heterogeneous'>Enable features required for heterogeneous
+  <herd>cluster</herd>
+  <maintainer>
+    <email>jsbronder@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
+    <flag name="cuda">Add GPU direct support</flag>
+    <flag name="heterogeneous">Enable features required for heterogeneous
 		platform support</flag>
-		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
-		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name='vt'>Enable bundled VampirTrace support</flag>
-	</use>
+    <flag name="romio">Build the ROMIO MPI-IO component</flag>
+    <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
+    <flag name="vt">Enable bundled VampirTrace support</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.6.5.ebuild b/sys-cluster/openmpi/openmpi-1.6.5.ebuild
index 8d745e146..6303a9963 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -57,15 +57,15 @@ MPI_UNCLASSED_DEP_STR="
 RDEPEND="
 	>=sys-apps/hwloc-1.3
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_dapl? ( sys-infiniband/dapl )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_dapl? ( sys-infiniband/dapl:* )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* )
 	openmpi_fabrics_sctp? ( net-misc/lksctp-tools )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* )
 	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.7.3.ebuild b/sys-cluster/openmpi/openmpi-1.7.3.ebuild
index da23648ec..d2183e943 100644
--- a/sys-cluster/openmpi/openmpi-1.7.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -57,13 +57,13 @@ RDEPEND="
 	dev-libs/libevent
 	>=sys-apps/hwloc-1.3
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* )
 	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.8.1.ebuild b/sys-cluster/openmpi/openmpi-1.8.1.ebuild
index 73db0009f..9ee44d869 100644
--- a/sys-cluster/openmpi/openmpi-1.8.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -60,13 +60,13 @@ RDEPEND="
 	>=sys-apps/hwloc-1.7.2
 	sys-libs/zlib
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* )
 	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.8.3.ebuild b/sys-cluster/openmpi/openmpi-1.8.3.ebuild
index 73db0009f..9ee44d869 100644
--- a/sys-cluster/openmpi/openmpi-1.8.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -60,13 +60,13 @@ RDEPEND="
 	>=sys-apps/hwloc-1.7.2
 	sys-libs/zlib
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* )
 	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
index ce6c5a4c3..5174cde35 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
@@ -64,13 +64,13 @@ RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+	openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
-	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+	openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm:* )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+	openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm:* )
 	"
 DEPEND="${RDEPEND}"