the math lib is always needed, check for it and link to it even if mad is not requested, fix bug #205620

Package-Manager: portage-2.1.4

4 files changed, 46 insertions, 16 deletions

diff --git a/media-sound/mpfc/ChangeLog b/media-sound/mpfc/ChangeLog
index 2acc2264962a..4dc16272c11f 100644
--- a/media-sound/mpfc/ChangeLog
+++ b/media-sound/mpfc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpfc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.18 2007/03/31 14:05:06 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.19 2008/01/13 15:30:32 aballier Exp $
+
+  13 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/mpfc-mathlib.patch, mpfc-1.3.7-r1.ebuild:
+  the math lib is always needed, check for it and link to it even if mad is
+  not requested, fix bug #205620
 
   31 Mar 2007; Alexis Ballier <aballier@gentoo.org> -mpfc-1.3.5.ebuild:
   Cleanup old version
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 866ba6d86de4..fb03736986c9 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -5,19 +5,23 @@ AUX mpfc-gcc4.patch 475 RMD160 53e35ee16600d264315ea8c82c627fbf0215053c SHA1 fed
 MD5 f35b6c30e51363a98492fbcc563dbad9 files/mpfc-gcc4.patch 475
 RMD160 53e35ee16600d264315ea8c82c627fbf0215053c files/mpfc-gcc4.patch 475
 SHA256 779863f55a7c29f85072d395ff614c57be957bb1e4295442eca8d89cc0a5946f files/mpfc-gcc4.patch 475
+AUX mpfc-mathlib.patch 469 RMD160 118f85d07c6be9901f7424761ac77139301e7d42 SHA1 50e2acf3628cb5b1b7cc0a89cfd8cb6e6e44137a SHA256 c3810524ac1c2a93415b4eeeab36346afd16092f0c3700f6d7a50ee54f6a1a7e
+MD5 49721f0f541644671b8f73a046a2d328 files/mpfc-mathlib.patch 469
+RMD160 118f85d07c6be9901f7424761ac77139301e7d42 files/mpfc-mathlib.patch 469
+SHA256 c3810524ac1c2a93415b4eeeab36346afd16092f0c3700f6d7a50ee54f6a1a7e files/mpfc-mathlib.patch 469
 DIST mpfc-1.3.7.tar.gz 869364 RMD160 30ea18d7903dc98cb76a0fb462d94574d185d0a7 SHA1 e175d0cbc091f7cee5c27f0dcb75874bd01c18d7 SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d
-EBUILD mpfc-1.3.7-r1.ebuild 1300 RMD160 8e35a5c90ee8e591575931ffe4af08c02572a6dc SHA1 40b22db16a28dbb6519956c0dff4fd64bcdc5c47 SHA256 5f415ad70b8318c26a6d997ea7317a9ca314ecfd05b553edd8d57b696898de63
-MD5 eb382672b34593f53edcd2f1651a0ae7 mpfc-1.3.7-r1.ebuild 1300
-RMD160 8e35a5c90ee8e591575931ffe4af08c02572a6dc mpfc-1.3.7-r1.ebuild 1300
-SHA256 5f415ad70b8318c26a6d997ea7317a9ca314ecfd05b553edd8d57b696898de63 mpfc-1.3.7-r1.ebuild 1300
+EBUILD mpfc-1.3.7-r1.ebuild 1343 RMD160 ea58118e6fa42c599e05ed7b01a146c90a667cdb SHA1 7fe02315e3fc048879b643c8e84be9325e11ed78 SHA256 50123507f6502a24504732d90d0fe93e59904fbd0fcf9b78c98ec2b801ae9b2d
+MD5 cef1b6d12a54a63c4b46a54a746f8dd4 mpfc-1.3.7-r1.ebuild 1343
+RMD160 ea58118e6fa42c599e05ed7b01a146c90a667cdb mpfc-1.3.7-r1.ebuild 1343
+SHA256 50123507f6502a24504732d90d0fe93e59904fbd0fcf9b78c98ec2b801ae9b2d mpfc-1.3.7-r1.ebuild 1343
 EBUILD mpfc-1.3.7.ebuild 1200 RMD160 ec41a7343e2937603b5f928523b4081fafe10a65 SHA1 9680d155abbe5dc19300c159e85350d3273ed14b SHA256 1407f9e728a0d61a152e594ceae341cd2d4c7f127bfdc23b43c2e9e23b361eae
 MD5 efa395da9dc2bffd53313e199881e2a8 mpfc-1.3.7.ebuild 1200
 RMD160 ec41a7343e2937603b5f928523b4081fafe10a65 mpfc-1.3.7.ebuild 1200
 SHA256 1407f9e728a0d61a152e594ceae341cd2d4c7f127bfdc23b43c2e9e23b361eae mpfc-1.3.7.ebuild 1200
