Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mvapich2/
Date: Sun, 08 Feb 2015 21:07:56
Message-Id: 1423305995.929d179d67efc0dc0275f0253504256162afc7ed.ottxor@gentoo
1 commit: 929d179d67efc0dc0275f0253504256162afc7ed
2 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
3 AuthorDate: Sat Feb 7 10:37:58 2015 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 7 10:46:35 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=929d179d
7
8 sys-cluster/mvapich2-1.6-r1: Add missing, drop useless dies
9
10 ---
11 sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild | 12 ++++++------
12 1 file changed, 6 insertions(+), 6 deletions(-)
13
14 diff --git a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
15 index d13c57c..97c0878 100644
16 --- a/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
17 +++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
18 @@ -1,4 +1,4 @@
19 -# Copyright 1999-2014 Gentoo Foundation
20 +# Copyright 1999-2015 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 # $Header: $
23
24 @@ -66,7 +66,7 @@ src_prepare() {
25 # Examples are always compiled with the default 'all' target. This
26 # causes problems when we don't build support for everything, including
27 # threads, mpe2, etc. So we're not going to build them.
28 - sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
29 + sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in || die
30 }
31
32 src_configure() {
33 @@ -119,16 +119,16 @@ src_configure() {
34 sed -i \
35 -e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
36 -e 's/ ${libdir}/ ${DESTDIR}${libdir}/' \
37 - ${S/-beta2/}/Makefile.in
38 - sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
39 - cd ${S/-beta2/}
40 + ${S/-beta2/}/Makefile.in || die
41 + sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in || die
42 + cd ${S/-beta2/} || die
43
44 ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
45 econf $(mpi_econf_args) ${c}
46 }
47
48 src_install() {
49 - emake DESTDIR="${D}"|| die
50 + emake DESTDIR="${D}"
51 mpi_dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
52 README* RELEASE_NOTES*
53 mpi_imp_add_eselect