Fix non-ANSI C which will cause gcc2 to die. Closes bug #61568.

4 files changed, 38 insertions, 5 deletions

diff --git a/media-libs/musicbrainz/ChangeLog b/media-libs/musicbrainz/ChangeLog
index 90daab68d34b..e2a82bca9495 100644
--- a/media-libs/musicbrainz/ChangeLog
+++ b/media-libs/musicbrainz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/musicbrainz
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.39 2004/08/08 02:02:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.40 2004/08/29 17:20:48 eradicator Exp $
+
+  29 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musicbrainz-2.1.1.ebuild, +files/musicbrainz-2.1.1-gcc2.patch:
+  Fix non-ANSI C which will cause gcc2 to die.  Closes bug #61568.
 
   07 Aug 2004; <agriffis@gentoo.org> musicbrainz-2.1.1.ebuild:
   stable on ia64 #54287
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index e28178e1e767..5dcdf7bacb43 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,7 +1,8 @@
-MD5 004d0a0816c30237b7f630980a543f16 ChangeLog 5366
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 25e9ee92c84ea234cc1acbc16477f556 musicbrainz-2.1.1.ebuild 1298
+MD5 4adbdf1547f49a49d3ac981a693547a9 ChangeLog 5558
 MD5 6009539b8d3f433ac324ea33652853c2 musicbrainz-2.0.2-r2.ebuild 1283
+MD5 07ec2d56279afd8e06766e03e55cd957 musicbrainz-2.1.1.ebuild 1393
 MD5 4481c75338713c097587426319a417a8 files/digest-musicbrainz-2.0.2-r2 72
 MD5 0b5843a63c6212b3a427b45939e1e2ae files/digest-musicbrainz-2.1.1 72
 MD5 7ae681d243e1712ec92666c7dc928c96 files/musicbrainz-2.0.2.patch 1496
+MD5 77f2ae9381e5795af632a134e2211c8a files/musicbrainz-2.1.1-gcc2.patch 811
diff --git a/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc2.patch b/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc2.patch
new file mode 100644
index 000000000000..a9adce49b989
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc2.patch
@@ -0,0 +1,20 @@
+--- libmusicbrainz-2.1.1-orig/examples/getalbum.c  2004-02-20 01:41:57.000000000 +0100
++++ libmusicbrainz-2.1.1/examples/getalbum.c      2004-08-25 00:15:12.000000000 +0200
+@@ -30,7 +30,7 @@
+ {
+     musicbrainz_t o;
+     char          error[256], data[256], temp[256], *args[2];
+-    int           ret, numTracks, trackNum, i, isMultipleArtist = 0;
++    int           ret, numTracks, numDates, trackNum, i, isMultipleArtist = 0;
+
+     if (argc < 2)
+     {
+@@ -141,7 +141,7 @@
+     if (mb_GetResultData(o, MBE_AlbumGetAmazonCoverartURL, data, 256))
+        printf("CoverartURL: %s\n", data);
+
+-    int numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
++    numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
+     for(i = 1; i <= numDates; i++)
+     {
+         // Select the first release date
diff --git a/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild b/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild
index 39cdec0faf1b..a292232c47f5 100644
--- a/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild,v 1.7 2004/08/07 16:39:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.1.1.ebuild,v 1.8 2004/08/29 17:20:48 eradicator Exp $
 
 IUSE=""
 
+inherit eutils
+
 DESCRIPTION="Client library to access metadata of mp3/vorbis/CD media"
 HOMEPAGE="http://www.musicbrainz.org/"
 SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="x86 ~ppc sparc hppa alpha amd64 ~ia64"
+KEYWORDS="x86 ~ppc sparc hppa alpha amd64 ia64"
 
 RDEPEND="dev-libs/expat"
 
@@ -19,6 +21,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/lib${P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc2.patch
+}
+
 src_compile() {
 	econf --enable-cpp-headers || die "configure failed"
 	emake || die "emake failed"