-MISC ChangeLog 2283 RMD160 0f4bc01ca453b00d85d7d1378892ea7f4f2ca207 SHA1 6a9259d2a448f3a104d0f9cf82f18bef1948ffc1 SHA256 35260ca77399e7c7c92bf1a175778a956d3dbf9def6aabe233f073e76eb772df
-MD5 c06143ea4907cb6973ba070cbf43a001 ChangeLog 2283
-RMD160 0f4bc01ca453b00d85d7d1378892ea7f4f2ca207 ChangeLog 2283
-SHA256 35260ca77399e7c7c92bf1a175778a956d3dbf9def6aabe233f073e76eb772df ChangeLog 2283
+MISC ChangeLog 2496 RMD160 46a6a5261fde9139fe5f4459db2456a8d57e65ab SHA1 0f8e9e22129e48bbef4e2b8d95a034177602e60b SHA256 4f0bad90315028592b477b48c8a9ddc43ff43a3a4c94547f31931bb573655d36
+MD5 e29fdb44f78b906b7fbd0ad0b8d12ab8 ChangeLog 2496
+RMD160 46a6a5261fde9139fe5f4459db2456a8d57e65ab ChangeLog 2496
+SHA256 4f0bad90315028592b477b48c8a9ddc43ff43a3a4c94547f31931bb573655d36 ChangeLog 2496
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -29,9 +33,9 @@ MD5 dae25b3c845b27da90297bdb87e3053c files/digest-mpfc-1.3.7-r1 232
 RMD160 d8203f5450b7d4acb67d5304133766fca6344d6d files/digest-mpfc-1.3.7-r1 232
 SHA256 2461177e0ed4e4bdbcd37580e2957cacb2098cbe064ee1f4128e6a7b31955e12 files/digest-mpfc-1.3.7-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGDmpivFcC4BYPU0oRAnrjAJ43l3jTMPW5b1jyvKdtD0xLmc0KlgCeIi7H
-1LjG7zZdj2vIPmfnTmLrrCs=
-=psmw
+iD8DBQFHii7zvFcC4BYPU0oRAkp2AJwKzRoG/ZhsWrsToVFfCLJe3OsmaQCfalAC
+A2Iwje/l4B/WU9xI9en4FfM=
+=7ckC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpfc/files/mpfc-mathlib.patch b/media-sound/mpfc/files/mpfc-mathlib.patch
new file mode 100644
index 000000000000..011ce696e327
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-mathlib.patch
@@ -0,0 +1,20 @@
+Index: mpfc-1.3.7/configure
+===================================================================
+--- mpfc-1.3.7.orig/configure
++++ mpfc-1.3.7/configure
+@@ -27004,7 +27004,6 @@ if test "${enable_mp3+set}" = set; then
+ else
+   enable_mp3="yes"
+ fi;
+-if test "x$enable_mp3" = xyes; then
+ 	# Check for math lib
+ 	LIBS_save=$LIBS
+ 
+@@ -27242,6 +27241,7 @@ fi
+ 	MATH_LIBS="-lm"
+ 
+ 	LIBS=$LIBS_save
++if test "x$enable_mp3" = xyes; then
+ 
+ 	# Check for libmad
+ 	LIBS_save=$LIBS
diff --git a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
index 71b434d05ac1..438690aa4209 100644
--- a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.7-r1.ebuild,v 1.1 2007/03/09 03:35:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.7-r1.ebuild,v 1.2 2008/01/13 15:30:32 aballier Exp $
 
 inherit eutils multilib
 
@@ -26,6 +26,7 @@ src_unpack() {
 		cut -f1 -d: |
 		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-mathlib.patch"
 }
 
 src_compile() {