Add patch to fix compilation with gcc-4 by TGL <degrenier AT easyconnect DOT fr>; bug #126814

Package-Manager: portage-2.1_pre7-r3

4 files changed, 39 insertions, 12 deletions

diff --git a/media-sound/mp3splt/ChangeLog b/media-sound/mp3splt/ChangeLog
index e56347922ed8..8ea43baeaa43 100644
--- a/media-sound/mp3splt/ChangeLog
+++ b/media-sound/mp3splt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mp3splt
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.16 2006/03/08 20:22:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.17 2006/04/01 06:11:24 halcy0n Exp $
+
+  01 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/mp3splt-2.1-gcc41.patch, mp3splt-2.1.ebuild:
+  Add patch to fix compilation with gcc-4 by TGL <degrenier AT easyconnect DOT
+  fr>; bug #126814
 
   08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> mp3splt-1.9.ebuild,
   mp3splt-2.0.ebuild, mp3splt-2.1.ebuild:
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 5752b0b327c4..a3a8a84294a9 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6e68d9b547f301e361da24de475a9ac6 ChangeLog 1960
-RMD160 ab15759ec59af76c465045022a33792fe00b0b7a ChangeLog 1960
-SHA256 ff43556ceacb00c41b6ad59b4dfe162a81546bae112bd4d0e3fbeaedeb180861 ChangeLog 1960
+MD5 394254ab816829a1c3ac20c1c2f84fe9 ChangeLog 2159
+RMD160 1699f0dd945e7e4b4dae67b7c6b51b321695dae1 ChangeLog 2159
+SHA256 37691bd454687c35222f876c78ddeaac57e133c6b13c20897d33481887f41c13 ChangeLog 2159
 MD5 ec72cb8362f4c7c6639a753caae578c5 files/digest-mp3splt-1.9 67
 RMD160 4ebcc94192e32f90534337628bb67be0f7a4fa3d files/digest-mp3splt-1.9 67
 SHA256 ab4423b35d14b5793eb1b30991fe5b795e2082b01d2bd0678dd9dd47eeb10b0b files/digest-mp3splt-1.9 67
@@ -13,6 +13,9 @@ SHA256 67fa29094970bb16a4d4edb0dfbc751fb6b0886527cbd88d6523c408933cfec7 files/di
 MD5 cad024d0f5e134b2da7e63f728f73cdd files/digest-mp3splt-2.1 67
 RMD160 97aba86dae47cd86d7b0794d8a75e536c54c5fb0 files/digest-mp3splt-2.1 67
 SHA256 10e22fd0b6f62dec2a853f99558de936b92d85cda067e3193c68aa1babf448b7 files/digest-mp3splt-2.1 67
+MD5 2a17347b0db3a315268b22ee0798199f files/mp3splt-2.1-gcc41.patch 382
+RMD160 1030529356a0e22ae09aee34bfe58f6293e4b00c files/mp3splt-2.1-gcc41.patch 382
+SHA256 4e45cf780f92e769350db4e3e8f5598b3d34e297c2b1b21cd8120b42eac749e1 files/mp3splt-2.1-gcc41.patch 382
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
@@ -22,13 +25,13 @@ SHA256 0356b9ee0f12413f5c259174012705ffed7da5b91bba2f1ee2b5ff292e1fa7a2 mp3splt-
 MD5 c7a4f5fb3b79145b58fa16af43cd7683 mp3splt-2.0.ebuild 595
 RMD160 9100d41be2b80ac11eb51739ba367793ec9055ce mp3splt-2.0.ebuild 595
 SHA256 0098996df22777a6c47a739e8a3e4772022758b99c19c2275066cd5f3c505902 mp3splt-2.0.ebuild 595
-MD5 02c93cefdd01eaa7898ed2376cc592f6 mp3splt-2.1.ebuild 838
-RMD160 5c7b0e414731f0d004ca0a1e633f01ef429b96cf mp3splt-2.1.ebuild 838
-SHA256 89a8b638b99a2569e7ac1bb5ebf95c60731d4daa457e520b55ba9e58f64e3e73 mp3splt-2.1.ebuild 838
+MD5 386a254f05fd9c8be546d9b2ab62d01d mp3splt-2.1.ebuild 923
+RMD160 d6c0e9e3750fb1b25fa0beaf8dd699d7a249bc7d mp3splt-2.1.ebuild 923
+SHA256 810a5d085ebb515dbcc2a2e274f0a912e8d5f7235d2f6dced9897155c99131fd mp3splt-2.1.ebuild 923
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFEDz0mAiZjviIA2XgRAtkhAJ44g4RSzAwEOPLetIZqCUiSVqDfrACeKacN
-Idj44n6nZs1tUcNsS/d5lUw=
-=7/yX
+iD8DBQFELhmXCRZPokWLroQRAvX5AKDZQ595nh6dE6rXMaHgGmYubDfqwQCgvLE4
+CEthkFQBNcfKq6xYP16qL5c=
+=emi7
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mp3splt/files/mp3splt-2.1-gcc41.patch b/media-sound/mp3splt/files/mp3splt-2.1-gcc41.patch
new file mode 100644
index 000000000000..1e0610fcd710
--- /dev/null
+++ b/media-sound/mp3splt/files/mp3splt-2.1-gcc41.patch
@@ -0,0 +1,11 @@
+--- mp3splt-2.1/splt.h.orig	2006-03-19 16:24:52.000000000 +0100
++++ mp3splt-2.1/splt.h	2006-03-19 16:29:35.000000000 +0100
+@@ -96,7 +96,7 @@
+ 
+ char *zero_pad_float (float f, char *out);
+ 
+-int parse_outformat(char *s, char format[][], int cddboption);
++int parse_outformat(char *s, char format[OUTNUM][MAXOLEN], int cddboption);
+ 
+ unsigned char *cleanstring (unsigned char *s);
+ 
diff --git a/media-sound/mp3splt/mp3splt-2.1.ebuild b/media-sound/mp3splt/mp3splt-2.1.ebuild
index 0ee7f0669fec..bc21e4153c41 100644
--- a/media-sound/mp3splt/mp3splt-2.1.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.5 2006/03/08 20:22:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.6 2006/04/01 06:11:24 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="A command line utility to split mp3 and vorbis files"
 HOMEPAGE="http://mp3splt.sourceforge.net/"
@@ -14,6 +16,12 @@ IUSE="vorbis"
 DEPEND="vorbis? ( media-libs/libvorbis )
 	media-libs/libmad"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_compile() {
 	local myconf