sys-cluster/mpich2: fix #259805 by backing out the site-packages fix. It'll be better off just sent directly to upstream.

5 files changed, 34 insertions, 199 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index ec738d22f..0ac102dd9 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Apr 2009; Justin Bronder <jsbronder@gentoo.org>
+  sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch,
+  -sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch:
+  Fix #259805 by backing out the site-packages fix. It'll be better off just
+  sent directly to upstream.
+
   17 Feb 2009; Justin Bronder <jsbronder@gentoo.org>
   sys-cluster/mpich2/mpich2-1.0.8.ebuild:
   Missing line continuation, #259209.
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 7dced8f01..b1a58f2e4 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,11 +1,10 @@
 AUX eselect.mpi.mpich2 226 RMD160 62e00e1f67ff5cc088d7aa3ef082241afef33bde SHA1 f89ddfb1a10251f5023093f6577ebb8265d55627 SHA256 ffad3f539f008c597077aee91a7c635968311c8b3124619acb727facd0d1e99e
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced
-AUX mpich2-1.0.8-mpdconf-env.patch 5041 RMD160 c3d9f6ebd43443a24614da030253cf8c503afd59 SHA1 5b453a171f8b1dce93e3c2e675e5b3d4f05514e8 SHA256 b8c81614bba8c748db2ec24a7683d27b3a0430950fecd5644fd1f97f8e5ab2f9
+AUX mpich2-1.0.8-mpdconf-env.patch 5355 RMD160 26ffada537073676553fdc4a9ee6a02f1a1af279 SHA1 f40eee99425894d9c76c8eefa87b8e72d9b7a02a SHA256 14cbd73be6969569574a880ad23e7c71c4bb02e6994392b2661bf5fb1965ce3d
 AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
-AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8
 AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
 DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1f SHA1 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 SHA256 7551ce20f3ef366567c566d08782323360b5dbd2d15d816e41c10b5f96eaf369
-EBUILD mpich2-1.0.8.ebuild 5950 RMD160 3878cd3f0d1fd79c5456bdf806e82361a5a70c4e SHA1 6ea41421b9b6ae5bf8d1f64f0d24524134bdb298 SHA256 9cd2044f3dd94e76c8db9a3a0498461288efdab41e4aef23352f54651ea0a628
+EBUILD mpich2-1.0.8-r1.ebuild 5546 RMD160 5332d8b0fa9844f195e246ca6b54619e9e01b318 SHA1 10e4ca39b6caa5b73726450bb40023dba2913260 SHA256 fcf5b454a7013c0efd450da574563e808dcd76ef5971eb0d50366362e92cbbc5
 MISC ChangeLog 845 RMD160 942e4ec9c5e10cadebd654d9123f9ce5cec4099e SHA1 f3a4889d435f8efe39719a2ba583a566e4f129fc SHA256 7c80afe12b24a3d14617ac0122c965d0960de21ca60688b7f7602b2555c68c06
 MISC metadata.xml 468 RMD160 98d955b7fd33a5b54c618424df4bc1237bb91a21 SHA1 eb055936e1a4ecafa846c1b7be6bc8c96d503ba1 SHA256 9516aa2c4536c5bc0555b42af1019a82e0f027ba8e52c0c46bcb5ee3fff8a765
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
index f29682ad9..af3bbb239 100644
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
+++ b/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
@@ -1,7 +1,7 @@
-diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile.in
---- mpich2-1.0.8/src/pm/mpd/Makefile.in	2008-11-01 16:55:07.409787116 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/Makefile.in	2008-11-04 20:37:19.510506041 -0500
-@@ -78,7 +78,7 @@
+diff -urN a/mpich2-1.0.8/src/pm/mpd/Makefile.in b/mpich2-1.0.8/src/pm/mpd/Makefile.in
+--- a/mpich2-1.0.8/src/pm/mpd/Makefile.in	2008-09-17 16:40:53.000000000 -0400
++++ b/mpich2-1.0.8/src/pm/mpd/Makefile.in	2009-04-01 16:38:02.236018295 -0400
+@@ -74,7 +74,7 @@
  	$(C_LINK) -o mpdroot ${mpdroot_OBJECTS} $(LIBS)
  
  mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
