Gcc 4 compile fix

Package-Manager: portage-2.1.2_rc1-r3

7 files changed, 63 insertions, 9 deletions

diff --git a/media-sound/mpfc/ChangeLog b/media-sound/mpfc/ChangeLog
index a1d830ef02f6..38b21b6e3ead 100644
--- a/media-sound/mpfc/ChangeLog
+++ b/media-sound/mpfc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpfc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.11 2006/03/04 07:15:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/ChangeLog,v 1.12 2006/11/05 20:37:11 aballier Exp $
+
+  05 Nov 2006; Alexis Ballier <aballier@gentoo.org> +files/mpfc-gcc4.patch,
+  mpfc-1.3.7.ebuild:
+  Gcc 4 compile fix
 
 *mpfc-1.3.7 (04 Mar 2006)
 
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 4d581754db8e..b5c5f3da1e86 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,6 +1,38 @@
-MD5 aaafee30bec9af81bdcc8422523f0e18 ChangeLog 1526
-MD5 c0c7b69cf8c28de749eb8f5f3866c91a files/digest-mpfc-1.3.5 62
-MD5 b394a78eee1a6d41bfe2d8a4b10a8df6 files/digest-mpfc-1.3.7 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mpfc-gcc4.patch 475 RMD160 53e35ee16600d264315ea8c82c627fbf0215053c SHA1 fedfe192e4d241de2715a00790b95be1b32e1ef9 SHA256 779863f55a7c29f85072d395ff614c57be957bb1e4295442eca8d89cc0a5946f
+MD5 f35b6c30e51363a98492fbcc563dbad9 files/mpfc-gcc4.patch 475
+RMD160 53e35ee16600d264315ea8c82c627fbf0215053c files/mpfc-gcc4.patch 475
+SHA256 779863f55a7c29f85072d395ff614c57be957bb1e4295442eca8d89cc0a5946f files/mpfc-gcc4.patch 475
+DIST mpfc-1.3.5.tar.gz 698826 RMD160 7d0227b2bfc2222eb67799657d9d12260f9561cb SHA1 34d2d82b4311731b4552bcd876a9218afca4dcfe SHA256 f97ed06e7ad16392f3ca83e72f2a1efb036beacfa90b0b4779b1d67e8fb774b6
+DIST mpfc-1.3.7.tar.gz 869364 RMD160 30ea18d7903dc98cb76a0fb462d94574d185d0a7 SHA1 e175d0cbc091f7cee5c27f0dcb75874bd01c18d7 SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d
+EBUILD mpfc-1.3.5.ebuild 1207 RMD160 d18558226518c7e4f5af8f2ada9fc4240a6ec29c SHA1 1a525479d1f96fb8658fd21364d564ab7ad72978 SHA256 78035988ea105a2758af80c8bb384983d65865d6dcc62ea44f0a0c8bb21a29ae
+MD5 9b3c1dadd4c422aa8b019816922af419 mpfc-1.3.5.ebuild 1207
+RMD160 d18558226518c7e4f5af8f2ada9fc4240a6ec29c mpfc-1.3.5.ebuild 1207
+SHA256 78035988ea105a2758af80c8bb384983d65865d6dcc62ea44f0a0c8bb21a29ae mpfc-1.3.5.ebuild 1207
+EBUILD mpfc-1.3.7.ebuild 1206 RMD160 ef59e54e5c2aaedaf4d10b93083ec2dd3085e478 SHA1 aa5ae6ea17a938a29c7c72d94f47df61643f0fdd SHA256 b6347cf9f19b2ea0587ef44db4f65398ab3ec3dab539e2eeef20b6e05ae42085
+MD5 abfc7b1e602af464c03776ff28632799 mpfc-1.3.7.ebuild 1206
+RMD160 ef59e54e5c2aaedaf4d10b93083ec2dd3085e478 mpfc-1.3.7.ebuild 1206
+SHA256 b6347cf9f19b2ea0587ef44db4f65398ab3ec3dab539e2eeef20b6e05ae42085 mpfc-1.3.7.ebuild 1206
+MISC ChangeLog 1646 RMD160 8a4533d78516b5b804300749dca24a3fb25e79b1 SHA1 d8c317339e2150401d3056c35ef76eb827a52a7e SHA256 89aa18efe23faf32f36817059fcf9879a3e365960bb417a894f119a92db2f158
+MD5 3e1b25ef23cdbcc03aa58c98f52428dd ChangeLog 1646
+RMD160 8a4533d78516b5b804300749dca24a3fb25e79b1 ChangeLog 1646
+SHA256 89aa18efe23faf32f36817059fcf9879a3e365960bb417a894f119a92db2f158 ChangeLog 1646
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 19bc8d221f73a481c63912439448e667 mpfc-1.3.5.ebuild 1205
-MD5 4d59661635c3432bdf77aa22839963c7 mpfc-1.3.7.ebuild 1165
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 e0e0c8310743c5cd995dfd171c5573c6 files/digest-mpfc-1.3.5 232
+RMD160 b9bcdb70355ae5ee1955560a8b90f2fb4168eb7a files/digest-mpfc-1.3.5 232
+SHA256 f4311670c3cff7f265c2621902fb7bed00ab254eee0508687c152c0d25c3a21d files/digest-mpfc-1.3.5 232
+MD5 dae25b3c845b27da90297bdb87e3053c files/digest-mpfc-1.3.7 232
+RMD160 d8203f5450b7d4acb67d5304133766fca6344d6d files/digest-mpfc-1.3.7 232
+SHA256 2461177e0ed4e4bdbcd37580e2957cacb2098cbe064ee1f4128e6a7b31955e12 files/digest-mpfc-1.3.7 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTkttvFcC4BYPU0oRAuLSAKCL0LIkeTgIL25qmH/kXNcdOBVUfgCfWFe3
+fIyovisKkIX2D+hDJoZYK64=
+=y1Lh
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.5 b/media-sound/mpfc/files/digest-mpfc-1.3.5
index 7b4e56f763a7..7c1f3e17c189 100644
--- a/media-sound/mpfc/files/digest-mpfc-1.3.5
+++ b/media-sound/mpfc/files/digest-mpfc-1.3.5
@@ -1 +1,3 @@
 MD5 34a67089e2af8f2323a70beeaa20fc76 mpfc-1.3.5.tar.gz 698826
