14 files changed, 8 insertions, 932 deletions
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index 11ea3de3cfbf..47e4b332c321 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -6,19 +6,9 @@ AUX 7.1.2-liblam-use-extra-libs.patch 490 RMD160 f52c0c3490a5d7dd9fa3993032c64c5
 MD5 13ba37487b7c16a3a468bc91719d6a7f files/7.1.2-liblam-use-extra-libs.patch 490
 RMD160 f52c0c3490a5d7dd9fa3993032c64c5fd7ef4295 files/7.1.2-liblam-use-extra-libs.patch 490
 SHA256 580a84ef0364d9ea9bf204024906d18b7b00338e48cfafdc04f2d82d9c4b6870 files/7.1.2-liblam-use-extra-libs.patch 490
-AUX lam-mpi-7.1.1-shared-romio.patch 10522 RMD160 23e33f1e5097226369c65b9293fcd3272071d960 SHA1 e1d735c3559597093fe84feea8363e808cc3f442 SHA256 205e2f6d488035de8406c6630a0bc0c1a6229f2da4669835f8968892a48f941e
-MD5 bcac54d719834a00296b9fdf7026d117 files/lam-mpi-7.1.1-shared-romio.patch 10522
-RMD160 23e33f1e5097226369c65b9293fcd3272071d960 files/lam-mpi-7.1.1-shared-romio.patch 10522
-SHA256 205e2f6d488035de8406c6630a0bc0c1a6229f2da4669835f8968892a48f941e files/lam-mpi-7.1.1-shared-romio.patch 10522
 DIST lam-7.0.4.tar.bz2 5695492
 DIST lam-7.0.6.tar.bz2 5752257
-DIST lam-7.1.1.tar.bz2 7589413
 DIST lam-7.1.2.tar.bz2 7851483 RMD160 4aeb62d41dc0b6f910424feb1046c6925bd620c4 SHA1 fa0c3278f9420b218fa7a4ef9b052ec6d93baa0c SHA256 b3826e79f1a674ed275d2a0e32895aefe63d4278126bd5fa01dbe43cc1c1960b
-DIST lam-7.1.tar.bz2 7542937
-EBUILD lam-mpi-7.0.4-r1.ebuild 1695 RMD160 167ef01b9124be8cfa3e5524ed74c5aa28075cf5 SHA1 35261fe2b008a42412c86db5d792cfc59e3e132b SHA256 5cb1f6a7320a17081d27b3eeb4b338df956fbc800180d192e3a83f2d5437d916
-MD5 74a4f93a4a855ce5f78a87832ddfaa0f lam-mpi-7.0.4-r1.ebuild 1695
-RMD160 167ef01b9124be8cfa3e5524ed74c5aa28075cf5 lam-mpi-7.0.4-r1.ebuild 1695
-SHA256 5cb1f6a7320a17081d27b3eeb4b338df956fbc800180d192e3a83f2d5437d916 lam-mpi-7.0.4-r1.ebuild 1695
 EBUILD lam-mpi-7.0.4.ebuild 1442 RMD160 8e3dd6e9c29183977db91f480b2197935700110f SHA1 35fc4165e0858354bc0520b60b0b75b76240da52 SHA256 86028da20e25d1192ec781b2f9eb1e38cb20a4b19edd71617ffd8f169de354cf
 MD5 09cdcdb1957de0316945e360f642c9f2 lam-mpi-7.0.4.ebuild 1442
 RMD160 8e3dd6e9c29183977db91f480b2197935700110f lam-mpi-7.0.4.ebuild 1442
@@ -27,22 +17,14 @@ EBUILD lam-mpi-7.0.6.ebuild 1616 RMD160 bc379ddf52b8d80389fdb7a14c8bc7de836b0324
 MD5 861dcc1aa59b0e097079f547c7fe6b88 lam-mpi-7.0.6.ebuild 1616
 RMD160 bc379ddf52b8d80389fdb7a14c8bc7de836b0324 lam-mpi-7.0.6.ebuild 1616
 SHA256 7faba34cc10357a04bae3307c35b721b34bb682575ab448fa1d5125df6234fa2 lam-mpi-7.0.6.ebuild 1616
-EBUILD lam-mpi-7.1.1-r3.ebuild 2618 RMD160 9abe548a713007cdbc6fea19c5ed8a43be6a1097 SHA1 9a801558910689dfc72ae869fbcdfd3fe941e063 SHA256 69c8efdfa81d8902eddcdc36ea46b860b6c35c2e9ce2ca05425658bdbb17df98
-MD5 29b6090d40bea091a494c79b014a6575 lam-mpi-7.1.1-r3.ebuild 2618
-RMD160 9abe548a713007cdbc6fea19c5ed8a43be6a1097 lam-mpi-7.1.1-r3.ebuild 2618
-SHA256 69c8efdfa81d8902eddcdc36ea46b860b6c35c2e9ce2ca05425658bdbb17df98 lam-mpi-7.1.1-r3.ebuild 2618
 EBUILD lam-mpi-7.1.2.ebuild 2645 RMD160 2d1773061386fc16b150c60f17903988d74461e9 SHA1 41707e744f88cc5552bf8f8b3a454492135b2869 SHA256 301e9be39c8b49411cbeac63ce60f9da4715ed2bdf436a7728297577e903e531
 MD5 107444ce82b123d38c4a4fe39d03b235 lam-mpi-7.1.2.ebuild 2645
 RMD160 2d1773061386fc16b150c60f17903988d74461e9 lam-mpi-7.1.2.ebuild 2645
 SHA256 301e9be39c8b49411cbeac63ce60f9da4715ed2bdf436a7728297577e903e531 lam-mpi-7.1.2.ebuild 2645
