--- octave-3.2.3-r1.ebuild.orig	2010-02-03 23:01:54.000000000 +0100
+++ octave-3.2.3-r1.ebuild	2010-02-03 23:02:16.000000000 +0100
@@ -11,7 +11,7 @@
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse"
+IUSE="curl doc emacs fftw hdf5 mpi readline sparse xemacs zlib"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="virtual/lapack
@@ -23,7 +23,8 @@
 	sci-libs/qrupdate
 	fftw? ( >=sci-libs/fftw-3.1.2 )
 	zlib? ( sys-libs/zlib )
-	hdf5? ( sci-libs/hdf5 )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	mpi? ( virtual/mpi[cxx] )
 	curl? ( net-misc/curl )
 	xemacs? ( app-editors/xemacs )
 	sparse? ( sci-libs/umfpack
@@ -45,6 +46,13 @@
 
 FORTRAN="gfortran ifc g77 f2c"
 
+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