Fix check if mpich2 is not installed, #224913

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 46 insertions, 34 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index bb5b08c6a347..8a5e747f8cad 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.91 2010/06/13 15:07:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.92 2010/06/23 09:32:45 jlec Exp $
+
+  23 Jun 2010; Justin Lecher <jlec@gentoo.org> octave-2.1.73.ebuild,
+  octave-2.1.73-r1.ebuild:
+  Fix check if mpich2 is not installed, #224913
 
   13 Jun 2010; Raúl Porcel <armin76@gentoo.org> octave-3.2.4-r1.ebuild:
   alpha/sparc stable wrt #318649
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 159abcb8a5e9..120d812347bb 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a SHA1 54da4d74cb5d172310de64fc6cc9e32d56823e82 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66
 AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41
 AUX octave-2.1.73-gcc-4.3.patch 8087 RMD160 b2d9bbb8f012b6fe9106594394627fd76f112ef9 SHA1 fb5407e628ed4ecbb1ab5c0bb43a595ca2e7bbb1 SHA256 d4a080e57562163c36ab435ba09a94fa4e748a9c91f700625706967e1c0092f6
@@ -16,10 +19,17 @@ AUX octave-example-fix.patch 566 RMD160 9761e1a45e0d54795aff5cd50120b963492ac175
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
 DIST octave-3.0.3.tar.bz2 10159024 RMD160 1a162862a457675e2d94de306c1ec8f1643c9e07 SHA1 5c619254521a5fe14b3ec8a6eecbf104f9fa41dc SHA256 f90108bf6a2f9930907aa740d1c4d39551985cf3b5c5eb5dfdb436e0d3b5d79d
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
-EBUILD octave-2.1.73-r1.ebuild 4414 RMD160 214ba0c7d64fdfda139c8f3b90cf635d22386ff4 SHA1 c611676fcad0a19430911606214c1f907d319c56 SHA256 46a7078a89b10449cb3d47f7eafef3010b8ef84a0515430136147ea206b48587
+EBUILD octave-2.1.73-r1.ebuild 4430 RMD160 9d9df41cf8076caa76e9c4a2dbcb12183b0436ed SHA1 40f0d5de5a658d01adeba0ed21e9cb33b2c17762 SHA256 de74869aeebdba5c56eebc4ba7fc648baea2b10d8a78dd624c337cef0ab7a3f7
 EBUILD octave-2.1.73-r2.ebuild 4593 RMD160 57768e35057cf967aad85d0be56f9381f6c35b9b SHA1 350720616d3ddbae4a337269f429a82704c1cd8c SHA256 88059be54c26282937ffdbab146661ca6d089520ec66457fc127793fe236b610
-EBUILD octave-2.1.73.ebuild 4254 RMD160 fedeb9bb23ddcc88b60ac4110975834b3e254d13 SHA1 b19e77a0ef495ae0e09e6b750f2307357e154db2 SHA256 121a531d99733d9b8e53f26574caf52dd1c3d34ab15ab2b981061ef9bf8b245c
+EBUILD octave-2.1.73.ebuild 4270 RMD160 6ab6bd95b32fdcc6c0d66776202f42cb859f9dac SHA1 aa2e0f617cd20c2ecaf3504325281b15c71eea41 SHA256 5e49862d97d42479da4a64274ec5166d813c0841b5c459ae000dd879aa8872d6
 EBUILD octave-3.0.3.ebuild 2681 RMD160 b2b31461e4b4fa71b5d4a9cd3c7616f005165958 SHA1 3ccfbfca3c9c8c5d0c9ae81b9bf0f26118c696d1 SHA256 190ff7f058e1bfc39c267511a16f91cda59e718b4e457fdf90c1eb3dc63b729a
 EBUILD octave-3.2.4-r1.ebuild 2915 RMD160 235976a2952fc9a4ea9c901917c2b0cc6e26f683 SHA1 f29bef71017a7b092e64766e5191dbd8c23f0304 SHA256 8c8fa4b03a4d394ecc7d89eda5a24e7f7472fa773bc60e349914720bde9788e9
-MISC ChangeLog 22987 RMD160 6d83069afd9e28eb755c57865f0d8bdb3bc65295 SHA1 d419ea49d1763ecb7135b81c06624b62289c00a9 SHA256 da9602f1937527bf49727a02ff008a42db37a37707438fadb4ccd672e4d3accf
+MISC ChangeLog 23129 RMD160 205c0c821d4f670b0297becb81f64d4ae1f808ea SHA1 3d8f2234e945a9cd3a322f9a47f96cf7cb903939 SHA256 fd2d1e447dcab30fb19d56c32abb8ac1c73541a4d24699352e9faa658365b96f
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwh1MUACgkQgAnW8HDreRYJdACbBFddyG91oLLjf6/VR6raOPuj
+GFsAn0VadRo44ojNsFHL8YR8KZoJosAr
+=YneB
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
index 262ba7da7654..79dcffdb64f8 100644
--- a/sci-mathematics/octave/octave-2.1.73-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.10 2009/09/23 20:11:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.11 2010/06/23 09:32:45 jlec Exp $
 
 inherit flag-o-matic fortran autotools
 
@@ -59,25 +59,24 @@ src_compile() {
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
 	if use mpi ; then
-		if built_with_use sys-cluster/mpich2 cxx ; then
-		elog "mpich2 must be built without C++ support!"
-		die "please rebuild mpich2 with USE=-cxx..."
-		else
 		CC="mpicc"
 		if has_version 'sys-cluster/mpich' ; then
-			CXX="mpiCC"
-			myconf="${myconf} --with-mpi=mpich"
+				CXX="mpiCC"
+				myconf="${myconf} --with-mpi=mpich"
 		elif has_version 'sys-cluster/mpich2' ; then
-			F77="mpif77"
-			myconf="${myconf} --with-mpi=mpich"
+			if built_with_use sys-cluster/mpich2 cxx ; then
+				elog "mpich2 must be built without C++ support!"
+				die "please rebuild mpich2 with USE=-cxx..."
+			fi
+		    F77="mpif77"
+		    myconf="${myconf} --with-mpi=mpich"
 		else
-			myconf="${myconf} --with-mpi=mpi"
-		fi
+		    myconf="${myconf} --with-mpi=mpi"
 		fi
 	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
+	    CC="$(tc-getCC)"
+	    CXX="$(tc-getCXX)"
+	    myconf="${myconf} --without-mpi"
 	fi
 
 	CC="${CC}" CXX="${CXX}" F77="${F77}" \
diff --git a/sci-mathematics/octave/octave-2.1.73.ebuild b/sci-mathematics/octave/octave-2.1.73.ebuild
index 3252acd3c459..9f27909978b6 100644
--- a/sci-mathematics/octave/octave-2.1.73.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.12 2009/09/23 20:11:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.13 2010/06/23 09:32:45 jlec Exp $
 
 inherit flag-o-matic fortran
 
@@ -53,25 +53,24 @@ src_compile() {
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
 	if use mpi ; then
-		if built_with_use sys-cluster/mpich2 cxx ; then
-		elog "mpich2 must be built without C++ support!"
-		die "please rebuild mpich2 with USE=-cxx..."
-		else
 		CC="mpicc"
 		if has_version 'sys-cluster/mpich' ; then
-			CXX="mpiCC"
-			myconf="${myconf} --with-mpi=mpich"
+				CXX="mpiCC"
+				myconf="${myconf} --with-mpi=mpich"
 		elif has_version 'sys-cluster/mpich2' ; then
-			F77="mpif77"
-			myconf="${myconf} --with-mpi=mpich"
+			if built_with_use sys-cluster/mpich2 cxx ; then
+				elog "mpich2 must be built without C++ support!"
+				die "please rebuild mpich2 with USE=-cxx..."
+			fi
+		    F77="mpif77"
+		    myconf="${myconf} --with-mpi=mpich"
 		else
-			myconf="${myconf} --with-mpi=mpi"
-		fi
+		    myconf="${myconf} --with-mpi=mpi"
 		fi
 	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
+	    CC="$(tc-getCC)"
+	    CXX="$(tc-getCXX)"
+	    myconf="${myconf} --without-mpi"
 	fi
 
 	CC="${CC}" CXX="${CXX}" F77="${F77}" \