--- /usr/portage/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild	2009-09-23 13:35:30.000000000 -0400
+++ mpatrol-1.4.8-r2.ebuild	2010-08-15 01:20:33.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.6 2009/09/23 17:25:21 patrick Exp $
 
@@ -44,18 +44,19 @@
 	sed -i \
 		-e 's:$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS):$(LD) $(LDFLAGS) -liberty -o $@ $(SHARED_MPTOBJS):' Makefile \
 			|| die "sed Makefile for fixing -libiberty failed"
+	
+	epatch "${FILESDIR}"/${PN}-ldflags.diff
 
 	if use X; then
 		sed -i \
 			-e 's:^GUISUP.= false:GUISUP = true:' Makefile \
 			|| die "sed Makefile for GUISUP failed"
 	fi
-
 }
 
 src_compile() {
 	cd ${S}/build/unix
-	STRIPPROG=true OPT_FLAGS="$CFLAGS -Wa,--noexecstack" emake all || die "emake failed"
+	emake STRIPPROG=true OPT_FLAGS="${CFLAGS} -Wa,--noexecstack" LDOPTS="${LDFLAGS}" all || die "emake failed"
 }
 
 # **
@@ -65,9 +66,9 @@
 # **
 src_install () {
 	cd ${S}/build/unix
-	dobin mleak mpatrol mprof mptrace
-	dolib.so lib*.so.*
-	dolib.a  lib*.a
+	dobin mleak mpatrol mprof mptrace || die
+	dolib.so lib*.so.* || die
+	dolib.a  lib*.a || die
 
 	# Each lib needs a symlink from the .so level
 	#for L in lib*.so.*; do
@@ -76,30 +77,30 @@
 
 	insinto /usr
 	cd ${S}/bin
-	dobin *
+	dobin * || die
 
 	insinto /usr/include/
 	cd ${S}/src
-	doins mpatrol.h mpalloc.h mpdebug.h
+	doins mpatrol.h mpalloc.h mpdebug.h || die
 
 	insinto /usr/include/mpatrol
-	doins ${S}/tools/*.h
+	doins ${S}/tools/*.h || die
 
-	doman ${S}/man/man?/*
+	doman ${S}/man/man?/* || die
 
 	cd ${S}
-	dodoc AUTHORS ChangeLog NEWS README THANKS VERSION pkg/lsm/*lsm
+	dodoc AUTHORS ChangeLog NEWS README THANKS VERSION pkg/lsm/*lsm || die
 
 	cd ${S}/doc
-	dodoc *.dvi *.ps *.pdf *.txt
-	doinfo mpatrol.info
-	dohtml mpatrol.html
+	dodoc *.dvi *.ps *.pdf *.txt || die
+	doinfo mpatrol.info || die
+	dohtml mpatrol.html || die
 
 	docinto images
-	dodoc images/*.{eps,pdf}
+	dodoc images/*.{eps,pdf} || die
 
 	insinto /usr/share/doc/${PF}/html/images
-	doins images/*.jpg
+	doins images/*.jpg || die
 }
 
 pkg_postinst() {