--- octave-3.2.4.ebuild.orig	2010-02-03 22:57:49.000000000 +0100
+++ octave-3.2.4.ebuild	2010-02-03 22:58:40.000000000 +0100
@@ -11,7 +11,7 @@
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="curl doc emacs fltk fftw hdf5 opengl readline sparse xemacs zlib"
+IUSE="curl doc emacs fltk fftw hdf5 opengl mpi readline sparse xemacs zlib"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 # add 	media-gfx/graphicsmagick[cxx] when keyworded in arches
@@ -26,8 +26,9 @@
 	curl? ( net-misc/curl )
 	fltk? ( x11-libs/fltk:1.1[opengl?] )
 	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( sci-libs/hdf5 )
+	hdf5? ( sci-libs/hdf5[mpi=] )
 	opengl? ( virtual/opengl media-libs/ftgl )
+	mpi? ( virtual/mpi[cxx] )
 	sparse? ( sci-libs/arpack
 		sci-libs/camd
 		sci-libs/ccolamd
@@ -47,6 +48,13 @@
 	dev-util/gperf
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch
 	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch