Use mpicc with USE=mpi, #394961

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/sci-biology/mrbayes/ChangeLog b/sci-biology/mrbayes/ChangeLog
index 80cc55335ceb9cad697b9573c9209ac7808600fa..51428b53b3633d51d1e9f27b04257fcb07f50417 100644 (file)
--- a/sci-biology/mrbayes/ChangeLog
+++ b/sci-biology/mrbayes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/mrbayes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/ChangeLog,v 1.22 2011/12/16 13:08:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/ChangeLog,v 1.23 2011/12/17 13:45:03 jlec Exp $
+
+  17 Dec 2011; Justin Lecher <jlec@gentoo.org> mrbayes-3.1.2-r1.ebuild:
+  Use mpicc with USE=mpi, #394961
 
   16 Dec 2011; Justin Lecher <jlec@gentoo.org> mrbayes-3.1.2-r1.ebuild:
   Add missing dep on sys-libs/ncurses, keyworded for ~amd64-linux

diff --git a/sci-biology/mrbayes/Manifest b/sci-biology/mrbayes/Manifest
index 1f8c601978b3e51df924b1fc82c37ae673f6239e..414311d353c2dea47bb9784d04bb59183b68d584 100644 (file)
--- a/sci-biology/mrbayes/Manifest
+++ b/sci-biology/mrbayes/Manifest
@@ -3,14 +3,14 @@ Hash: SHA512
 
 AUX mb_readline_312.patch 1108 RMD160 5901513567ef2198b4c9c1baeb1ecc295af3eee8 SHA1 c5526cf58fe15cb22c401de19de7056a66c37414 SHA256 6d7566cbe59eee9881b41a21ea561fd610816df768bb8fda42ef4435c84f5f22
 DIST mrbayes-3.1.2.tar.gz 545968 RMD160 b90b9406f34806bcd18bc49dc998b7ed444e93c3 SHA1 db73f53361688e1451ec155ccbdd130c3f889817 SHA256 c60253de1980c9f0a0eb684fffe7ba428fda7c39a3edcb6acf384b5e1443f2f4
-EBUILD mrbayes-3.1.2-r1.ebuild 1021 RMD160 5acc1730031447453dcb8c5eab031cb01582629a SHA1 0d7ea9289d80ea0ddac0c20682ad9a1a6ce6a9fb SHA256 cb996fa9b505b88fa937b3dac40262aa745b002d644a38fbd7e342941af6299c
+EBUILD mrbayes-3.1.2-r1.ebuild 1124 RMD160 37ecd7f3ddfa9d375c94bca68d34fb6606249cd5 SHA1 14b657a28aea75b5b30ff52e6a38ab3f556e2b77 SHA256 59249019638155f848241d76144ab8e8dcfed88e4557ee9ea1fb55d9d2937f0b
 EBUILD mrbayes-3.1.2.ebuild 1203 RMD160 97dea24c601d51b50a6f1005fbd85bb7dd6ea917 SHA1 754e243b7e7bf59db376f2ef03c88677d5ca9c1d SHA256 1c6880813e681b22d41877427ab9b8af7ca7304787e9bd36fa85506d2d5329c0
-MISC ChangeLog 3061 RMD160 303e8af53e372c1b30cf0a4e5864181aa7feff37 SHA1 2ae027d81b6cce1f93912a9ccd36f4a6e4f6b805 SHA256 230a213f90db648e806ef9f76d52d76e0116735052d6d77ae21ea1764ffbcd17
+MISC ChangeLog 3168 RMD160 a91096271b757f071c3164f7f7dc1b910939d6ea SHA1 f2c16de30da510bcbd7b36b62827795b4b55754e SHA256 211e4b891ac02847d6b4a6e05fec9d8d16cdca302176e2979662babc450b8954
 MISC metadata.xml 730 RMD160 46eda6e69c53a0e301343cfc645c343c5aa9fdd6 SHA1 06e33f8fa877635c7e771e74e3edeb8cba146fb3 SHA256 fe9b9273c53a7c502d6688d63557fe603f63a47c8ff17355b9db7cdc0b78f446
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7rQuoACgkQgAnW8HDreRZeXQCfcRgWJPMxkQdTzc2HbVfkJokB
-dfsAn37ostW8vVq3tS64B7g10K1lNxiu
-=40Zv
+iEYEAREKAAYFAk7snO4ACgkQgAnW8HDreRYwbQCeKeSqmZ5i7zGz9OXJ7zYfllG2
+Pw0AoJzNHFLjR9OaaOatPVMLBfa7R8lZ
+=wT+8
 -----END PGP SIGNATURE-----

diff --git a/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild b/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild
index 73fa7d189d80f5eed4c47071bc2b76336104cd5c..4833e501a9f69f5b2ba6407254784e0313680ef6 100644 (file)
--- a/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild
+++ b/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild,v 1.2 2011/12/16 13:08:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild,v 1.3 2011/12/17 13:45:03 jlec Exp $
 
 EAPI=4
 
@@ -23,17 +23,25 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
        use readline && epatch "${FILESDIR}"/mb_readline_312.patch
+       sed -e 's:-ggdb::g' -i Makefile || die
 }
 
 src_compile() {
-       local myconf
+       local myconf mycc
+
+       if use mpi; then
+               mycc=mpicc
+       else
+               mycc=$(tc-getCC)
+       fi
+
        use mpi && myconf="MPI=yes"
        use readline || myconf="${myconf} USEREADLINE=no"
        use debug && myconf="${myconf} DEBUG=yes"
        emake \
                OPTFLAGS="${CFLAGS}" \
                LDFLAGS="${LDFLAGS}" \
-               CC=$(tc-getCC) \
+               CC=${mycc} \
                ${myconf}
 }