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

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

[Christoph Junghans]

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/_/-}"

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

[Justin Lecher]

commit:     40ea65ba2f91e6cf4ed442fb6f0ffdeee1b55af0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 14:13:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 14:13:52 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=40ea65ba

sys-cluster/mvapich2: fix SLOT operators

Package-Manager: portage-2.2.17

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

diff --git a/sys-cluster/mvapich2/ChangeLog b/sys-cluster/mvapich2/ChangeLog
index 01a5312..8c28f90 100644
--- a/sys-cluster/mvapich2/ChangeLog
+++ b/sys-cluster/mvapich2/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-cluster/mvapich2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> mvapich2-1.6-r1.ebuild:
+  sys-cluster/mvapich2: fix SLOT operators
+
   15 Nov 2014; Christoph Junghans <ottxor@gentoo.org> mvapich2-1.6-r1.ebuild:
   drop old deps
 

diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
index 97c0878..39600b5 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
@@ -16,10 +16,10 @@ 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/libibverbs:=
+	sys-infiniband/libibumad:=
+	sys-infiniband/libibmad:=
+	sys-infiniband/librdmacm:=
 	"
 DEPEND="${RDEPEND}"
 

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

[Christoph Junghans]

commit:     929d179d67efc0dc0275f0253504256162afc7ed
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Feb  7 10:37:58 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Feb  7 10:46:35 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=929d179d

sys-cluster/mvapich2-1.6-r1: Add missing, drop useless dies

---
 sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
index d13c57c..97c0878 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.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: $
 
@@ -66,7 +66,7 @@ src_prepare() {
 	# Examples are always compiled with the default 'all' target.  This
 	# causes problems when we don't build support for everything, including
 	# threads, mpe2, etc.  So we're not going to build them.
-	sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
+	sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in || die
 }
 
 src_configure() {
@@ -119,16 +119,16 @@ src_configure() {
 	sed -i \
 		-e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
 		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' \
-		${S/-beta2/}/Makefile.in
-	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
-	cd ${S/-beta2/}
+		${S/-beta2/}/Makefile.in || die
+	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in || die
+	cd ${S/-beta2/} || die
 
 	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
 	econf $(mpi_econf_args)	${c}
 }
 
 src_install() {
-	emake  DESTDIR="${D}"|| die
+	emake  DESTDIR="${D}"
 	mpi_dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
 		README* RELEASE_NOTES*
 	mpi_imp_add_eselect

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

[Alexey Shvetsov]

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() {