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

["Justin Lecher" <jlec@gentoo.org>]

commit:     ef146025fec32c6d3ebfb73bab797bd6bbc1ffd2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 09:02:11 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 09:02:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ef146025

sys-cluster/mpe2: Bump EAPI to 6

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sys-cluster/mpe2/mpe2-1.3.0.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index 760564e..7136892 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 FORTRAN_NEEDED=fortran
 
@@ -18,10 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="minimal fortran threads debug"
 
-COMMON_DEPEND="!minimal? ( x11-libs/libXtst
-		x11-libs/libXi )
-	|| ( sys-cluster/openmpi[fortran?,threads?]
-		sys-cluster/mpich2[fortran?,threads?] )"
+COMMON_DEPEND="
+	!minimal? (
+		x11-libs/libXtst
+		x11-libs/libXi
+	)
+	|| (
+		sys-cluster/openmpi[fortran?,threads?]
+		sys-cluster/mpich2[fortran?,threads?]
+	)"
 
 DEPEND="!minimal? ( >=virtual/jdk-1.4 )
 	${COMMON_DEPEND}"
@@ -67,6 +72,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	# Don't assume path contains ./
 	sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die