-EBUILD lam-mpi-7.1.ebuild 1619 RMD160 f3e62e4f0bf56cdb8962d8b00a518b03738601fc SHA1 a7b2c0a51866037088cd5715ae3ccc7a319460eb SHA256 8fb56c19d15f4cb2b477d8062a38eba0f3548deda7bfc321b85c70e7c4246c4c
-MD5 ae841b28d60b0120213eb738f4a05c73 lam-mpi-7.1.ebuild 1619
-RMD160 f3e62e4f0bf56cdb8962d8b00a518b03738601fc lam-mpi-7.1.ebuild 1619
-SHA256 8fb56c19d15f4cb2b477d8062a38eba0f3548deda7bfc321b85c70e7c4246c4c lam-mpi-7.1.ebuild 1619
-MISC ChangeLog 8860 RMD160 92db2d656276f4ac3f8006c7c042b44470ccd7c6 SHA1 cdb7b5e6b2b6c39648c9dbc4bea68366c9f9bba2 SHA256 4805c09f7f4256974ed23847d0a5a1a8a2e94d92c0d109bc7bdecd9741bfdb5e
-MD5 853302ad9b75e78f4d311af49466d67e ChangeLog 8860
-RMD160 92db2d656276f4ac3f8006c7c042b44470ccd7c6 ChangeLog 8860
-SHA256 4805c09f7f4256974ed23847d0a5a1a8a2e94d92c0d109bc7bdecd9741bfdb5e ChangeLog 8860
+MISC ChangeLog 9048 RMD160 fdf15209547e906c9131871ddbcc2b75e200accf SHA1 9f4022f54c3d8b7777453cdde380cc17e8a2b2dc SHA256 a427a30fa3b73f50d1e9986b70d3bc672e3f27ac2bd673f4125bfd295f329f8b
+MD5 27c92f965e5c0e699081f952bca55f8c ChangeLog 9048
+RMD160 fdf15209547e906c9131871ddbcc2b75e200accf ChangeLog 9048
+SHA256 a427a30fa3b73f50d1e9986b70d3bc672e3f27ac2bd673f4125bfd295f329f8b ChangeLog 9048
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
@@ -50,18 +32,9 @@ SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9 metadata
 MD5 1d7b0bf28395a80f386bf8ea489c69b8 files/digest-lam-mpi-7.0.4 63
 RMD160 07359ec926109837e85890f7c2fb866594b69101 files/digest-lam-mpi-7.0.4 63
 SHA256 bc84a62e544f8e461fcd54d22e9a81323b1db44a162aca9d7c3239523e48018f files/digest-lam-mpi-7.0.4 63
-MD5 1d7b0bf28395a80f386bf8ea489c69b8 files/digest-lam-mpi-7.0.4-r1 63
-RMD160 07359ec926109837e85890f7c2fb866594b69101 files/digest-lam-mpi-7.0.4-r1 63
-SHA256 bc84a62e544f8e461fcd54d22e9a81323b1db44a162aca9d7c3239523e48018f files/digest-lam-mpi-7.0.4-r1 63
 MD5 38b6624ba4098ca823b9d317705ca44c files/digest-lam-mpi-7.0.6 63
 RMD160 6631c26ed618db4a9222bea1eebd265f5b1cdbe9 files/digest-lam-mpi-7.0.6 63
 SHA256 d1ca3dc9eaa8d3c5ea28e7ac009c86bdf2755e7ec8b78dc4e8afde0d775de1c9 files/digest-lam-mpi-7.0.6 63
