--- musepack-tools-1.15v.ebuild.orig	2005-09-02 21:08:13.000000000 +0200
+++ musepack-tools-1.15v.ebuild	2005-09-02 21:32:29.000000000 +0200
@@ -27,16 +27,14 @@
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-Makefile.patch
 	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
 
 	if ! use esd ; then
 		sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
-		sed -i -e 's:esd-config:true:' Makefile
 	else
-		sed -i -e 's/#LDADD   += -lesd/LDADD   += -lesd/' Makefile
+		sed -i -e 's/^LDADD    = -lm$/LDADD    = $(shell esd-config --libs)/' Makefile
 	fi
 
 	if ! use x86 ; then
@@ -50,7 +48,7 @@
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
 	use static && export BLD_STATIC=1
-	ARCH= emake LDADD=-lm mppenc mppdec replaygain || die
+	ARCH= emake mppenc mppdec replaygain || die
 }
 
 src_install() {