Fixed BUG #88110 (finally). Removed obsolete versions of 7.1.1.

(Portage version: 2.0.51.22-r2)

9 files changed, 332 insertions, 169 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 4ecc6ca47fc3..c218daf1bee6 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/lam-mpi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.40 2005/08/03 14:30:08 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.41 2005/08/15 03:30:47 kugelfang Exp $
+
+*lam-mpi-7.1.1-r3 (15 Aug 2005)
+
+  15 Aug 2005; Danny van Dyk <kugelfang@gentoo.org>
+  files/lam-mpi-7.1.1-shared-romio.patch, -lam-mpi-7.1.1.ebuild,
+  -lam-mpi-7.1.1-r1.ebuild, -lam-mpi-7.1.1-r2.ebuild,
+  +lam-mpi-7.1.1-r3.ebuild:
+  Fixed BUG #88110 (finally). Removed obsolete versions of 7.1.1.
 
   03 Aug 2005; Ferris McCormick <fmccor@gentoo.org> lam-mpi-7.1.1-r2.ebuild:
   Add ~sparc keyword.  Builds without incident (with ssh interface)
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index e773bdfc8b4d..f1a4a4aec183 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -1,17 +1,13 @@
-MD5 41d424eee28f1515720100d976011546 ChangeLog 7474
-MD5 74a4f93a4a855ce5f78a87832ddfaa0f lam-mpi-7.0.4-r1.ebuild 1695
-MD5 09cdcdb1957de0316945e360f642c9f2 lam-mpi-7.0.4.ebuild 1442
-MD5 861dcc1aa59b0e097079f547c7fe6b88 lam-mpi-7.0.6.ebuild 1616
-MD5 3153a7853eaf73aa32f5fc141111ba3a lam-mpi-7.1.1.ebuild 1455
+MD5 3c20956a218ff621c72927a1f52c1f23 ChangeLog 7773
 MD5 ae841b28d60b0120213eb738f4a05c73 lam-mpi-7.1.ebuild 1619
+MD5 09cdcdb1957de0316945e360f642c9f2 lam-mpi-7.0.4.ebuild 1442
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
-MD5 2fd75cb9d36d397b7b3bcfa6a5c07a0a lam-mpi-7.1.1-r1.ebuild 1662
-MD5 70c795cdfc4265322058800bd11e143e lam-mpi-7.1.1-r2.ebuild 2713
+MD5 74a4f93a4a855ce5f78a87832ddfaa0f lam-mpi-7.0.4-r1.ebuild 1695
+MD5 861dcc1aa59b0e097079f547c7fe6b88 lam-mpi-7.0.6.ebuild 1616
+MD5 bd8f5d35750f8ee831842e69ffef03a0 lam-mpi-7.1.1-r3.ebuild 2583
+MD5 8f2271274cdef6f58358e701c71663c9 files/digest-lam-mpi-7.1 61
+MD5 bcac54d719834a00296b9fdf7026d117 files/lam-mpi-7.1.1-shared-romio.patch 10522
 MD5 1d7b0bf28395a80f386bf8ea489c69b8 files/digest-lam-mpi-7.0.4 63
 MD5 1d7b0bf28395a80f386bf8ea489c69b8 files/digest-lam-mpi-7.0.4-r1 63
 MD5 38b6624ba4098ca823b9d317705ca44c files/digest-lam-mpi-7.0.6 63
-MD5 8f2271274cdef6f58358e701c71663c9 files/digest-lam-mpi-7.1 61
-MD5 3af34eb73976278d39527a330bb6c7b2 files/digest-lam-mpi-7.1.1 63
-MD5 14d6b11ac532da9b84fb41053033edd2 files/lam-mpi-7.1.1-shared-romio.patch 1427
-MD5 3af34eb73976278d39527a330bb6c7b2 files/digest-lam-mpi-7.1.1-r1 63
-MD5 3af34eb73976278d39527a330bb6c7b2 files/digest-lam-mpi-7.1.1-r2 63
+MD5 3af34eb73976278d39527a330bb6c7b2 files/digest-lam-mpi-7.1.1-r3 63
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r1 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r1
deleted file mode 100644
index 280f97bd3d73..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a3eee53281884a063ce2c44793672b3 lam-7.1.1.tar.bz2 7589413
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r2 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r2
deleted file mode 100644
index 280f97bd3d73..000000000000
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a3eee53281884a063ce2c44793672b3 lam-7.1.1.tar.bz2 7589413
diff --git a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1 b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r3
index 280f97bd3d73..280f97bd3d73 100644
--- a/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1
+++ b/sys-cluster/lam-mpi/files/digest-lam-mpi-7.1.1-r3
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
index 4cdeeb093ef8..7199f2c3c6f3 100644
--- 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
@@ -1,46 +1,343 @@
-diff -urN 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	2003-03-25 14:41:35.000000000 -0800
-+++ lam-7.1.1/romio/mpi-io/Makefile.in	2005-05-24 16:12:46.000000000 -0700
-@@ -1,6 +1,9 @@
+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
-+SONAME      = $(basename @LIBNAME@).so
++SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
++SONAME      = $(basename $(LIBNAME)).so
  RANLIB      = @RANLIB@
  srcdir      = @srcdir@
  
