--- mpich2-1.4_rc2.ebuild	2011-05-04 13:21:39.105609485 -0500
+++ mpich2-1.4_rc2.ebuild.new	2011-05-04 13:21:10.045566817 -0500
@@ -32,7 +32,7 @@
 
 pkg_setup() {
 	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
+		eerror "mpi-threads requires threads, assuming that's what you want"
 	fi
 }
 
@@ -42,17 +42,10 @@
 	sed -i \
 		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
 		$(find ./test/ -name 'Makefile.in') || die
-
-	# #293665
-	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
-	# in the environment, however that's messy and doesn't for for LDFLAGS.
-	sed -i \
-		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
-		src/env/*.conf.in || die
 }
 
 src_configure() {
-	local c="--enable-shared --enable-sharedlibs=gcc"
+	local c="--enable-shared"
 	local romio_conf
 
 	# The configure statements can be somewhat confusing, as they
@@ -61,25 +54,17 @@
 
 	use debug && c="${c} --enable-g=dbg --enable-debuginfo"
 
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
+	if ! use mpi-threads; then
+	   if ! use threads ; then
+	      c="${c} --with-thread-package=none"
+	   fi
+	   c="${c} --enable-threads=single"
 	fi
 
 	# enable f90 support for appropriate compilers
 	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-fc";;
 	    g77)
-			c="${c} --enable-f77 --disable-fc";;
+			c="${c} --disable-fc";;
 	esac
 
 	c="${c} --sysconfdir=/etc/${PN}"
@@ -103,11 +88,6 @@
 }
 
 src_test() {
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
 	# See #362655 and comments in the testlist files.
 	# large_message:  only on machines with > 8gb of ram
 	# bcastlength:  This is an extension to MPI that's not necessary
@@ -117,13 +97,6 @@
 	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
 	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
 
-	if use debug; then
-		# http://bugs.gentoo.org/show_bug.cgi?id=362655#c8
-		sed -i '/^[# ]*scancel/d' test/mpi/pt2pt/testlist || die
-		sed -i '/^[# ]*pscancel/d' test/mpi/pt2pt/testlist || die
-		sed -i '/^[# ]*cancelrecv/d' test/mpi/pt2pt/testlist || die
-	fi
-
 	emake -j1 \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \