Fix dependency over esd just when needed. Made it link to libm else it fails to link.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 26 insertions, 20 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 58fc3e23ab27..135824504ce0 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.22 2005/03/19 14:06:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.23 2005/06/11 16:14:05 flameeyes Exp $
+
+  11 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musepack-tools-1.15v.ebuild:
+  Fix dependency over esd just when needed. Made it link to libm else it fails
+  to link.
 
 *musepack-tools-1.15v (19 Mar 2005)
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 28002a6e1bd8..404abef21382 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6a3947a6c008679e019f578758ef1fbd musepack-tools-1.15v.ebuild 1441
-MD5 3622ae25f7b3c36d12e558b0c7d9bb84 musepack-tools-1.15u.ebuild 1514
+MD5 52a420b67454d8abcc74cc4e68f580c7 ChangeLog 4550
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 eff2c355ad73e0ccd723ec481868c7ef musepack-tools-1.15s-r2.ebuild 1596
-MD5 5e1e6a795431234f9abdd11f84c9c725 ChangeLog 4374
 MD5 bc42cf813b7992bcc9591fde12fa12de musepack-tools-1.15t.ebuild 1435
-MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
-MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
+MD5 3622ae25f7b3c36d12e558b0c7d9bb84 musepack-tools-1.15u.ebuild 1514
+MD5 a5a25bfbb92644abf2916a687f61e0c8 musepack-tools-1.15v.ebuild 1509
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
 MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
+MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
 MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69
-MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15v-Makefile.patch 750
+MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
-MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
-MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
-MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
-MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
+MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15v-Makefile.patch 750
+MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCPDKSp5vW4rUFj5oRAuZCAJ90n9mae9kubU3Uhhm3SD3Z3D9GUACfYZBj
-C+9tFIf1YyMP51nDyfEnlA0=
-=99aJ
+iD8DBQFCqwzEj5H05b2HAEkRAgnKAJ4iFWkzxYJPUSu507F6rBRdmrAhjACeJX5i
+7JINrNawNyV2GLxpn45jcUk=
+=nt0+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index 163fbc5d48c7..4b378142c37b 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.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/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.1 2005/03/19 14:06:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.2 2005/06/11 16:14:05 flameeyes Exp $
 
 IUSE="static 16bit esd"
 
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-sound/esound
+RDEPEND="esd? ( media-sound/esound )
 	 media-libs/id3lib"
 
 DEPEND="${RDEPEND}
@@ -33,9 +33,10 @@ src_unpack() {
 	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
 
 	if ! use esd ; then
-		sed -i 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
+		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 's/#LDADD   += -lesd/LDADD   += -lesd/' Makefile
+		sed -i -e 's/#LDADD   += -lesd/LDADD   += -lesd/' Makefile
 	fi
 
 	if ! use x86 ; then
@@ -49,7 +50,7 @@ src_compile() {
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
 	use static && export BLD_STATIC=1
-	ARCH= emake mppenc mppdec replaygain || die
+	ARCH= emake LDADD=-lm mppenc mppdec replaygain || die
 }
 
 src_install() {