--- /usr/portage/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild	2008-05-02
+++ lam-mpi-7.1.4.ebuild	2008-08-05
@@ -13,6 +13,7 @@
 SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.lam-mpi.org"
 DEPEND="pbs? ( sys-cluster/torque )
+	sys-devel/libtool
 	!sys-cluster/mpich
 	!sys-cluster/openmpi
 	!sys-cluster/mpich2"
@@ -39,6 +40,7 @@
 	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
 	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
 	epatch "${FILESDIR}"/7.1.4-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-7.1.4-libtool-compatibility.patch
 
 	# gcc-4.3.0 fix.  char *argv[] -> char **argv.
 	# replaces a few more than necessary, but should be harmless.
@@ -47,6 +49,11 @@
 		sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
 	done
 
+        ebegin "Remove provided libtool/libltdl"
+        rm -R ./share/libltdl \
+        || die "removing libtool failed"
+        eend 0
+
 	# eautoreconf doesn't work correctly as lam-mpi uses their own
 	# LAM_CONFIG_SUBDIR instead of AC_CONFIG_SUBDIRS.  Even better, they use
 	# variables inside of the definitions, so --trace doesn't work.