[gentoo-commits] proj/sci:master commit in: sys-cluster/mvapich2/

["Christoph Junghans" <ottxor@gentoo.org>]

commit:     05174174fa6bf421e86fa0a3e0e58ee16bcb2046
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 15 00:06:29 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Nov 15 00:06:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=05174174

drop old deps

Package-Manager: portage-2.2.8-r2

---
 sys-cluster/mvapich2/ChangeLog              |  6 ++++--
 sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild | 14 ++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-cluster/mvapich2/ChangeLog b/sys-cluster/mvapich2/ChangeLog
index 65629c7..01a5312 100644
--- a/sys-cluster/mvapich2/ChangeLog
+++ b/sys-cluster/mvapich2/ChangeLog
@@ -1,7 +1,9 @@
 # ChangeLog for sys-cluster/mvapich2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Nov 2014; Christoph Junghans <ottxor@gentoo.org> mvapich2-1.6-r1.ebuild:
+  drop old deps
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> mvapich2-1.6-r1.ebuild:
   Add missing flag-o-matic.eclass
-

diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
index 30cdb98..d13c57c 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 inherit flag-o-matic fortran-2 mpi
 
@@ -16,13 +16,11 @@ KEYWORDS="~x86 ~amd64"
 IUSE="debug fortran large-cluster medium-cluster romio threads"
 
 RDEPEND="
-	|| (
-		(
-			sys-infiniband/libibverbs
-			sys-infiniband/libibumad
-			sys-infiniband/libibmad
-			sys-infiniband/librdmacm )
-		sys-infiniband/openib-userspace )"
+	sys-infiniband/libibverbs
+	sys-infiniband/libibumad
+	sys-infiniband/libibmad
+	sys-infiniband/librdmacm
+	"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/mvapich2-${PV/_/-}"