@@ -10,19 +10,21 @@ diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile
  
  # The following lines provide the right libraries for all example programs
  .c:
-@@ -136,7 +136,10 @@
- 	fi
+@@ -128,8 +128,11 @@
+ 	@echo "copying python files/links into " $(DESTDIR)${bindir}
  	-@for cmd in ${PYTHON_SOURCE} ; do \
  	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
 -	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
+-	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
 +	    sed \
 +			-e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
 +			-e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
 +			${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- 	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$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
-@@ -218,7 +221,7 @@
+ 	-@cd $(DESTDIR)${bindir} && rm -f mpd
+@@ -210,7 +213,7 @@
  
  mpich2-mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
  	${INSTALL} -m 644 ${srcdir}/mpdroot.c mpich2-mpdroot.c
@@ -31,21 +33,23 @@ diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile
  	rm -f mpich2-mpdroot.c
  
  # A special alternate installation target when using multiple process managers
-@@ -238,7 +241,10 @@
- 	fi
+@@ -226,8 +229,11 @@
+ 	fi   
  	for cmd in ${PYTHON_SOURCE} ; do \
  	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
 -	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+	    sed \
+-	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
++		sed \
 +			-e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
 +			-e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
 +			${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- 	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$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
-diff -urN mpich2-1.0.8/src/pm/mpd/mpdlib.py mpich2-1.0.8_p/src/pm/mpd/mpdlib.py
---- mpich2-1.0.8/src/pm/mpd/mpdlib.py	2007-11-08 18:47:44.000000000 -0500
-+++ mpich2-1.0.8_p/src/pm/mpd/mpdlib.py	2008-11-04 20:40:36.812894529 -0500
+ 	cd $(DESTDIR)${bindir} && rm -f mpd
+diff -urN a/mpich2-1.0.8/src/pm/mpd/mpdlib.py b/mpich2-1.0.8/src/pm/mpd/mpdlib.py
+--- a/mpich2-1.0.8/src/pm/mpd/mpdlib.py	2007-11-08 18:47:44.000000000 -0500
++++ b/mpich2-1.0.8/src/pm/mpd/mpdlib.py	2009-04-01 16:35:08.899627072 -0400
 @@ -1341,11 +1341,11 @@
              if os.environ.has_key(k):
                  self[('env',k)] = os.environ[k]
@@ -60,9 +64,9 @@ diff -urN mpich2-1.0.8/src/pm/mpd/mpdlib.py mpich2-1.0.8_p/src/pm/mpd/mpdlib.py
              parmsRCFilename = os.path.join(os.environ['HOME'],'.mpd.conf')
          elif os.environ.has_key('HOMEPATH'):    # e.g. win32
              parmsRCFilename = os.path.join(os.environ['HOMEPATH'],'.mpd.conf')
-diff -urN mpich2-1.0.8/src/pm/mpd/mpdroot.c mpich2-1.0.8_p/src/pm/mpd/mpdroot.c
---- mpich2-1.0.8/src/pm/mpd/mpdroot.c	2007-11-02 18:50:19.000000000 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/mpdroot.c	2008-11-07 13:45:10.560017904 -0500
+diff -urN a/mpich2-1.0.8/src/pm/mpd/mpdroot.c b/mpich2-1.0.8/src/pm/mpd/mpdroot.c
+--- a/mpich2-1.0.8/src/pm/mpd/mpdroot.c	2007-11-02 18:50:19.000000000 -0400
++++ b/mpich2-1.0.8/src/pm/mpd/mpdroot.c	2009-04-01 16:35:08.899627072 -0400
 @@ -19,6 +19,7 @@
      struct passwd *pwent;
      char input_line[NAME_LEN+1], secretword[NAME_LEN+1];
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch
deleted file mode 100644
index a3e894e74..000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile.in
---- mpich2-1.0.8/src/pm/mpd/Makefile.in	2008-09-17 16:40:53.000000000 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/Makefile.in	2008-11-01 13:17:08.518285830 -0400
-@@ -20,6 +20,10 @@
- INSTALL   = @INSTALL@
- CFLAGS    = @CFLAGS@
- 
-+LIBDIRNAME = `echo @libdir@ | sed 's:.*@prefix@/::'`
-+PYTHONDIR  = ${prefix}/${LIBDIRNAME}/${PYTHON}/site-packages/mpich2
-+PYTHONLINK = ../${LIBDIRNAME}/${PYTHON}/site-packages/mpich2
-+
- C_COMPILE = ${CC} ${INCLUDES} ${CFLAGS} ${COPTIONS}
- C_LINK	  = ${CLINKER} ${CFLAGS} ${COPTIONS} ${LDFLAGS}
- 
-@@ -125,29 +129,33 @@
-         else \
- 	    ${INSTALL} -m  755 mpdroot $(DESTDIR)${bindir}/mpdroot ;\
- 	fi
--	@echo "copying python files/links into " $(DESTDIR)${bindir}
-+	@echo "copying python files/links into " $(DESTDIR)${PYTHONDIR}
-+	@if [ ! -d $(DESTDIR)${PYTHONDIR} ] ; then \
-+		echo "mkdir -p $(DESTDIR)${PYTHONDIR} " ;\
-+		mkdir -p $(DESTDIR)${PYTHONDIR} ; \
-+	fi
- 	-@for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
- 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
--	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
- 	-@cd $(DESTDIR)${bindir} && rm -f mpd
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpd.py mpd
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpd.py mpd
- 	-@cd $(DESTDIR)${bindir} && rm -f mpdboot
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpdboot.py mpdboot
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpdboot.py mpdboot
- 	-@for cmd in ${CMDS} ; do \
- 	    ( cd $(DESTDIR)${bindir} && rm -f $$cmd ; ) ; \
--	    ( cd $(DESTDIR)${bindir} && @LN_S@ $$cmd.py $$cmd ; ) \
-+	    ( cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/$$cmd.py $$cmd ; ) \
- 	done
- 	-@( rm -f $(DESTDIR)${bindir}/mpdrun >/dev/null 2>&1 || exit 0 )
--	-@( rm -f $(DESTDIR)${bindir}/mpdrun.py >/dev/null 2>&1 || exit 0 )
-+	-@( rm -f $(DESTDIR)${PYTHONDIR}/mpdrun.py >/dev/null 2>&1 || exit 0 )
- 	-@( rm -f $(DESTDIR)${bindir}/mpirun >/dev/null 2>&1 || exit 0 )
--	-@( rm -f $(DESTDIR)${bindir}/mpirun.py >/dev/null 2>&1 || exit 0 )
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec mpdrun
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.py mpdrun.py
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec mpirun
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.py mpirun.py
-+	-@( rm -f $(DESTDIR)${PYTHONDIR}/mpirun.py >/dev/null 2>&1 || exit 0 )
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpdrun
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpdrun.py
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpirun
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpirun.py
- 	-@if [ "${DO_MTV}" = "yes" ] ; then \
- 	    ${INSTALL} -m 755 mtv.so $(DESTDIR)${bindir}/mtv.so ;\
- 	fi
-@@ -166,43 +174,43 @@
- 	-rm -f $(DESTDIR)${bindir}/mpdroot
- 	-rm -f $(DESTDIR)${bindir}/Zeroconf.py
- 	-rm -f $(DESTDIR)${bindir}/mpd
--	-rm -f $(DESTDIR)${bindir}/mpd.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpd.py
- 	-rm -f $(DESTDIR)${bindir}/mpdallexit
--	-rm -f $(DESTDIR)${bindir}/mpdallexit.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdallexit.py
- 	-rm -f $(DESTDIR)${bindir}/mpdboot
--	-rm -f $(DESTDIR)${bindir}/mpdboot.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdboot.py
- 	-rm -f $(DESTDIR)${bindir}/mpdcheck
--	-rm -f $(DESTDIR)${bindir}/mpdcheck.py
--	-rm -f $(DESTDIR)${bindir}/mpdchkpyver.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdcheck.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdchkpyver.py
- 	-rm -f $(DESTDIR)${bindir}/mpdcleanup
--	-rm -f $(DESTDIR)${bindir}/mpdcleanup.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdcleanup.py
- 	-rm -f $(DESTDIR)${bindir}/mpdexit
--	-rm -f $(DESTDIR)${bindir}/mpdexit.py
--	-rm -f $(DESTDIR)${bindir}/mpdgdbdrv.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdexit.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdgdbdrv.py
- 	-rm -f $(DESTDIR)${bindir}/mpdhelp
--	-rm -f $(DESTDIR)${bindir}/mpdhelp.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdhelp.py
- 	-rm -f $(DESTDIR)${bindir}/mpdkilljob
--	-rm -f $(DESTDIR)${bindir}/mpdkilljob.py
--	-rm -f $(DESTDIR)${bindir}/mpdlib.py
--	-rm -f $(DESTDIR)${bindir}/mpdlib.pyc
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdkilljob.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlib.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlib.pyc
- 	-rm -f $(DESTDIR)${bindir}/mpdlistjobs
--	-rm -f $(DESTDIR)${bindir}/mpdlistjobs.py
--	-rm -f $(DESTDIR)${bindir}/mpdman.py
--	-rm -f $(DESTDIR)${bindir}/mpdman.pyc
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlistjobs.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdman.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdman.pyc
- 	-rm -f $(DESTDIR)${bindir}/mpdringtest
--	-rm -f $(DESTDIR)${bindir}/mpdringtest.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdringtest.py
- 	-rm -f $(DESTDIR)${bindir}/mpdrun
--	-rm -f $(DESTDIR)${bindir}/mpdrun.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdrun.py
- 	-rm -f $(DESTDIR)${bindir}/mpdsigjob
--	-rm -f $(DESTDIR)${bindir}/mpdsigjob.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdsigjob.py
- 	-rm -f $(DESTDIR)${bindir}/mpdtrace
--	-rm -f $(DESTDIR)${bindir}/mpdtrace.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdtrace.py
- 	-rm -f $(DESTDIR)${bindir}/mpecc.in
- 	-rm -f $(DESTDIR)${bindir}/mpefc.in
- 	-rm -f $(DESTDIR)${bindir}/mpiexec
--	-rm -f $(DESTDIR)${bindir}/mpiexec.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpiexec.py
- 	-rm -f $(DESTDIR)${bindir}/mpirun
--	-rm -f $(DESTDIR)${bindir}/mpirun.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpirun.py
- 
- mpich2-mpdroot: mpich2-mpdroot.o
- 	$(C_LINK) -o mpich2-mpdroot mpich2-mpdroot.o $(LIBS)
-@@ -224,25 +232,29 @@
- 	    echo "mkdir -p $(DESTDIR)${bindir} " ;\
- 	    mkdir -p $(DESTDIR)${bindir} ;\
- 	fi   
-+	@if [ ! -d $(DESTDIR)${PYTHONDIR} ] ; then \
-+		echo "mkdir -p $(DESTDIR)${PYTHONDIR} " ;\
-+		mkdir -p $(DESTDIR)${PYTHONDIR} ; \
-+	fi
- 	for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
- 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
--	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
- 	cd $(DESTDIR)${bindir} && rm -f mpd
--	cd $(DESTDIR)${bindir} && @LN_S@ mpd.py mpd
-+	cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpd.py mpd
- 	cd $(DESTDIR)${bindir} && rm -f mpdboot
--	cd $(DESTDIR)${bindir} && @LN_S@ mpdboot.py mpdboot
-+	cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpdboot.py mpdboot
- 	for cmd in ${CMDS} ; do \
- 	    if [ $$cmd = "mpiexec" ] ; then continue ; fi ; \
- 	    ( cd $(DESTDIR)${bindir} && rm -f $$cmd ; ) ; \
--	    ( cd $(DESTDIR)${bindir} && @LN_S@ $$cmd.py $$cmd ; ) \
-+	    ( cd $(DESTDIR)${bindir} && @LN_S@ )${PYTHONLINK}/$$cmd.py $$cmd ; ) \
- 	done
--	( rm -f $(DESTDIR)${bindir}/mpdrun >/dev/null 2>&1 || exit 0 )
-+	( rm -f $(DESTDIR)${PYTHONDIR}/mpdrun >/dev/null 2>&1 || exit 0 )
- 	( rm -f $(DESTDIR)${bindir}/mpdrun.py >/dev/null 2>&1 || exit 0 )
--	mv -f $(DESTDIR)${bindir}/mpiexec.py $(DESTDIR)${bindir}/mpiexec.mpd
--	cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.mpd mpdrun
-+	mv -f $(DESTDIR)${PYTHONDIR}/mpiexec.py $(DESTDIR)${PYTHONDIR}/mpiexec.mpd
-+	cd $(DESTDIR)${bindir} && @LN_S@ )${PYTHONLINK}/mpiexec.mpd mpdrun
- 
- # Empty dependencies target (MPICH2 wants this target)
- dependencies:
diff --git a/sys-cluster/mpich2/mpich2-1.0.8.ebuild b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
index a9596795c..e16deb49d 100644
--- a/sys-cluster/mpich2/mpich2-1.0.8.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit python eutils fortran mpi
+inherit eutils fortran mpi
 
 DESCRIPTION="MPICH2 - A portable MPI implementation"
 HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich2"
