14 files changed, 11 insertions, 1104 deletions
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 631371f2dc23..c56e8335f839 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.48 2009/12/31 17:12:04 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.49 2010/01/06 22:32:14 jsbronder Exp $
+
+  06 Jan 2010; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.0.3.ebuild,
+  -mpich2-1.0.3-r1.ebuild, -files/mpich2-1.0.3-make.patch,
+  -files/mpich2-1.0.3-make-test.patch,
+  -files/mpich2-1.0.3-mpe-install.patch, -files/mpich2-1.0.3-soname.patch,
+  -mpich2-1.0.6.ebuild, -files/mpich2-1.0.6-cxx.patch,
+  -files/mpich2-1.0.6-fPIC.patch, -files/mpich2-1.0.6-makefile.patch,
+  -files/mpich2-1.0.6-no-pvfs2.patch, -files/mpich2-1.0.6-shlib.patch:
+  cleanup old versions.
 
   31 Dec 2009; Brent Baude <ranger@gentoo.org> mpich2-1.0.8.ebuild:
   Marking mpich2-1.0.8 ppc64 for bug 266409
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-make-test.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-make-test.patch
deleted file mode 100644
index 92b58141196c..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.3-make-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- test/mpi/attr/Makefile.in.orig	2006-06-11 16:52:54.000000000 -0700
-+++ test/mpi/attr/Makefile.in	2006-06-11 17:14:38.000000000 -0700
-@@ -26,7 +26,7 @@
- LDFLAGS     =  @LDFLAGS@ ../util/mtest.o
- 
- VPATH = .:@srcdir@
--INCLUDES = -I../include -I${srcdir}/../include
-+INCLUDES = -I../include
- 
- .SUFFIXES:
- .SUFFIXES: .o .c .txt 
---- test/mpi/util/Makefile.in.orig	2006-06-11 16:52:54.000000000 -0700
-+++ test/mpi/util/Makefile.in	2006-06-11 17:09:42.000000000 -0700
-@@ -21,8 +21,7 @@
- C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
- 
- VPATH = .:@srcdir@
--INCLUDES = -I../../../src/include -I${top_srcdir}/src/include -I../include \
--	 -I${srcdir}/../include
-+INCLUDES = -I../include
- 
- .SUFFIXES:
- .SUFFIXES: .o .c .txt 
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch
deleted file mode 100644
index 2e9d4a31c67e..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- Makefile.in.orig	2006-05-20 21:49:41.000000000 -0700
-+++ Makefile.in	2006-05-20 22:12:04.000000000 -0700
-@@ -229,9 +229,12 @@
- 	if [ -s lib/lib${MPICXXLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPICXXLIBNAME}.a ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a ; fi
- 	if [ -s lib/lib${PMPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${PMPILIBNAME}.a ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a ; fi
- 	if [ -s lib/libf${MPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/libf${MPILIBNAME}.a ${DESTDIR}${libdir}/libf${MPILIBNAME}.a ; fi
--	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@ ; fi
--	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@ ; fi
--	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi
-+	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
-+	if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${MPILIBNAME}.@SHLIB_EXT@.0.0 lib${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
-+	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
-+	if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 lib${PMPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
-+	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi
-+	if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf libf${MPILIBNAME}.@SHLIB_EXT@.0.0 libf${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi
- 	if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
- 	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
- 	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
-@@ -258,9 +261,9 @@
- 	-rm -f ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a
- 	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a
- 	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.a
--	-rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@
--	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@
--	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@
-+	-rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@*
-+	-rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@*
-+	-rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@*
- 	-rm -f ${DESTDIR}${docdir}/user.pdf
- 	-rm -f ${DESTDIR}${docdir}/install.pdf
- 	-rm -f ${DESTDIR}${docdir}/smpd_pmi.pdf
---- Makefile.in.orig	2006-05-20 15:59:26.000000000 -0700
-+++ Makefile.in	2006-05-20 16:06:24.000000000 -0700
-@@ -428,11 +428,11 @@
- install-local:
- 	-if [ "@BUILD_TVDLL@" = "yes" ] ; then \
- 	    $(INSTALL_DATA) src/mpi/debugger/libtvmpich.@SHLIB_EXT@ \
--			${libdir}/libtvmpich.@SHLIB_EXT@ ; fi
--	if test ! -d ${exec_prefix}/examples ; then \
--	    $(MKDIR_P) ${exec_prefix}/examples ; \
-+			${DESTDIR}${libdir}/libtvmpich.@SHLIB_EXT@ ; fi
-+	if test ! -d ${DESTDIR}${exec_prefix}/examples ; then \
-+	    $(MKDIR_P) ${DESTDIR}${exec_prefix}/examples ; \
- 	fi
--	$(INSTALL_PROGRAM) examples/cpi ${exec_prefix}/examples/cpi
-+	$(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/examples/cpi
- 
- install-devdocs:
- 	(cd doc && $(MAKE) install-devdocs)
---- src/pm/mpd/Makefile.in.orig	2005-10-24 12:08:40.000000000 -0700
-+++ src/pm/mpd/Makefile.in	2006-05-21 11:12:37.000000000 -0700
-@@ -119,7 +119,7 @@
- 	@echo "copying python files/links into " $(DESTDIR)${bindir}
- 	-@for cmd in ${PYTHON_SOURCE} ; do \
- 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
--	    ${INSTALL} -m 755 ${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
- 	-@cd $(DESTDIR)${bindir} && rm -f mpd
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-mpe-install.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-mpe-install.patch
deleted file mode 100644
index 74f2fb2419b4..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.3-mpe-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mpe2/sbin/mpeinstall.orig	2006-06-10 22:51:48.000000000 -0700
-+++ src/mpe2/sbin/mpeinstall	2006-06-10 23:57:02.000000000 -0700
-@@ -457,7 +457,7 @@
-          CopyDirRecurP $etcbuild_dir $sysconfdir $MODE
-          cd $etcbuild_dir && \
-          for file in *.conf ; do \
--             FixInstallFile $file $DESTDIR$sysconfdir/$file ; \
-+             FixInstallFile $file $sysconfdir/$file ; \
-          done
-     fi
- fi
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch
deleted file mode 100644
index 37aabe0ec92f..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig	2005-11-23 10:41:50.000000000 -0800
-+++ configure	2006-05-20 21:04:16.000000000 -0700
-@@ -9619,6 +9619,7 @@
- C_LINK_SHL=true
- SHLIB_EXT=so
- SHLIB_FROM_LO=no
-+SHLIB_VER=0.0
- SHLIB_INSTALL='$(INSTALL_PROGRAM)'
- case "$enable_sharedlibs" in
-     no|none)
-@@ -9640,11 +9641,11 @@
-     # Not quite right yet.  See mpich/util/makesharedlib
-     # Use syntax that works in both Make and the shell
-     #C_LINK_SHL='${CC} -shared -Wl,-r'
--    C_LINK_SHL='${CC} -shared'
-+    C_LINK_SHL='${CC} -shared -Wl,-soname'
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-     # May need -fPIC
--    CC_SHL='${CC} -fpic'
-+    CC_SHL='${CC} -fPIC'
-     C_LINKPATH_SHL="-Wl,-rpath -Wl,"
-     # We need to test that this isn't osx.  The following is a
-     # simple hack
-     esac 
---- src/util/createshlib.in.orig	2006-07-11 19:52:47.000000000 -0700
-+++ src/util/createshlib.in	2006-07-11 19:56:09.000000000 -0700
-@@ -172,7 +172,7 @@
- 
- 	*)
-         # This is the default model
--	$Show ${C_LINK_SHL} -o $srclibbase.$SHLIB_EXT .tmp/*.o
-+	$Show ${C_LINK_SHL} -Wl,$srclibbase.$SHLIB_EXT.0 -o $srclibbase.$SHLIB_EXT .tmp/*.o
- 	;;
-     esac
- 
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch
deleted file mode 100644
index 4595d0623740..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	2007-10-14 13:47:58.000000000 -0700
-+++ configure	2007-10-14 13:50:27.000000000 -0700
-@@ -655,6 +655,7 @@
- NUMVERSION
- VERSION
- ABIVERSION
-+CXXLIBPATH
- CONFIGURE_ARGUMENTS
- MPIFLIBNAME
- PMPIFLIBNAME
-@@ -2199,6 +2200,10 @@
- # libtool manual)
- ABIVERSION="1:1"
- 
-+# This is needed for the C++ wrapper lib build (so we don't have unresolved
-+# symbols).  The value is replaced via sed in the ebuild.
-+export CXXLIBPATH="nerdboy"
-+
- CONFIGURE_ARGUMENTS="$ac_configure_args"
- 
- if test -n "$ac_configure_args" ; then
---- Makefile.in.orig	2007-10-14 14:51:03.000000000 -0700
-+++ Makefile.in	2007-10-14 15:27:04.000000000 -0700
-@@ -27,6 +27,7 @@
- MAKE            = @MAKE@
- MPILIBNAME      = @MPILIBNAME@
- PMPILIBNAME     = @PMPILIBNAME@
-+CXXLIBPATH	= @CXXLIBPATH@
- 
- 
- VPATH = .:@srcdir@
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
deleted file mode 100644
index 00b6d6a87acd..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naur mpich2-1.0.6p1/confdb/aclocal_shl.m4 mpich2-1.0.6p1.new/confdb/aclocal_shl.m4
---- mpich2-1.0.6p1/confdb/aclocal_shl.m4	2007-05-16 09:39:01.000000000 -0400
-+++ mpich2-1.0.6p1.new/confdb/aclocal_shl.m4	2008-05-09 09:04:35.000000000 -0400
-@@ -89,7 +89,7 @@
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-     # May need -fPIC 
--    CC_SHL='${CC} -fpic'
-+    CC_SHL='${CC} -fPIC'
-     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
-     # More recent versions allow multiple args, separated by commas
-     C_LINKPATH_SHL="-Wl,-rpath,"
-@@ -233,7 +233,7 @@
-     gcc)
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
--    pac_cc_sharedlibs='gcc -shared -fpic'
-+    pac_cc_sharedlibs='gcc -shared -fPIC'
-     pac_clink_sharedlibs='gcc -shared'
-     ;;
-     libtool)
-diff -Naur mpich2-1.0.6p1/configure mpich2-1.0.6p1.new/configure
---- mpich2-1.0.6p1/configure	2008-05-09 09:08:14.000000000 -0400
-+++ mpich2-1.0.6p1.new/configure	2008-05-09 09:06:52.000000000 -0400
-@@ -9061,24 +9061,24 @@
- 	 # if the compiler allows it (e.g., building with gcc but
- 	 # a different Fortran compiler. Another option is to
- 	 # *require* g77.
--	 { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
--$as_echo_n "checking whether $F77 allows -shared -fpic... " >&6; }
-+	 { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
-+$as_echo_n "checking whether $F77 allows -shared -fPIC... " >&6; }
- 	 rm -f conftest.f
- 	 cat > conftest.f <<EOF
-        program main
-        end
- EOF
--         if $F77 -shared -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
--	     FC_SHL="$F77 -shared -fpic"
-+         if $F77 -shared -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
-+	     FC_SHL="$F77 -shared -fPIC"
-              { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-          else
-              { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--             { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
--$as_echo_n "checking whether $F77 allows -fpic... " >&6; }
--             if $F77 -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
--	         FC_SHL="$F77 -fpic"
-+             { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
-+$as_echo_n "checking whether $F77 allows -fPIC... " >&6; }
-+             if $F77 -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
-+	         FC_SHL="$F77 -fPIC"
-                  { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-              else
-@@ -10118,7 +10118,7 @@
-     gcc)
-     if test "$pac_cv_f90_vendor" = gnu -o "$F90" = "g95" ; then
-         # If we have the GNU Fortran 95 compiler (untested)
--        F90_SHL="$F90 -shared -fpic"
-+        F90_SHL="$F90 -shared -fPIC"
-         F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
-     else
-         case "$pac_cv_f90_vendor" in
-@@ -10129,13 +10129,13 @@
- 
- 	    intel)
- 	    # Intel implements the GNU options
--	    F90_SHL="$F90 -shared -fpic"
-+	    F90_SHL="$F90 -shared -fPIC"
-             F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
- 	    ;;
- 
- 	    pgi)
- 	    # Portland Group implements the GNU options
--	    F90_SHL="$F90 -shared -fpic"
-+	    F90_SHL="$F90 -shared -fPIC"
-             F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
- 	    ;;
- 
-@@ -11155,7 +11155,7 @@
- 	;;
- 	gcc)
-         # Assume that the compiler is g++ if gcc style shared libraries chosen
--        CXX_SHL="$CXX -shared -fpic"
-+        CXX_SHL="$CXX -shared -fPIC"
-         CXX_LINKPATH_SHL="-Wl,-rpath -Wl,"
- 	;;
- 	cygwin|cygwin-gcc)
-@@ -12906,7 +12906,7 @@
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-     # May need -fPIC
--    CC_SHL='${CC} -fpic'
-+    CC_SHL='${CC} -fPIC'
-     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
-     # More recent versions allow multiple args, separated by commas
-     C_LINKPATH_SHL="-Wl,-rpath,"
-@@ -13174,7 +13174,7 @@
-     gcc)
-     # For example, include the libname as ${LIBNAME_SHL}
-     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
--    pac_cc_sharedlibs='gcc -shared -fpic'
-+    pac_cc_sharedlibs='gcc -shared -fPIC'
-     pac_clink_sharedlibs='gcc -shared'
-     ;;
-     libtool)
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch
deleted file mode 100644
index 167ab5053b62..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	2007-10-11 22:06:10.000000000 -0700
-+++ Makefile.in	2007-10-11 22:18:48.000000000 -0700
-@@ -125,17 +125,17 @@
- C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
- # Build the shared library from the shared object files
- lib/lib${MPILIBNAME}.@SHLIB_EXT@: lib/lib${MPILIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}.la  -rpath $(libdir) )
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}.la  -rpath $(libdir) -L${libdir} -laio )
- 	if [ -n "@NO_WEAK_SYM@" -a \
- 		"${MPILIBNAME}" != "${PMPILIBNAME}" ] ; then \
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${PMPILIBNAME}.la  -rpath $(libdir) );\
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${PMPILIBNAME}.la  -rpath $(libdir) -L${libdir} -laio );\
- 	fi
- # Build the shared library from the shared object files
- lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME))
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l${MPILIBNAME} )
- # Build the shared library from the shared object files
- lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) )
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. -l${MPILIBNAME} -Lnerdboy -lstdc++ )
- 
- # --------------------------------------------------------------------------
- .libstamp0: 
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch
deleted file mode 100644
index c3b58e447956..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/mpi/romio/configure.orig	2007-12-15 17:34:03.000000000 -0800
-+++ src/mpi/romio/configure	2007-12-15 18:15:12.000000000 -0800
-@@ -1925,6 +1925,12 @@
- # Check whether --with-pvfs2 was given.
- if test "${with_pvfs2+set}" = set; then
-   withval=$with_pvfs2;
-+  if test "x$withval" = "xno" ; then
-+    without_pvfs2=yes
-+    with_pvfs2=""
-+  fi
-+else
-+  without_pvfs2=yes
- fi
- 
- 
-@@ -7574,11 +7580,16 @@
- 
- 
- if test $PVFS2_CONFIG != "notfound" ; then
--	CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
--	LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
--	ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
--	FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
--	file_system_pvfs2=1
-+	if test "x$without_pvfs2" = "xyes" ; then
-+		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
-+		file_system_pvfs2=0
-+	else
-+		CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
-+		LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
-+		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
-+		FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
-+		file_system_pvfs2=1
-+	fi
- fi
- 
- if test "$PVFS2_CONFIG" = "notfound" -a -n "$with_pvfs2" ; then
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch
deleted file mode 100644
index 42ca8f6569af..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/util/createshlib.in.orig	2007-09-12 07:39:20.000000000 -0700
-+++ src/util/createshlib.in	2007-10-13 10:06:51.000000000 -0700
-@@ -207,12 +207,12 @@
- 
-     *)
-     # Typical Unix default
--    soName=$srclibbase.$SHLIB_EXT.$dottedVersion
-+    soName=$srclibbase.$SHLIB_EXT.$majorVersion
-     realName=$srclibbase.$SHLIB_EXT.$dottedVersion
-     altNames="$srclibbase.$SHLIB_EXT"
--    if [ -n "$majorVersion" ] ; then
--	altNames="$altNames $srclibbase.$SHLIB_EXT.$majorVersion"
--    fi
-+#    if [ -n "$majorVersion" ] ; then
-+#	altNames="$altNames $srclibbase.$SHLIB_EXT.$majorVersion"
-+#    fi
-     ;;
- esac
- 
-@@ -293,15 +293,16 @@
-         # Typically -Wl,-h,$soName
- 	# FIXME: C_LINK_SHL knows the options for shared libraries,
- 	# but not the args for setting the soname.
--	$Show ${C_LINK_SHL} -o $realName -Wl,-h,$soName .tmp/*.o 
--	# Do we need to add $dependentLibs ?
-+	$Show ${C_LINK_SHL} -Wl,-soname,$soName -o $realName .tmp/*.o $dependentLibs
-+	# Do we need to add $dependentLibs ? Yes!
- 	;;
-     esac
-     if [ -n "$altNames" ] ; then
-         for alt in $altNames ; do
- 	    # Remove any alternate names before executing the ln step
- 	    rm -f $alt
--            $Show ln -s $realName $alt
-+	    $Show ln -s $realName $soName
-+	    $Show ln -s $soName $alt
-         done
-     fi
- 
-@@ -345,7 +346,7 @@
-     fi
-     if [ -n "$altNames" ] ; then
-         for alt in $altNames ; do
--            ( cd $destdir && $Show rm -f $alt && $Show ln -s $realName $alt )
-+            ( cd $destdir && $Show rm -f $alt && $Show ln -s $soName $alt )
-         done
-     fi
- fi
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 6810bfdc103a..5db6739ac8ad 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -7,10 +7,6 @@
   <name>Justin Bronder</name>
 </maintainer>
 <use>
-	<flag name='fast'>Enabling fast turns off error checking and timing
-	collection</flag>
-	<flag name='mpe'>Add mpe support</flag>
-	<flag name='mpe-sdk'>Include additional SDK support, jar files</flag>
 	<flag name='pvfs2'>Add pvfs2 support</flag>
 	<flag name='romio'>Enable romio, a high-performance portable MPI-IO
 	implementation</flag>
diff --git a/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild b/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild
deleted file mode 100644
index 82e5451db1b2..000000000000
--- a/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3-r1.ebuild,v 1.13 2009/11/24 21:37:22 jsbronder Exp $
-
-WANT_AUTOCONF="2.5"
-inherit fortran distutils eutils autotools toolchain-funcs
-
-DESCRIPTION="MPICH2 - A portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# need more arches in here, like sparc...
-IUSE="crypt cxx doc debug fortran mpe mpe-sdk romio threads"
-
-RDEPEND="${DEPEND}
-	mpe-sdk? ( dev-java/ibm-jdk-bin )
-	romio? ( >=dev-libs/libaio-0.3.106 )
-	>=dev-lang/python-2.3
-	sys-apps/coreutils
-	dev-lang/perl
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
-	!sys-cluster/openmpi
-	!media-sound/mpd
-	!media-sound/mpd-svn"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-	if use fortran ; then
-		if [ $(gcc-major-version) -ge 4 ] \
-		&& built_with_use sys-devel/gcc fortran ; then
-			FORTRAN="gfortran"
-			fortran_pkg_setup
-		else
-		ewarn "You need gcc-4 built with fortran support in order to"
-		ewarn "build the f90 mpi interface, which is required for f90"
-		ewarn "and mpi support in hdf5 (for example)."
-		fi
-	else
-		einfo "Unless you have another f90 compiler installed, we can only"
-		einfo "build the f77 and C++ interfaces with gcc-3.x"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ebegin "Reconfiguring"
-		find . -name configure -print | xargs rm
-		./maint/updatefiles
-		use mpe-sdk && ./src/mpe2/maint/updatefiles
-	eend
-	epatch "${FILESDIR}"/${P}-make.patch || die "make patch failed"
-	# damn, have to patch the createshlib script here...
-	epatch "${FILESDIR}"/${P}-soname.patch || die "soname patch failed"
-	#epatch "${FILESDIR}"/${P}-make-test.patch || die "make test patch failed"
-}
-
-src_compile() {
-	export LDFLAGS='-Wl,-z,now'
-
-	local RSHCOMMAND
-
-	if use crypt ; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-	export RSHCOMMAND
-
-	local myconf="${MPICH_CONFIGURE_OPTS}"
-
-	if ! use debug ; then
-		myconf="${myconf} --enable-fast --enable-g=none"
-	else
-		myconf="${myconf} --enable-g=dbg --enable-debuginfo \
-		--enable-error-messages=all"
-	fi
-
-	if ! use mpe-sdk ; then
-		myconf="${myconf} --enable-graphics=no --enable-rlog=no \
-		--enable-clog=no --enable-slog2=no"
-	fi
-
-	use mpe && MPE_SRC_DIR="${S}"/src/mpe2
-
-	if use threads ; then
-		myconf="${myconf} --with-thread-package=pthreads"
-	else
-		myconf="${myconf} --with-thread-package=none"
-	fi
-
-		./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--enable-sharedlibs=gcc \
-		--enable-nmpi-as-mpi \
-		--enable-error-checking=runtime \
-		--enable-timing=runtime \
-		${myconf} \
-		$(use_enable cxx) \
-		$(use_enable mpe) \
-		$(use_enable romio) \
-		$(use_enable threads) \
-		--includedir=/usr/include \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--sysconfdir=/etc/${PN} \
-		--datadir=/usr/share/${PN} || die "configure failed"
-
-	if use mpe-sdk ; then
-		"${MPE_SRC_DIR}"/configure --prefix=/usr --enable-mpich \
-		--with-mpicc=mpicc --with-mpif77=mpif77 --enable-wrappers \
-		--enable-collchk --with-flib_path_leader="-Wl,-L"
-	fi
-
-	if use mpe ; then
-		 epatch "${FILESDIR}"/${P}-mpe-install.patch || die "install patch failed"
-	fi
-
-	# parallel makes are currently broken, so no emake...
-	#make dependencies
-	make || die "make failed"
-
-	if has test "${FEATURES}" ; then
-		# get setup for src_test
-		#export LDFLAGS='-L../../lib'
-		export LD_LIBRARY_PATH="${S}"/lib:$LD_LIBRARY_PATH
-		cd "${S}"/test/mpi
-		#make clean || die "make clean failed"
-		echo
-		einfo "Using ./configure --prefix="${S}" --with-mpi="${S}" --disable-f90"
-		echo
-		./configure --prefix="${S}" --with-mpi="${S}" $(use_enable threads) \
-			--exec-prefix="${S}" --includedir="${S}"/src/include --disable-f90 \
-		|| die "configure test failed"
-		make dependencies
-		# make doesn't work here for some reason, although it works fine
-		# when run manually.  Go figure...
-		#cd ${S}/test/mpi/util
-		#make all || die "make util failed"
-		cd "${S}"/test
-		install -g portage -o portage -m 0600 "${FILESDIR}"/mpd.conf "${HOME}"/.mpd.conf
-		#${S}/bin/mpd --daemon
-		make all || die "make pre-test failed"
-		#cd ${S}/test/mpi
-		#make || die "make test failed"
-		#${S}/bin/mpdallexit
-	fi
-}
-
-src_test() {
-	ewarn "Tests can take a long time to complete, even on a fast box."
-	ewarn "Expected result on amd64 with gcc 4.1.1:"
-	ewarn "     6 tests failed out of 373"
-	echo
-	einfo "Control-C now if you want to disable tests..."
-	epause
-
-	"${S}"/bin/mpd --daemon
-	cd "${S}"/test
-	nice --adjustment=3 make testing || die "run tests failed"
-	"${S}"/bin/mpdallexit
-}
-
-src_install() {
-	dodir /etc/${PN}
-	rm -rf src/mpe2/etc/*.in
-	make install DESTDIR="${D}" \
-		LIBDIR="${D}"usr/$(get_libdir) || die "make install failed"
-
-	dodir /usr/share/${PN}
-	mv "${D}"usr/examples/cpi" ${D}"usr/share/${PN}/cpi
-	rm -rf "${D}"usr/examples
-	rm -rf "${D}"usr/sbin
-
-	dodir /usr/share/doc/${PF}
-	if use doc; then
-		dodoc README README.romio README.testing CHANGES
-		dodoc README.developer RELEASE_NOTES
-		newdoc src/pm/mpd/README README.mpd
-	else
-		rm -rf "${D}"usr/share/doc/
-		rm -rf "${D}"usr/share/man/
-		dodoc README CHANGES RELEASE_NOTES
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/bin
-
-	elog
-	elog "Note: this package still needs testing with other Fortran90"
-	elog "compilers besides gfortran (gcc4).  The tests also need some"
-	elog "magic to build properly within the portage build environment."
-	elog "(currently the tests only build and run manually)"
-	elog
-	elog "The gfortran support has been tested successfully with hdf5"
-	elog "(using gfortran and the mpif90 wrapper)."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/sys-cluster/mpich2/mpich2-1.0.3.ebuild b/sys-cluster/mpich2/mpich2-1.0.3.ebuild
deleted file mode 100644
index 3d1886ea05c0..000000000000
--- a/sys-cluster/mpich2/mpich2-1.0.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3.ebuild,v 1.15 2009/11/24 21:37:22 jsbronder Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="MPICH2 - A portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-# need more arches in here...
-IUSE="crypt cxx doc debug mpe threads"
-
-RDEPEND="crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
-	!sys-cluster/openmpi
-	!media-sound/mpd
-	!media-sound/mpd-svn"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ebegin "Reconfiguring"
-		./maint/updatefiles
-	eend ${ret} "Reconfigure failed"
-	epatch "${FILESDIR}"/${P}-make.patch || die "make patch failed"
-	# damn, have to patch the createshlib script here...
-	epatch "${FILESDIR}"/${P}-soname.patch || die "soname patch failed"
-
-}
-
-src_compile() {
-	export LDFLAGS='-Wl,-z,now'
-	local RSHCOMMAND
-
-	if use crypt ; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-	export RSHCOMMAND
-
-	local myconf="${MPICH_CONFIGURE_OPTS}"
-
-	if ! use debug ; then
-		myconf="${myconf} --enable-fast --enable-g=none"
-	else
-		myconf="${myconf} --enable-g=dbg --enable-debuginfo"
-	fi
-
-	if use threads ; then
-		myconf="${myconf} --with-thread-package=pthreads"
-	else
-		myconf="${myconf} --with-thread-package=none"
-	fi
-
-	WANT_AUTOCONF="2.5" \
-		./configure \
-		--prefix=/usr \
-		--enable-sharedlibs=gcc \
-		${myconf} \
-		--enable-rlog=no \
-		--enable-slog2=no \
-		$(use_enable cxx) \
-		$(use_enable mpe) \
-		$(use_enable threads) \
-		--includedir=/usr/include \
-		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--sysconfdir=/etc/mpich2 \
-		--datadir=/usr/share/mpich2 || die "configure failed"
-
-	if use mpe ; then
-		 epatch "${FILESDIR}"/${P}-mpe-install.patch || die "install patch failed"
-	fi
-
-	make || die "make failed"
-}
-
-src_install() {
-	dodir /etc/${PN}
-	rm -rf src/mpe2/etc/*.in
-	make install DESTDIR="${D}" LIBDIR="${D}"usr/$(get_libdir) \
-		|| die "make install failed"
-
-	dodir /usr/share/${PN}
-	mv "${D}"usr/examples/cpi "${D}"usr/share/${PN}/cpi
-	rm -rf "${D}"usr/examples
-	rm -rf "${D}"usr/sbin
-
-	dodir /usr/share/doc/${PF}
-	if use doc; then
-		dodoc README README.romio README.testing CHANGES
-		dodoc README.developer RELEASE_NOTES
-		newdoc src/pm/mpd/README README.mpd
-	else
-		rm -rf "${D}"usr/share/doc/
-		rm -rf "${D}"usr/share/man/
-		dodoc README CHANGES RELEASE_NOTES
-	fi
-}
diff --git a/sys-cluster/mpich2/mpich2-1.0.6.ebuild b/sys-cluster/mpich2/mpich2-1.0.6.ebuild
deleted file mode 100644
index 6d4965922273..000000000000
--- a/sys-cluster/mpich2/mpich2-1.0.6.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.9 2009/11/24 21:37:22 jsbronder Exp $
-
-WANT_AUTOCONF="2.5"
-inherit autotools distutils eutils flag-o-matic fortran java-pkg-2
-
-#MY_P=${P/_/}
-MY_P=${P}p1
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="MPICH2 - A portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/${MY_P}.tar.gz"
-#SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="crypt cxx debug doc fast fortran mpe mpe-sdk pvfs2 threads"
-
-DEPEND="sys-devel/libtool
-	dev-lang/perl
-	>=dev-lang/python-2.3
-	>=dev-libs/libaio-0.3.106
-	net-fs/nfs-utils
-	pvfs2? ( >=sys-cluster/pvfs2-2.7.0 )
-	mpe-sdk? ( >=virtual/jdk-1.5
-		x11-proto/xproto )
-	doc? ( virtual/latex-base )"
-
-RDEPEND="${DEPEND}
-	mpe-sdk? ( x11-libs/libX11 )
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
-	!sys-cluster/openmpi
-	!media-sound/mpd
-	!media-sound/mpd-svn"
-
-T_M4DIR="${S}/confdb"
-
-RESTRICT="test"
-# To-do: work on tests and add SCTP support for kernel and user tools
-# Initial test implementation doesn't work yet - feel free to fix it...
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}."
-	else
-		elog "User-specified configure options are not set."
-		elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS."
-	fi
-
-	if use fortran ; then
-		if [ $(gcc-major-version) -ge 4 ] \
-		&& built_with_use sys-devel/gcc fortran ; then
-			FORTRAN="gfortran"
-			MPI_FFLAGS="-ff2c"
-			fortran_pkg_setup
-		else
-		ewarn "You need gcc-4 built with fortran support in order to"
-		ewarn "build the f90 mpi interface, which is required for f90"
-		ewarn "and mpi support in hdf5 (for example)."
-		FORTRAN="g77 f2c"
-		fortran_pkg_setup
-		fi
-	else
-		ewarn "Unless you have another f90 compiler installed, we can only"
-		ewarn "build the C and C++ interfaces with gcc-3.x"
-	fi
-
-	if use mpe-sdk; then
-		java-pkg-2_pkg_setup
-		if use x86; then
-		jvmarch=i386
-		else
-		jvmarch="${ARCH}"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Reconfiguring"
-		find . -name configure -print | xargs rm
-		./maint/updatefiles
-		use mpe-sdk && ./src/mpe2/maint/updatefiles
-	eend
-
-	# a few fixes for building the shared libs, PIC, etc
-	epatch "${FILESDIR}/${P}-cxx.patch" || die "cxx patch failed"
-	epatch "${FILESDIR}/${P}-fPIC.patch" || die "fPIC patch failed"
-	epatch "${FILESDIR}/${P}-shlib.patch" || die "createshlib patch failed"
-	epatch "${FILESDIR}/${P}-makefile.patch" || die "make patch failed"
-
-	if use pvfs2; then
-		sed -i -e "s:-laio:-laio -lpvfs2:g" Makefile.in \
-		|| die "sed pvfs2 failed"
-	else
-		epatch "${FILESDIR}/${P}-no-pvfs2.patch" || die "no pvfs patch failed"
-		elog ""
-		ewarn "If you wish to build without pvfs2 support, then you will"
-		ewarn "need to remove the pvfs2 package if already installed."
-		ewarn "Please remove pvfs2 and then rebuild mpich2.  If pvfs2"
-		ewarn "is not installed, then you can safely ignore this warning."
-		elog ""
-		epause 5
-	fi
-
-	use mpe-sdk && setup-jvm-opts
-}
-
-src_compile() {
-	if use crypt ; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-	export RSHCOMMAND
-
-	local myconf="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc"
-	local doc_conf=""
-	local mpe_conf=""
-
-	# update to using flag-o-matic
-	append-ldflags -Wl,-z,now
-	replace-flags -fpic -fPIC
-	filter-flags -fomit-frame-pointer
-
-	if ! use debug ; then
-		myconf="${myconf} --enable-g=none"
-	else
-		myconf="${myconf} --enable-g=dbg,mem,log --enable-debuginfo"
-	fi
-
-	if ! use mpe-sdk ; then
-		myconf="${myconf} --enable-rlog=no --enable-slog2=no"
-	fi
-
-	if use threads ; then
-		myconf="${myconf} --with-thread-package=pthreads"
-	else
-		myconf="${myconf} --with-thread-package=none"
-	fi
-
-	# enable f90 support for appropriate compilers
-	case "${FORTRANC}" in
-		gfortran|ifc|ifort|f95)
-		myconf="${myconf} --enable-f77 --enable-f90"
-		;;
-		g77|f77|f2c)
-		myconf="${myconf} --enable-f77 --disable-f90"
-		;;
-	esac
-
-	# top-level configure option is romio
-	myconf="${myconf} --enable-romio"
-
-	# several of these are romio-specific configure options
-	myconf="${myconf} --enable-aio --with-mpi=mpich2_mpi"
-	if use pvfs2; then
-		myconf="${myconf} --with-file-system=pvfs2+nfs+ufs \
-		--with-pvfs2=/usr"
-	else
-		# support for nfs and unix-like filesystems is the minimum
-		myconf="${myconf} --with-file-system=nfs+ufs --with-pvfs2=no"
-	fi
-	# enable debug for romio
-	use debug && myconf="${myconf} --enable-debug"
-
-	use mpe && MPE_SRC_DIR="${S}"/src/mpe2
-
-	# I'm sure there's a better way to do this...
-	if use cxx; then
-		tc-export CPP CC CXX LD
-		CXXLIBPATH="/usr/$(get_libdir)/gcc/${CHOST}/$(gcc-fullversion)"
-		sed -i -e "s:nerdboy:${CXXLIBPATH}:g" Makefile.in \
-		|| die "sed 3 failed"
-	fi
-
-	if use doc; then
-		doc_conf="--docdir=/usr/share/doc/${PF} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--with-pdfdir=/usr/share/doc/${PF} \
-		--with-psdir=/usr/share/doc/${PF}"
-	else
-		doc_conf="--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html"
-	fi
-
-	if use mpe-sdk; then
-		mpe_conf="--with-java=${JDK_TOPDIR} --with-java2=${JDK_TOPDIR} \
-		--enable-slog2=build \
-		--with-mpicc=\"${WORKDIR}\"/build/bin/mpicc \
-		--with-mpif77=\"${WORKDIR}\"/build/bin/mpif77 \
-		--enable-collchk --enable-graphics=yes --enable-wrappers \
-		--with-trace-libdir=/usr/$(get_libdir)/mpe/trace_rlog \
-		--with-flib_path_leader=-Wl,-L --enable-mpich \
-		--enable-misc --enable-callstack --enable-logging"
-
-		use debug && mpe_conf="${mpe_conf} --enable-g"
-
-		sed -i -e "s:fpic:fPIC:g" \
-		src/mpe2/src/slog2sdk/trace_sample/configure \
-		|| die "sed 1 failed"
-		sed -i -e "s:fpic:fPIC:g" \
-		src/mpe2/src/slog2sdk/trace_rlog/configure \
-		|| die "sed 2 failed"
-	fi
-
-	# trying the vpath build
-	mkdir ../build
-	cd ../build
-
-	"${S}"/configure \
-		--with-pm=mpd,gforker \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		${myconf} \
-		${mpe_conf} \
-		${doc_conf} \
-		$(use_enable fast) \
-		$(use_enable cxx) \
-		$(use_enable mpe) \
-		$(use_enable threads) \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/"${PN}" \
-		--datadir=/usr/share/"${PN}" || die "configure failed"
-
-	# no parallel make here
-	use fortran && export FFLAGS="-fPIC"
-	make dependencies || die "failed to make dependencies"
-	make || die "make failed"
-}
-
-src_test() {
-	ewarn "Tests can take a long time to complete, even on a fast box."
-	ewarn "Expected result on amd64 with gcc 4.1.1:"
-	ewarn "     6 tests failed out of 373"
-	elog ""
-	elog "Control-C now if you want to disable tests..."
-	epause
-
-	install -g portage -o portage -m 0600 "${FILESDIR}"/mpd.conf "${HOME}"/.mpd.conf
-	TEST="${WORKDIR}/build"
-
-	"${TEST}"/bin/mpd --daemon
-
-	cd "${TEST}"
-	mkdir t1
-	export MPIO_USER_PATH="${TEST}"/t1
-
-	sed -i -e "s:/usr/bin/mpiexec:${TEST}/bin/mpiexec:g" test/mpi/Makefile \
-		|| die "sed 4 failed"
-	sed -i -e "s:/usr:${TEST}:g" test/commands/cmdtests \
-		|| die "sed 5 failed"
-
-	cd test
-	make clean || die "make clean in test failed"
-
-	echo
-	elog "Using ./configure --prefix=${TEST} --with-mpi=${TEST} etc..."
-	echo
-
-	export LD_LIBRARY_PATH="${TEST}/lib:$LD_LIBRARY_PATH"
-
-	"${S}"/configure \
-		--exec-prefix="${TEST}" --with-mpi="${TEST}" \
-		--disable-f90 --with-mpich2="${TEST}" $(use_enable threads) \
-		|| die "configure test failed"
-
-	nice --adjustment=3 make testing || die "make testing failed"
-
-	"${TEST}"/bin/mpdallexit
-}
-
-src_install() {
-	dodir /etc/"${PN}"
-
-	rm -f src/mpe2/etc/*.in
-
-	cd ../build
-	make DESTDIR="${D}" LIBDIR="${D}"usr/$(get_libdir) install \
-		|| die "make install failed"
-
-	cd "${S}"
-
-	rm -f "${D}"usr/$(get_libdir)/*.jar
-	use mpe-sdk && java-pkg_dojar src/mpe2/src/slog2sdk/lib/*.jar
-
-	dodir /usr/share/doc/"${PF}"
-	if use doc; then
-		dodoc README README.romio README.testing CHANGES
-		dodoc README.developer RELEASE_NOTES
-		newdoc src/pm/mpd/README README.mpd
-
-		if use mpe-sdk; then
-		dodoc src/mpe2/src/slog2sdk/README.sdk \
-			src/mpe2/src/slog2sdk/README.rte
-		newdoc src/mpe2/src/slog2sdk/FAQ FAQ.sdk
-		fi
-	else
-		rm -rf "${D}"usr/share/doc/"${PF}"/{html,*.pdf}
-		dodoc README CHANGES RELEASE_NOTES
-	fi
-
-	# Tidy up a bit
-	use mpe-sdk && rm "${D}"usr/sbin/mpeuninstall
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/bin
-
-	elog ""
-	elog "Several specific options are left set to default values; if"
-	elog "you wish to specify non-default values for things like the"
-	elog "timer type, timing level, devices, or communication channels,"
-	elog "please read the docs and rebuild with MPICH_CONFIGURE_OPTS"
-	elog "set to your desired options."
-	elog ""
-	elog "Note 1: enabling the MPE2 SDK requires both a JDK and the core"
-	elog "X11 library for the full set of log analysis and conversion"
-	elog "utilities.  You probably don't want to enable the mpe-sdk USE"
-	elog "flag on a server, cluster node, etc."
-	elog ""
-	elog "Note 2: the shared libraries are now building correctly, at"
-	elog "least with and without pvfs2 support (the romio USE flag is no"
-	elog "longer availaible, at least until the configure scripts can be"
-	elog "made to stop finding things when they're disabled)."
-	elog ""
-	elog "Note 3: this package still needs testing with other Fortran90"
-	elog "compilers besides gfortran (gcc4).  The tests also need some"
-	elog "magic to build properly within the portage build environment."
-	elog "(currently the tests only build and run manually)"
-	elog ""
-	elog "The gfortran support has been tested successfully with hdf5"
-	elog "(using gfortran and the mpif90 wrapper), however, the pvfs2"
-	elog "support is brand-spanking new."
-	elog ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
-
-setup-jvm-opts() {
-	# Figure out correct boot classpath
-	# stolen from eclipse-sdk ebuild
-	local bp="$(java-config --jdk-home)/jre/lib"
-	local bootclasspath="$(java-config --runtime)"
-	if [[ ! -z "`java-config --java-version | grep IBM`" ]] ; then
-		# IBM JDK
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
-	else
-		# Sun derived JDKs (Blackdown, Sun)
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
-	fi
-
-	JDK_TOPDIR="$(java-config --jdk-home)"
-	JDK_INCDIR="$(java-config --jdk-home)/include"
-
-	elog ""
-	elog "Using bootclasspath ${bootclasspath}"
-	elog "Using JVM library path ${JAVA_LIB_DIR}"
-	elog "Using JDK Include dir ${JDK_INCDIR}"
-	elog "Using JDK Top-level dir ${JDK_TOPDIR}"
-	elog ""
-
-	if [[ ! -f "${JAVA_LIB_DIR}"/libawt.so ]] ; then
-		die "Could not find libawt.so native library"
-	fi
-
-	if [[ ! -f "${JDK_INCDIR}"/jni.h ]] ; then
-		die "Could not find jni.h header file"
-	fi
-
-	export AWT_LIB_PATH="${JAVA_LIB_DIR}"
-	export JDK_TOPDIR="${JDK_TOPDIR}"
-	export JDK_INCDIR="${JDK_INCDIR}"
-}