diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-02-27 20:30:08 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-02-27 20:30:08 +0000 |
| commit | 2c1ac5d0260ad7091c473e97e28e064ad3d2f4ff (patch) | |
| tree | 4743d8e1dfe585c862f17469c6ed2355df9d7b49 | |
| parent | s/noweb/web for net-analyzer/nagios-core (diff) | |
| download | historical-2c1ac5d0260ad7091c473e97e28e064ad3d2f4ff.tar.gz historical-2c1ac5d0260ad7091c473e97e28e064ad3d2f4ff.tar.bz2 historical-2c1ac5d0260ad7091c473e97e28e064ad3d2f4ff.zip | |
Moved check for mpich2 useflag into its proper place.
Package-Manager: portage-2.1.4.4
| -rw-r--r-- | sci-mathematics/octave/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-mathematics/octave/Manifest | 4 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-2.1.73-r2.ebuild | 17 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog index adf0519502e9..246ba2508ccd 100644 --- a/sci-mathematics/octave/ChangeLog +++ b/sci-mathematics/octave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/octave -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.52 2007/12/25 14:32:22 phreak Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.53 2008/02/27 20:30:08 markusle Exp $ + + 27 Feb 2008; Markus Dittrich <markusle@gentoo.org> + octave-2.1.73-r2.ebuild: + Moved check for mpich2 useflag into its proper place. 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing metalgod from metadata.xml as per #99350. diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 3bad33d26a44..7512a107994f 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -12,7 +12,7 @@ EBUILD octave-2.1.69.ebuild 3660 RMD160 454abb94c9f7ca29e0db21f5ddbe65e22caba6cd EBUILD octave-2.1.71-r2.ebuild 3787 RMD160 998f60668b889a9284d0af46a37b8c485579af9a SHA1 31a873858905ea59507fa7a9c5d2daae55717da7 SHA256 e04652c5c02e2cbd91d95f610f566b04fb5da147440a97c0077e1e48e825f4b4 EBUILD octave-2.1.72.ebuild 3893 RMD160 571014ce76eac12e6ae21ff21f087fb7258535da SHA1 f3fd6fa783473c9912105ae0256a12448843f9c5 SHA256 a91ee175a3a4a161171d5525e549f184d8b362e6e8d94923335a1f20d334fe90 EBUILD octave-2.1.73-r1.ebuild 4350 RMD160 2eec1dbb422ee61fa5829d783cbc4f2470731bf3 SHA1 8dce01ce87b4dd0287a434d7e4614d5ca953891e SHA256 d5a76793a96b8a4ef3b18a08cd49c55face24a680953c6730c61fcf5039f0ea1 -EBUILD octave-2.1.73-r2.ebuild 4479 RMD160 2b60b222123a6581cb253fe154baca72e16da08f SHA1 8f7d1b00280da6a5eccbe26608bdbbfba22d77ae SHA256 e26feb77790bb2a7b6904844d48bf35bbc04ac21a1e8afda19a9a4d1ab404ff8 +EBUILD octave-2.1.73-r2.ebuild 4466 RMD160 4f2e1927dae5f57df8bd454f8a0128691924690f SHA1 3b07feb7828ffcfbf0066c494ab82808114539a7 SHA256 a5720151ad08753045782be88dcfddc51b24366743a92c4aa7905cbdf2e44295 EBUILD octave-2.1.73.ebuild 4191 RMD160 80ad2055d12eeb72aafd52cf90430bb87cde3709 SHA1 afa4a3b48da6cd8ecf7f851cdce2d8e6c71556ef SHA256 3b4fc3b4a2a4ec3dd8148fb65a0dca13f268e1315f62df41a63aaff07f467b87 -MISC ChangeLog 15546 RMD160 836db1964880417a7e6f48173efca7e58dca0b26 SHA1 4def6c0e47ec7fc6d10117afd9664c4491b3d42f SHA256 68f820f238645aaa778cc9df956b0639c06ab2c856d2edcf9dced7bd35a39297 +MISC ChangeLog 15685 RMD160 5c26a2e12138dd967ed22ed1651afde8d8457e39 SHA1 90c1a144b477299bbd5d74b32e8ce97a5a2e059e SHA256 25f5dc58e3c67081e686c7c45be177e04f197e60d20f5933d6606359e7e34920 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0 diff --git a/sci-mathematics/octave/octave-2.1.73-r2.ebuild b/sci-mathematics/octave/octave-2.1.73-r2.ebuild index df4c4d8b7858..ff6107f295d8 100644 --- a/sci-mathematics/octave/octave-2.1.73-r2.ebuild +++ b/sci-mathematics/octave/octave-2.1.73-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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-r2.ebuild,v 1.5 2007/12/25 01:46:56 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.6 2008/02/27 20:30:08 markusle Exp $ inherit flag-o-matic fortran autotools xemacs-elisp-common @@ -63,21 +63,20 @@ 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 + 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 - fi else CC="$(tc-getCC)" CXX="$(tc-getCXX)" |