@@ -52,8 +52,6 @@ pkg_setup() {
 	else
 		MPD_CONF_FILE_DIR=/etc/${PN}
 	fi
-
-	python_version
 }
 
 src_unpack() {
@@ -69,11 +67,6 @@ src_unpack() {
 	sed -i 's/-fpic/-fPIC/g' \
 		$(grep -lr -e '-fpic' "${S}"/) || die "failed to change -fpic to -fPIC"
 
-	# Put python files in site-packages where they belong.
-	# This isn't the prettiest little patch, but it does
-	# move python files out of /usr/bin/
-	epatch "${FILESDIR}"/${P}-site-packages-py.patch
-
 	# Respect the env var MPD_CONF_FILE
 	# TODO:  Send upstream
 	epatch "${FILESDIR}"/${P}-mpdconf-env.patch
@@ -195,15 +188,15 @@ src_install() {
 		mv "${D}"/${d}/usr/share/doc/www*/* "${D}"/${d}/usr/share/doc/${PF}/www/
 	fi
 
-	#TODO: Need to handle python path here if mpi_classed?
 	cp "${FILESDIR}"/${PN}.envd "${T}"/
 	sed -i "s,@MPD_CONF_FILE_DIR@,${MPD_CONF_FILE_DIR}," \
-		"${T}"/${PN}.envd
+		"${T}"/${PN}.envd || die
 
 	if mpi_classed; then
+		# TODO:  This breaks down with more than one mpich2 installed.
 		newenvd "${T}"/${PN}.envd 25mpich2-$(mpi_class)
 	else
-		newenvd "${FILESDIR}"/${PN}.envd 25mpich2
+		newenvd "${T}"/${PN}.envd 25mpich2
 	fi
 
 	mpi_imp_add_eselect
@@ -214,14 +207,8 @@ pkg_postinst() {
 	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 
-	python_mod_optimize $(mpi_root)/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
 	elog ""
 	elog "MPE2 has been removed from this ebuild and now stands alone"
 	elog "as sys-cluster/mpe2."
 	elog ""
 }
-
-pkg_postrm() {
-	python_mod_cleanup $(mpi_root)/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-}
-