--- ../../../gentoo/dev-libs/boost/boost-1.37.0-r1.ebuild	2009-04-14 14:07:19.000000000 +0200
+++ boost-1.37.0-r1.ebuild	2009-05-09 12:19:31.051913635 +0200
@@ -22,7 +22,7 @@
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
 	expat? ( dev-libs/expat )
-	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) )
+	mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2[cxx] ) )
 	sys-libs/zlib
 	python? ( virtual/python )
 	!<=dev-libs/boost-1.35.0-r2
@@ -112,7 +112,10 @@
 		compilerExecutable=$(tc-getCXX)
 	fi
 
-	use mpi && mpi="using mpi ;"
+	if use mpi ; then
+		mpi="using mpi ;"
+		has_version sys-cluster/mpich2 && mpi="using mpi : /usr/bin/mpicxx ;"
+	fi
 
 	if use python ; then
 		python_version