-@@ -55,10 +58,14 @@
+@@ -55,10 +59,14 @@
  
  all: $(LIBNAME)
  
 +dir:
-+	mkdir -p shared/
++	mkdir -p $(SODIR)
 +
  .SUFFIXES: $(SUFFIXES) .p
  
  .c.o:
  	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(CFLAGS) $(PICFLAGS) -c -o shared/$@ $<
++	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
  
  .c.p:
  	@cp $(srcdir)/$*.c _$*.c
-@@ -69,8 +76,10 @@
+@@ -69,8 +77,11 @@
  	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
  	@rm -f _*.o
  
 -$(LIBNAME): $(MPIO_OBJECTS)
 +$(LIBNAME): dir $(MPIO_OBJECTS)
  	$(AR) $(LIBNAME) $(MPIO_OBJECTS)
-+	$(CC) $(SOFLAGS) -o $(SONAME) $(addprefix shared/, $(MPIO_OBJECTS))
++	
++shared:
++	$(CC) $(SOFLAGS) -o $(SONAME) $(SODIR)/* 
  
  clean:
  	@rm -f *.o
-+	@rm -f shared/*.o
-diff -urN 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	2003-03-25 14:41:35.000000000 -0800
-+++ lam-7.1.1/romio/util/romioinstall.in	2005-05-24 16:10:30.000000000 -0700
+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"
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r1.ebuild
deleted file mode 100644
index 24175cb7bb5e..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r1.ebuild
+++ /dev/null
@@ -1,69 +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.1-r1.ebuild,v 1.1 2005/07/05 22:21:59 kugelfang Exp $
-
-inherit fortran
-
-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 ppc64 ~ppc"
-LICENSE="as-is"
-
-src_unpack() {
-	unpack ${A}
-
-	# Taken out for the moment. I'll address this as soon as possible.
-	# Seems like romio needs (all?) ADIOI libraries built as shared libs
-	# as well.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/07/06
-	#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
-}
-
-src_compile() {
-
-	local myconf
-
-	if use crypt; then
-		myconf="${myconf} --with-rsh=ssh"
-	else
-		myconf="${myconf} --with-rsh=rsh"
-	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.
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
-	dodoc {user,install}.pdf
-}
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r2.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
index 935d0d302968..45390571eb8e 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r2.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r2.ebuild,v 1.6 2005/08/03 14:30:08 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild,v 1.1 2005/08/15 03:30:47 kugelfang Exp $
 
 inherit fortran flag-o-matic
 
@@ -30,11 +30,9 @@ LICENSE="as-is"
 src_unpack() {
 	unpack ${A}
 
-	# Taken out for the moment. I'll address this as soon as possible.
-	# Seems like romio needs (all?) ADIOI libraries built as shared libs
-	# as well.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/07/06
-	#epatch ${FILESDIR}/${P}-shared-romio.patch
+	# 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
 
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.1.ebuild
deleted file mode 100644
index 6ebf18553f05..000000000000
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.1.ebuild
+++ /dev/null
@@ -1,65 +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.1.ebuild,v 1.6 2005/05/18 12:30:47 corsair Exp $
-
-inherit fortran
-
-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 ppc64 ~ppc"
-LICENSE="as-is"
-
-src_unpack() {
-	unpack ${A}
-
-	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
-}
-
-src_compile() {
-
-	local myconf
-
-	if use crypt; then
-		myconf="${myconf} --with-rsh=ssh"
-	else
-		myconf="${myconf} --with-rsh=rsh"
-	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.
-	dodoc README HISTORY LICENSE VERSION
-	cd ${S}/doc
-	dodoc {user,install}.pdf
-}