-MD5 8f2271274cdef6f58358e701c71663c9 files/digest-lam-mpi-7.1 61
-RMD160 66bdd8fce4fa9740255bc2d531bf109f94729438 files/digest-lam-mpi-7.1 61
-SHA256 b3e525e4c74d29bdbd34be1dcb101f4a274fe86ac6c39fb9340885d48262000d files/digest-lam-mpi-7.1 61
-MD5 3af34eb73976278d39527a330bb6c7b2 files/digest-lam-mpi-7.1.1-r3 63
-RMD160 67cd44f10bfee31d565a93435dff883106b1da47 files/digest-lam-mpi-7.1.1-r3 63
-SHA256 d890a257cc540974b9771751441c7a4ad47e97b1cde372d32942df93574f988b files/digest-lam-mpi-7.1.1-r3 63
 MD5 d2c584f5e3975408b5df5e0542c2355f files/digest-lam-mpi-7.1.2 235
 RMD160 8ba785d7e61a72255cfa30ba6a1cc3c955bf086a files/digest-lam-mpi-7.1.2 235
 SHA256 42894773c99913d5218fceb907477926481a1df9b315ba63da82340461a111c7 files/digest-lam-mpi-7.1.2 235
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.4-r1 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.4-r1
deleted file mode 100644
index f3bbd3f035b4..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf0bc94ee149ea84b3bc700a383808e1 lam-7.0.4.tar.bz2 5695492
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1
deleted file mode 100644
index 522a21adbf5b..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6465152e043ffedd2bed146142659be8 lam-7.1.tar.bz2 7542937
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r3 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r3
deleted file mode 100644
index 280f97bd3d73..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a3eee53281884a063ce2c44793672b3 lam-7.1.1.tar.bz2 7589413
diff --git a/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch b/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch
deleted file mode 100644
index 7199f2c3c6f3..000000000000
--- a/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-diff -ur lam-7.1.1.orig/romio/Makefile.in lam-7.1.1/romio/Makefile.in
---- lam-7.1.1.orig/romio/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/Makefile.in	2005-08-15 03:34:38.000000000 +0200
-@@ -111,11 +111,12 @@
-             echo " " ;\
-             echo compiling ROMIO in directory $$dir ;\
- 	    sleep 1;\
--            (cd $$dir && $(MAKE) ;) ;\
-+            (cd $$dir && $(MAKE) all ;) ;\
-             if [ $$? != 0 ] ; then \
-                 echo "Make failed in directory $$dir" ; exit 1 ;\
-             fi ;\
-          done
-+	$(MAKE) -f mpi-io/Makefile shared
- 
- profile: 
- 	@if [ "@HAVE_WEAK_SYMBOLS@" = 0 ] ; then \
-diff -ur lam-7.1.1.orig/romio/adio/ad_hfs/Makefile.in lam-7.1.1/romio/adio/ad_hfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_hfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_hfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,10 +16,14 @@
-       ad_hfs_resize.o ad_hfs_seek.o \
-       ad_hfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_HFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_nfs/Makefile.in lam-7.1.1/romio/adio/ad_nfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_nfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_nfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,10 +16,14 @@
-       ad_nfs_resize.o \
-       ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	@mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_NFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_pfs/Makefile.in lam-7.1.1/romio/adio/ad_pfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_pfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_pfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include
-@@ -14,11 +16,14 @@
-       ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \
-       ad_pfs.o
- 
-+dir:
-+	@mkdir -p $(SODIR)
- 
--default: $(LIBNAME)
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_PFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_piofs/Makefile.in lam-7.1.1/romio/adio/ad_piofs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_piofs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_piofs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,11 +16,14 @@
-       ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \
-       ad_piofs.o
- 
-+dir:
-+	@mkdir -p $(SODIR)
- 
--default: $(LIBNAME)
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_PIOFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_pvfs/Makefile.in lam-7.1.1/romio/adio/ad_pvfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_pvfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_pvfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,10 +16,14 @@
-       ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \
-       ad_pvfs_delete.o ad_pvfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	@mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_PVFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_sfs/Makefile.in lam-7.1.1/romio/adio/ad_sfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_sfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_sfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,10 +16,14 @@
-       ad_sfs_flush.o ad_sfs_resize.o \
-       ad_sfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	@mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_SFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_testfs/Makefile.in lam-7.1.1/romio/adio/ad_testfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_testfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_testfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -15,10 +17,14 @@
- 	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \
- 	ad_testfs_delete.o ad_testfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	@mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_TESTFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_ufs/Makefile.in lam-7.1.1/romio/adio/ad_ufs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_ufs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_ufs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,11 +16,14 @@
-       ad_ufs_resize.o \
-       ad_ufs.o
- 
-+dir:
-+	@mkdir -p $(SODIR)
- 
--default: $(LIBNAME)
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_UFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/ad_xfs/Makefile.in lam-7.1.1/romio/adio/ad_xfs/Makefile.in
---- lam-7.1.1.orig/romio/adio/ad_xfs/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/ad_xfs/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- srcdir      = @srcdir@
- 
- INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-@@ -14,10 +16,14 @@
-       ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \
-       ad_xfs.o
- 
--default: $(LIBNAME)
-+dir:
-+	mkdir -p $(SODIR)
-+
-+all: dir $(LIBNAME)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- $(LIBNAME): $(AD_XFS_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/adio/common/Makefile.in lam-7.1.1/romio/adio/common/Makefile.in
---- lam-7.1.1.orig/romio/adio/common/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/adio/common/Makefile.in	2005-08-15 04:07:28.000000000 +0200
-@@ -1,6 +1,8 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
- MPI         = @MPI@
- srcdir      = @srcdir@
- 
-@@ -19,8 +21,12 @@
- 
- all: $(LIBNAME)
- 
-+dir:
-+	@mkdir -p $(SODIR)
-+
- .c.o:
- 	$(CC) $(CFLAGS) $(INC) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
--$(LIBNAME): $(AD_OBJECTS)
-+$(LIBNAME): dir $(AD_OBJECTS)
- 	$(AR) $(LIBNAME) $(AD_OBJECTS)
-diff -ur lam-7.1.1.orig/romio/mpi-io/Makefile.in lam-7.1.1/romio/mpi-io/Makefile.in
---- lam-7.1.1.orig/romio/mpi-io/Makefile.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/mpi-io/Makefile.in	2005-08-15 03:34:25.000000000 +0200
-@@ -1,6 +1,10 @@
- CC          = @CC@
- AR          = @AR@
- LIBNAME     = @LIBNAME@
-+PICFLAGS    = -fPIC -DPIC
-+SOFLAGS     = -shared
-+SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
-+SONAME      = $(basename $(LIBNAME)).so
- RANLIB      = @RANLIB@
- srcdir      = @srcdir@
- 
-@@ -55,10 +59,14 @@
- 
- all: $(LIBNAME)
- 
-+dir:
-+	mkdir -p $(SODIR)
-+
- .SUFFIXES: $(SUFFIXES) .p
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
- 
- .c.p:
- 	@cp $(srcdir)/$*.c _$*.c
-@@ -69,8 +77,11 @@
- 	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
- 	@rm -f _*.o
- 
--$(LIBNAME): $(MPIO_OBJECTS)
-+$(LIBNAME): dir $(MPIO_OBJECTS)
- 	$(AR) $(LIBNAME) $(MPIO_OBJECTS)
-+	
-+shared:
-+	$(CC) $(SOFLAGS) -o $(SONAME) $(SODIR)/* 
- 
- clean:
- 	@rm -f *.o
-diff -ur lam-7.1.1.orig/romio/util/romioinstall.in lam-7.1.1/romio/util/romioinstall.in
---- lam-7.1.1.orig/romio/util/romioinstall.in	2005-08-15 02:51:08.000000000 +0200
-+++ lam-7.1.1/romio/util/romioinstall.in	2005-08-15 03:34:25.000000000 +0200
-@@ -128,6 +128,7 @@
- # Library files
- dir="$libdir"
- append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.a:$dir/liblammpio.a"
-+append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.so:$dir/liblammpio.so"
- 
- # Man pages
- dir="$mandir/man3"
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.0.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.0.4-r1.ebuild
deleted file mode 100644
index 15f168f8d5d8..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.0.4-r1.ebuild,v 1.5 2005/03/08 17:43:24 vapier Exp $
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-
-DEPEND="virtual/libc"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/mpich"
-
-SLOT="6"
-KEYWORDS="~x86 ppc"
-IUSE="crypt fortran"
-LICENSE="as-is"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/romio/util/
-	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
-}
-
-src_compile() {
-	local myconf
-
-	if use crypt; then
-		myconf="--with-rsh=ssh"
-	else
-		myconf="--with-rsh=rsh"
-	fi
-
-	if use fortran; then
-	myconf="${myconf} --with-fc"
-	else
-	myconf="${myconf} --without-fc"
-	fi
-
-	econf \
-		--sysconfdir=/etc/lam-mpi \
-		--enable-shared \
-		--enable-long-long \
-		--enable-threads=posix \
-		--enable-languages=c,c++,f77 \
-		--disable-checking  \
-		--enable-cstdio=stdio \
-		--with-system-zlib \
-		${myconf} || die
-
-	# sometimes emake doesn't finish since it gets ahead of itself :)
-
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR="${D}" install || die
-
-	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
-	rm mpi++.h
-	ln -sf mpi2c++/mpi++.h mpi++.h
-
-	# There are a bunch more tex docs we could make and install too,
-	# but they might be replicated in the pdf.
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
-	dodoc {user,install}.pdf
-}
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
deleted file mode 100644
index 1f8ebecf7c1b..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild,v 1.3 2006/09/25 08:25:59 dberkholz Exp $
-
-inherit fortran flag-o-matic multilib portability
-
-# LAM is a PITA with PBS. If it's detected, there is NO way to turn it off!
-# Likewise for the other SSI boot modules (globus/slurm/tm are affected)
-IUSE="crypt pbs fortran"
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-PROVIDE="virtual/mpi"
-DEPEND="virtual/libc
-		pbs? ( virtual/pbs )
-		!virtual/mpi"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="as-is"
-
-src_unpack() {
-	unpack ${A}
-
-	# Fixes BUG #88110.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/08/15
-	epatch ${FILESDIR}/${P}-shared-romio.patch
-	cd ${S}/romio/util/
-	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
-
-	for i in ${S}/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
-	  sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'/usr/share/doc/${PF}'@' ${i}
-	done
-}
-
-pkg_setup() {
-	: # make sure fortran_pkg_setup does NOT run
-}
-
-src_compile() {
-
-	local myconf
-
-	if use crypt; then
-		myconf="${myconf} --with-rsh=ssh"
-	else
-		myconf="${myconf} --with-rsh=rsh"
-	fi
-
-	use pbs && append-ldflags -L/usr/$(get_libdir)/pbs/lib
-
-	if use fortran; then
-		fortran_pkg_setup
-		# this is NOT in pkg_setup as it is NOT needed for RDEPEND right away it
-		# can be installed after merging from binary, and still have things fine
-		myconf="${myconf} --with-fc=${FORTRANC}"
-	else
-		myconf="${myconf} --without-fc"
-	fi
-
-	econf \
-		--sysconfdir=/etc/lam-mpi \
-		--enable-shared \
-		--with-threads=posix \
-		${myconf} || die
-
-	# sometimes parallel doesn't finish since it gets ahead of itself :)
-
-	emake -j1 || die
-}
-
-src_install () {
-
-	make DESTDIR="${D}" install || die
-
-	# There are a bunch more tex docs we could make and install too,
-	# but they might be replicated in the pdf.
-	# They are replicated in the pdfs! Thus remove this comment?
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
-	dodoc {user,install}.pdf
-
-	# install examples
-	cd ${S}/examples
-	mkdir -p ${D}/usr/share/${P}/examples
-	find -name README -or -iregex '.*\.[chf][c]?$' >${T}/testlist
-	while read p; do
-		treecopy $p ${D}/usr/share/${P}/examples ;
-	done < ${T}/testlist
-}
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.ebuild
deleted file mode 100644
index f80b87102fd6..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.ebuild,v 1.3 2005/02/07 12:01:47 eradicator Exp $
-
-IUSE="crypt"
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="the LAM MPI parallel computing environment"
-SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.lam-mpi.org"
-
-DEPEND="virtual/libc"
-# we need ssh if we want to use it instead of rsh
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/mpich"
-
-SLOT="6"
-KEYWORDS="~amd64 ~x86 ~sparc"
-LICENSE="as-is"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/romio/util/
-	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
-}
-
-src_compile() {
-
-	local myconf
-
-	if use crypt; then
-		myconf="--with-rsh=ssh"
-	else
-		myconf="--with-rsh=rsh"
-	fi
-
-	econf \
-		--sysconfdir=/etc/lam-mpi \
-		--enable-shared \
-		--enable-long-long \
-		--enable-threads=posix \
-		--enable-languages=c,c++,f77 \
-		--disable-checking  \
-		--enable-cstdio=stdio \
-		--with-system-zlib \
-		--without-fc \
-		${myconf} || die
-
-	# sometimes emake doesn't finish since it gets ahead of itself :)
-
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR="${D}" install || die
-
-	#need to correct the produced absolute symlink
-	cd ${D}/usr/include
-	rm mpi++.h
-	ln -sf mpi2c++/mpi++.h mpi++.h
-
-	# There are a bunch more tex docs we could make and install too,
-	# but they might be replicated in the pdf.
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
-	dodoc {user,install}.pdf
-}
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 870a39038a14..07993bf2f679 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,7 +1,3 @@
-AUX 1.2.6-fix-romio-sandbox-breakage.patch 690 RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 SHA1 ab0f6a2348b299c704feb9957cc1ad267efbe54e SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112
-MD5 e878381a3b6165630ef1a8b3989076c8 files/1.2.6-fix-romio-sandbox-breakage.patch 690
-RMD160 72f4b6bdf21493c31d2ec1c56c914e848f483760 files/1.2.6-fix-romio-sandbox-breakage.patch 690
-SHA256 a9f3e790f365a8e2d02d1cf7a0e5a4bc662abf5c1780d6b5ad93d57a48a78112 files/1.2.6-fix-romio-sandbox-breakage.patch 690
 AUX 1.2.7_p1-allow-fhs-afs.patch 1180 RMD160 b11d1acb71c6b419155396e17791824ffea69123 SHA1 dfb74d9b5c697e714874aef131d0ff4e06e175f2 SHA256 fac4371a555b3b1c94ae5f7196fcc13294772abd8456c1c146a01e65df982d9c
 MD5 875f85e42a88271f2cb95be9589637cf files/1.2.7_p1-allow-fhs-afs.patch 1180
 RMD160 b11d1acb71c6b419155396e17791824ffea69123 files/1.2.7_p1-allow-fhs-afs.patch 1180
@@ -10,35 +6,19 @@ AUX 1.2.7_p1-fix-romio-sandbox-breakage.patch 698 RMD160 1340bb61b3778f2309b49de
 MD5 e2c40d21fee1af27db5ad0f7b6d158d5 files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
 RMD160 1340bb61b3778f2309b49de85c2814fcd67a639e files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
 SHA256 6ac74ea6bd141657fde78c93be79618d9c34f84e55b068a98f348ee52e308927 files/1.2.7_p1-fix-romio-sandbox-breakage.patch 698
-DIST mpich-1.2.5.2.tar.gz 12383519
-DIST mpich-1.2.6.tar.gz 15248688
 DIST mpich-1.2.7p1.tar.gz 15978525 RMD160 1f42f10c0942f3a20fc2a3853ce825ba0885bb87 SHA1 7668b71c604f00aadc2db7d10f8fc031b3def9e1 SHA256 6deb6b3b0815d4874a39878f136cbcddbdb57fd57ff7ef3df6e3414a397f6171
-EBUILD mpich-1.2.5.2.ebuild 3157 RMD160 10f832590c5f61180703594594cddef2ef49ae2d SHA1 ac6272d3a87f82f81599ee037e6661e298c13009 SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b
-MD5 90131acb83e5b6194dd12b6ee456c2e5 mpich-1.2.5.2.ebuild 3157
-RMD160 10f832590c5f61180703594594cddef2ef49ae2d mpich-1.2.5.2.ebuild 3157
-SHA256 41e6e573bb9fa8479b49b903356238a34ae2721887343cb28ef94f0b98cdf42b mpich-1.2.5.2.ebuild 3157
-EBUILD mpich-1.2.6-r4.ebuild 4047 RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 SHA1 a675df0ed9af37f5011159703ea2d68fed82a93c SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda
-MD5 b5ee11c1c54dc5f309210def20249348 mpich-1.2.6-r4.ebuild 4047
-RMD160 34352149a4d218ecd48df8adb63ed00d32fb6654 mpich-1.2.6-r4.ebuild 4047
-SHA256 768d73e2fc849238c5c843febb493237e791c1fdc251f6042a6ffa4b18ab0cda mpich-1.2.6-r4.ebuild 4047
 EBUILD mpich-1.2.7_p1.ebuild 4137 RMD160 48908b9be6745520abacb56912c7b8bb04f72ddd SHA1 69253d7502868e60e0b79b71a83c1721f8321574 SHA256 521b7ac2e307ce82a068e7c5eadfe6844a44b0e4b2be9e61f6fd90d8f1c4f171
 MD5 23c4084d05d72bf423779f8d0f6ec9ac mpich-1.2.7_p1.ebuild 4137
 RMD160 48908b9be6745520abacb56912c7b8bb04f72ddd mpich-1.2.7_p1.ebuild 4137
 SHA256 521b7ac2e307ce82a068e7c5eadfe6844a44b0e4b2be9e61f6fd90d8f1c4f171 mpich-1.2.7_p1.ebuild 4137
-MISC ChangeLog 4772 RMD160 78c1b53be81670c2da47480c48228285f91f4a0a SHA1 6b9ac5c8ceadb456f72a23060c0f3ad494fd8606 SHA256 f7e37ced02515fc0dcab5bf205c5f9712f7ec72bbe8946f533dc9a1db39a4b76
-MD5 21a7194908da12a43960166dd2002cf0 ChangeLog 4772
-RMD160 78c1b53be81670c2da47480c48228285f91f4a0a ChangeLog 4772
-SHA256 f7e37ced02515fc0dcab5bf205c5f9712f7ec72bbe8946f533dc9a1db39a4b76 ChangeLog 4772
+MISC ChangeLog 4938 RMD160 e28d835952aedcd99a3e4d19024ff944e9933d8e SHA1 9fa0529efb516f7d64006b45535797caacee8745 SHA256 ee6aae296f93982e35de4875ab86aa27794762e7dfcbd9e7b2573abf8aafca0d
+MD5 56c5f230e33991133c24d8057bac03fb ChangeLog 4938
+RMD160 e28d835952aedcd99a3e4d19024ff944e9933d8e ChangeLog 4938
+SHA256 ee6aae296f93982e35de4875ab86aa27794762e7dfcbd9e7b2573abf8aafca0d ChangeLog 4938
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52 metadata.xml 312
-MD5 11a56e15994b5f4fe1ae37ebde20fa50 files/digest-mpich-1.2.5.2 67
-RMD160 4098f55bbed4fe2fb9c1be9b1670bbc9d6a60826 files/digest-mpich-1.2.5.2 67
-SHA256 a7ab882f80249294519f111e9472601f58efca7fa48b7ef5c56743268d257a43 files/digest-mpich-1.2.5.2 67
-MD5 049b041ef984698a3827b0f24e11669e files/digest-mpich-1.2.6-r4 65
-RMD160 762aed64c637f0e4f1363b29660a2122fb39b9bb files/digest-mpich-1.2.6-r4 65
-SHA256 376d47428bc061bb609189d1a6cc70415b7f1ab7cd3030c8be54b93ec932c076 files/digest-mpich-1.2.6-r4 65
 MD5 c1a3f274191f11f137d9094737034c8e files/digest-mpich-1.2.7_p1 247
 RMD160 0ddbea56a013988ebfeb46fa09c8b42fd865a320 files/digest-mpich-1.2.7_p1 247
 SHA256 4618da3a5753df970e71955795330bd787e71f198c86e404c80e70a5ab7190b2 files/digest-mpich-1.2.7_p1 247
diff --git a/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch b/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
deleted file mode 100644
index 0b46f0feb4cb..000000000000
--- a/sys-cluster/mpich/files/1.2.6-fix-romio-sandbox-breakage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mpich-1.2.6.orig/romio/configure.in mpich-1.2.6/romio/configure.in
---- mpich-1.2.6.orig/romio/configure.in	2004-08-02 06:37:31.000000000 -0700
-+++ mpich-1.2.6/romio/configure.in	2005-02-20 23:35:18.163959288 -0800
-@@ -1621,7 +1621,7 @@
- # 
- # Make sure we remove any configuration file incase there is out-of-date data.
- # We remove the version in include in case this is a vpath build
--rm -f adio/include/romioconf.h ${use_top_srcdir}/src/mpi/romio/adio/include/romioconf.h ${use_top_srcdir}/adio/include/romioconf.h
-+rm -f adio/include/romioconf.h
- #
- # Create makefiles for all of the adio devices.  Only the ones that 
- # are active will be called by the top level ROMIO make
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.5.2 b/sys-cluster/mpich/files/digest-mpich-1.2.5.2
deleted file mode 100644
index 9a7caffa87bf..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a7524c220eeb3f080069308bab9f487 mpich-1.2.5.2.tar.gz 12383519
diff --git a/sys-cluster/mpich/files/digest-mpich-1.2.6-r4 b/sys-cluster/mpich/files/digest-mpich-1.2.6-r4
deleted file mode 100644
index 537b23d89d79..000000000000
--- a/sys-cluster/mpich/files/digest-mpich-1.2.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbf6ea0b5717bbf88851e5bd36aed644 mpich-1.2.6.tar.gz 15248688
diff --git a/sys-cluster/mpich/mpich-1.2.5.2.ebuild b/sys-cluster/mpich/mpich-1.2.5.2.ebuild
deleted file mode 100644
index 7c5d9de46fb8..000000000000
--- a/sys-cluster/mpich/mpich-1.2.5.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.5.2.ebuild,v 1.12 2006/09/25 03:33:44 dberkholz Exp $
-
-# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
-# mpich listens on or any other custom options (#38207).
-# The default USR1 conflicts with pthreads. Options include SIGUSR2 and SIGBUS.
-# For example: MPICH_CONFIGURE_OPTS="--with-device=ch_p4:-listener_sig=SIGBUS"
-
-DESCRIPTION="MPICH - A portable MPI implementation"
-HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich1"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="doc crypt"
-
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!sys-cluster/lam-mpi"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
-}
-
-src_compile() {
-	local RSHCOMMAND
-
-	if use crypt; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-
-	export RSHCOMMAND
-
-	local myconf="${myconf} ${MPICH_CONFIGURE_OPTS}"
-
-	./configure \
-		${myconf} \
-		--mandir=/usr/share/man \
-		--prefix=/usr || die
-	make || die
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	# mpich install process is really weird, need to do some hand work perhaps
-
-	# to skip installation of man pages, uncomment following line
-	# export MPIINSTALL_OPTS=-noman
-
-	./bin/mpiinstall -echo -prefix=${D}/usr || die
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
-	fi
-	rm -rf ${D}/usr/doc/
-
-	dodir /etc/mpich
-	mv ${D}/usr/etc/* ${D}/etc/mpich/
-	rmdir ${D}/usr/etc/
-
-	dodir /usr/share/${PN}
-	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
-	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
-
-	# rm -rf ${D}/usr/local
-	rm -f ${D}/usr/man/mandesc
-
-	mv ${D}/usr/share/{machines*,jumpshot-3,Makefile.sample,upshot} ${D}/usr/share/${PN}
-
-	dodoc COPYRIGHT README
-	use doc && \
-		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
-			rm -rf ${D}/usr/www
-
-	# Dont let users deinstall without portage
-	rm ${D}/usr/sbin/mpiuninstall
-
-	# We dont have a real DESTDIR, so we have to fix all the files
-	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
-	dosed /usr/sbin/chkserv /usr/sbin/chp4_servs
-	dosed /usr/bin/mpicc /usr/bin/mpiCC /usr/bin/logviewer
-	dosed /usr/bin/mpireconfig /usr/bin/mpireconfig.dat
-	dosed /usr/bin/mpereconfig /usr/bin/mpereconfig.dat
-
-	dosed /usr/share/mpich/examples1/Makefile
-	dosed /usr/share/mpich/examples2/Makefile
-	dosed /usr/share/mpich/jumpshot-3/bin/jumpshot
-	dosed /usr/share/mpich/jumpshot-3/bin/slog_print
-	dosed /usr/share/mpich/Makefile.sample
-	dosed /usr/share/mpich/upshot/bin/upshot
-
-	# those are dangling symlinks
-	rm -f \
-		${D}/usr/share/mpich/examples1/mpirun \
-		${D}/usr/share/mpich/examples2/mpirun
-
-	mv ${D}/usr/man ${D}/usr/share/man
-
-	#FIXME: Here, we should either clean the empty directories
-	# or use keepdir to make sure they stick around.
-}
diff --git a/sys-cluster/mpich/mpich-1.2.6-r4.ebuild b/sys-cluster/mpich/mpich-1.2.6-r4.ebuild
deleted file mode 100644
index 637d2c2ee585..000000000000
--- a/sys-cluster/mpich/mpich-1.2.6-r4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-1.2.6-r4.ebuild,v 1.3 2006/09/25 03:33:44 dberkholz Exp $
-
-inherit eutils
-
-# Set the MPICH_CONFIGURE_OPTS environment variable to change the signal
-# mpich listens on or any other custom options (#38207).
-# The default USR1 conflicts with pthreads. Options include SIGUSR2 and SIGBUS.
-# For example: MPICH_CONFIGURE_OPTS="--with-device=ch_p4:-listener_sig=SIGBUS"
-
-DESCRIPTION="MPICH - A portable MPI implementation"
-HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich1"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64"
-IUSE="doc crypt"
-
-PROVIDE="virtual/mpi"
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool"
-RDEPEND="${DEPEND}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!virtual/mpi
-	|| ( x11-libs/libX11
-		virtual/x11 )"
-
-pkg_setup() {
-	if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then
-		einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -FrlZ '$(P) ' . | xargs -0 sed -i -e 's/\$(P)//'
-
-	# Fix broken romio
-	epatch ${FILESDIR}/${PV}-fix-romio-sandbox-breakage.patch
-	cd ${S}/romio
-	rm configure
-	autoreconf --install --verbose
-}
-
-src_compile() {
-	local RSHCOMMAND
-
-	if use crypt; then
-		RSHCOMMAND="ssh -x"
-	else
-		RSHCOMMAND="rsh"
-	fi
-
-	export RSHCOMMAND
-
-	local myconf="${myconf} ${MPICH_CONFIGURE_OPTS}"
-
-	./configure \
-		${myconf} \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--datadir=/usr/share/mpich || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/sbin
-
-	# mpich install process is really weird, need to do some hand work perhaps
-
-	# to skip installation of man pages, uncomment following line
-	# export MPIINSTALL_OPTS=-noman
-
-	./bin/mpiinstall -echo -prefix=${D}/usr || die
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		mv ${D}/usr/doc/* ${D}/usr/share/doc/${PF}
-	fi
-	rm -rf ${D}/usr/doc/
-
-	dodir /etc/mpich
-	mv ${D}/usr/etc/* ${D}/etc/mpich/
-	rmdir ${D}/usr/etc/
-
-	dodir /usr/share/${PN}
-	mv ${D}/usr/examples ${D}/usr/share/${PN}/examples1
-	mv ${D}/usr/share/examples ${D}/usr/share/${PN}/examples2
-
-	# rm -rf ${D}/usr/local
-	rm -f ${D}/usr/man/mandesc
-
-	mv ${D}/usr/share/{machines*,jumpshot-3,Makefile.sample,upshot} ${D}/usr/share/${PN}
-
-	dodoc COPYRIGHT README
-	use doc && \
-		mv ${D}/usr/www ${D}/usr/share/doc/${PF}/html || \
-			rm -rf ${D}/usr/www
-
-	# Dont let users deinstall without portage
-	rm ${D}/usr/sbin/mpiuninstall
-
-	# We dont have a real DESTDIR, so we have to fix all the files
-	dosed /usr/bin/mpirun /usr/bin/mpiman /usr/sbin/tstmachines
-	dosed /usr/sbin/chkserv /usr/sbin/chp4_servs
-	dosed /usr/bin/clog2TOslog2 /usr/bin/clog2print
-	dosed /usr/bin/clogTOslog2 /usr/bin/clogprint
-	dosed /usr/bin/jumpshot /usr/bin/logconvertor
-	dosed /usr/bin/mpicc /usr/bin/mpiCC /usr/bin/logviewer
-	dosed /usr/bin/mpicxx
-	dosed /usr/bin/mpireconfig /usr/bin/mpireconfig.dat
-	dosed /usr/bin/mpereconfig /usr/bin/mpereconfig.dat
-	dosed /usr/bin/rlogTOslog2 /usr/bin/rlogprint
-	dosed /usr/bin/slog2navigator /usr/bin/slog2print
-
-	dosed /usr/share/mpich/examples1/Makefile
-	dosed /usr/share/mpich/examples2/Makefile
-	dosed /usr/share/mpich/jumpshot-3/bin/jumpshot
-	dosed /usr/share/mpich/jumpshot-3/bin/slog_print
-	dosed /usr/share/mpich/Makefile.sample
-	dosed /usr/share/mpich/upshot/bin/upshot
-
-	# Fix datadir; mpich's build system screws it up even though we pass it
-	grep -rl 'datadir=.*' ${D} \
-		| xargs sed -i -e "s:datadir=.*:datadir=/usr/share/mpich:g"
-
-	# those are dangling symlinks
-	rm -f \
-		${D}/usr/share/mpich/examples1/mpirun \
-		${D}/usr/share/mpich/examples2/mpirun
-
-	mv ${D}/usr/man ${D}/usr/share/man
-
-	#FIXME: Here, we should either clean the empty directories
-	# or use keepdir to make sure they stick around.
-}
-
-pkg_postinst() {
-	einfo "The data directory has moved from /usr/share"
-	einfo "to /usr/share/mpich."
-	einfo "Remeber to move your machines.* files."
-}