Bugzilla Bug 178674

The esd-patch for the makefile is applied even if esd is not  available and
explicitly unselected via useflag. This results in a failing compile with
following error:

[ebuild     U ] media-sound/musepack-tools-1.15v-r1 [1.15v] USE="-16bit -esd
-static" 0 kB 
...
 * Applying musepack-tools-1.15v-Makefile-esd.patch ...
  [ ok ]
...
mppdec.c:1048: warning: passing argument 1 of 'randomize' from incompatible
pointer type
i686-pc-linux-gnu-gcc         -O2 -pipe -march=athlon-xp -fomit-frame-pointer
-I/var/tmp/portage/media-sound/musepack-tools-1.15v-r1/work/sv7  -DCVD_FASTLOG
-DFAST_MATH    -DMPPDEC_VERSION=\"1.15v\" -DMPPENC_VERSION=\"1.15v\"
-I/usr/include -L/usr/lib -fno-strict-aliasing -fno-gcse -fno-finite-math-only
-fno-unsafe-math-optimizations cpu_feat.o decode.o http.o huffsv7.o huffsv46.o
id3tag.o mppdec.o profile.o requant.o synth.o synthasm.o synthtab.o toolsd.o
wave_out.o stderr.o _setargv.o -o mppdec        -lm -lesd
/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/bin/ld:
cannot find -lesd
collect2: ld returned 1 exit status

Reproducible: Always




--- musepack-tools-1.15v-r1.ebuild      2007-05-15 21:11:16.000000000 +0200
+++ musepack-tools-1.15v-r2.ebuild      2007-05-15 21:09:36.000000000 +0200
@@ -31,13 +31,13 @@

        epatch "${FILESDIR}/${P}-Makefile.patch"
        epatch "${FILESDIR}/${P}-gcc4.patch"
-       epatch "${FILESDIR}/${P}-Makefile-esd.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
        else
+              epatch "${FILESDIR}/${P}-Makefile-esd.patch"
                sed -i -e 's/^LDADD        = -lm$/LDADD    = $(shell esd-config
--libs)/' \
                        Makefile
        fi

Sorry forgot the most important information, but didn't see any field in the
submission page.
It's with media-sound/musepack-tools-1.15v-r1 current ~x86 version

*** This bug has been marked as a duplicate of bug 178569 ***