--- /usr/portage/sci-mathematics/octave/octave-2.1.73.ebuild	2007-07-13 07:36:04.000000000 +0200
+++ /usr/local/portage/sci-mathematics/octave/octave-2.1.73.ebuild	2007-09-28 17:32:34.000000000 +0200
@@ -54,10 +54,14 @@
 	# octave links agains -lmpi by default
 	# mpich needs -lmpich instead
 	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
 		if has_version 'sys-cluster/mpich'; then
+			CC="mpicc" && CXX="mpiCC"
+			myconf="${myconf} --with-mpi=mpich"
+		elif has_version 'sys-cluster/mpich2'; then
+			CC="mpicc" && CXX="mpicxx"
 			myconf="${myconf} --with-mpi=mpich"
 		else
+			CC="mpicc" && CXX="mpiCC"
 			myconf="${myconf} --with-mpi=mpi"
 		fi
 	else