+RMD160 7d0227b2bfc2222eb67799657d9d12260f9561cb mpfc-1.3.5.tar.gz 698826
+SHA256 f97ed06e7ad16392f3ca83e72f2a1efb036beacfa90b0b4779b1d67e8fb774b6 mpfc-1.3.5.tar.gz 698826
diff --git a/media-sound/mpfc/files/digest-mpfc-1.3.7 b/media-sound/mpfc/files/digest-mpfc-1.3.7
index cace61c3d487..dd6e86231524 100644
--- a/media-sound/mpfc/files/digest-mpfc-1.3.7
+++ b/media-sound/mpfc/files/digest-mpfc-1.3.7
@@ -1 +1,3 @@
 MD5 6d0bddc0ff00938e275b3783f8dd3716 mpfc-1.3.7.tar.gz 869364
+RMD160 30ea18d7903dc98cb76a0fb462d94574d185d0a7 mpfc-1.3.7.tar.gz 869364
+SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d mpfc-1.3.7.tar.gz 869364
diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch
new file mode 100644
index 000000000000..5cb1efb6834b
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-gcc4.patch
@@ -0,0 +1,13 @@
+--- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old	2006-11-05 21:13:25.000000000 +0100
++++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c	2006-11-05 21:13:35.000000000 +0100
+@@ -60,8 +60,8 @@
+ /* Tracks information array */
+ struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS];
+ int acd_num_tracks = 0;
+-static int acd_cur_track = -1;
+-static bool_t acd_info_read = FALSE;
++int acd_cur_track = -1;
++bool_t acd_info_read = FALSE;
+ 
+ /* Current time */
+ static int acd_time = 0;
diff --git a/media-sound/mpfc/mpfc-1.3.5.ebuild b/media-sound/mpfc/mpfc-1.3.5.ebuild
index 39ae5df42912..67576f8a0b82 100644
--- a/media-sound/mpfc/mpfc-1.3.5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.4 2005/08/07 13:37:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.5.ebuild,v 1.5 2006/11/05 20:37:11 aballier Exp $
 
 inherit eutils
 
diff --git a/media-sound/mpfc/mpfc-1.3.7.ebuild b/media-sound/mpfc/mpfc-1.3.7.ebuild
index 3f648000316f..6e9618f8d381 100644
--- a/media-sound/mpfc/mpfc-1.3.7.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.1 2006/03/04 07:15:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpfc/mpfc-1.3.7.ebuild,v 1.2 2006/11/05 20:37:11 aballier Exp $
 
 inherit eutils multilib
 
@@ -27,6 +27,7 @@ src_unpack() {
 		xargs grep ^libdir |
 		cut -f1 -d: |
 		xargs sed -i "s:^\(libdir.*\)/lib/\(.*\)$:\1/$(get_libdir)/\2:" || die
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
 }
 
 src_compile() {