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

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     b531b0297de30ee4610e2372c52da2cacada49cc
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 23:09:16 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 23:28:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b531b029

[sys-cluster/mvapich2] Update to eapi4

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/mvapich2/metadata.xml                  |    1 -
 ...{mvapich2-1.6.ebuild => mvapich2-1.6-r1.ebuild} |   23 +++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
index a5a0043..90e0091 100644
--- a/sys-cluster/mvapich2/metadata.xml
+++ b/sys-cluster/mvapich2/metadata.xml
@@ -8,7 +8,6 @@ MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
   <use>
     <flag name="large-cluster">Automatically generated description for large-cluster</flag>
     <flag name="medium-cluster">Automatically generated description for medium-cluster</flag>
-    <flag name="rdma">Automatically generated description for rdma</flag>
     <flag name="romio">Automatically generated description for romio</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
similarity index 90%
rename from sys-cluster/mvapich2/mvapich2-1.6.ebuild
rename to sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
index b9c7ed4..6241835 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="4"
+
 inherit fortran-2 mpi
 
 DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
@@ -11,7 +13,7 @@ SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug fortran large-cluster medium-cluster rdma romio threads"
+IUSE="debug fortran large-cluster medium-cluster romio threads"
 
 RDEPEND="
 	|| (
@@ -19,7 +21,7 @@ RDEPEND="
 			sys-infiniband/libibverbs
 			sys-infiniband/libibumad
 			sys-infiniband/libibmad
-			rdma? ( sys-infiniband/librdmacm ) )
+			sys-infiniband/librdmacm )
 		sys-infiniband/openib-userspace )"
 DEPEND="${RDEPEND}"
 
@@ -61,9 +63,7 @@ pkg_setup() {
 	esac
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	einfo "Disabling examples"
 	# Examples are always compiled with the default 'all' target.  This
 	# causes problems when we don't build support for everything, including
@@ -71,7 +71,7 @@ src_unpack() {
 	sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
 }
 
-src_compile() {
+src_configure() {
 	local c="--with-device=osu_ch3:mrail
 		--with-rdma=gen2
 		--with-pm=mpd
@@ -88,10 +88,8 @@ src_compile() {
 	use medium-cluster 	&& vcluster=-D_MEDIUM_CLUSTER
 	[ "${MVAPICH_HCA_TYPE}" == "_MLX_PCI_X_" ] && enable_srq="-DSRQ"
 
-	if use rdma; then
-		append-ldflags "-lrdmacm"
-		append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
-	fi
+	append-ldflags "-lrdmacm"
+	append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
 	append-ldflags "-libverbs -libumad -libmad"
 
 	append-flags "${BUILD_ARCH} -DUSE_INLINE -D_SMP_ -D_GNU_SOURCE"
@@ -129,11 +127,6 @@ src_compile() {
 
 	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
 	econf $(mpi_econf_args)	${c}
-
-	# http://www.mcs.anl.gov/research/projects/mpich2/support/index.php?s=faqs#parmake
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-
 }
 
 src_install() {