--- paraview-3.4.0.ebuild-old	2009-07-15 22:04:09.000000000 +1200
+++ paraview-3.4.0.ebuild	2009-07-15 14:25:46.000000000 +1200
@@ -21,7 +21,7 @@
 RDEPEND="hdf5? ( sci-libs/hdf5 )
 	mpi? ( || (
 				sys-cluster/openmpi
-				sys-cluster/mpich2 ) )
+				sys-cluster/mpich2[cxx] ) )
 	python? ( >=dev-lang/python-2.0 )
 	qt4? ( x11-libs/qt-gui:4
 			x11-libs/qt-qt3support:4
@@ -48,11 +48,6 @@
 
 pkg_setup() {
 	use qt4 && qt4_pkg_setup
-	if use mpi && has_version sys-cluster/mpich2; then
-		if ! built_with_use sys-cluster/mpich2 cxx; then
-			die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\""
-		fi
-	fi
 }
 
 src_prepare() {