Added patch to compile with gcc 4.0, fixes #90478. Revision bump because the previous was stable and this can change the behaviour on 64-bit systems.

(Portage version: 2.0.51.20-r4)

5 files changed, 76 insertions, 13 deletions

diff --git a/media-libs/musicbrainz/ChangeLog b/media-libs/musicbrainz/ChangeLog
index 2d73a760f393..2bf09c355020 100644
--- a/media-libs/musicbrainz/ChangeLog
+++ b/media-libs/musicbrainz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/musicbrainz
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.45 2005/02/22 08:47:39 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.46 2005/04/27 07:17:13 flameeyes Exp $
+
+*musicbrainz-2.1.1-r1 (27 Apr 2005)
+
+  27 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/musicbrainz-2.1.1-gcc4.patch, +musicbrainz-2.1.1-r1.ebuild:
+  Added patch to compile with gcc 4.0, fixes #90478. Revision bump because the
+  previous was stable and this can change the behaviour on 64-bit systems.
 
   22 Feb 2005; Hardave Riar <hardave@gentoo.org> musicbrainz-2.1.1.ebuild:
   Marked ~mips
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 757ad826ef05..1c868b3efd50 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c57f56e0f64eba5076859b5fba8a935c musicbrainz-2.1.1.ebuild 1404
-MD5 37856e9069ede0b4e84fdc939ae1e684 ChangeLog 6092
+MD5 5e476067c14c06a52add693ecab64011 ChangeLog 6406
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 c57f56e0f64eba5076859b5fba8a935c musicbrainz-2.1.1.ebuild 1404
+MD5 843dfb56abf36024d31dcbacee6400ea musicbrainz-2.1.1-r1.ebuild 1440
 MD5 0b5843a63c6212b3a427b45939e1e2ae files/digest-musicbrainz-2.1.1 72
 MD5 77f2ae9381e5795af632a134e2211c8a files/musicbrainz-2.1.1-gcc2.patch 811
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCGvE3M+I1L6GK/u4RAgvwAJ0ZHhmnq+ELM1IEeXZKPesqoMLvxACfc7vO
-9tIe5/Mi1U99xNeSg9sMK/M=
-=/fwJ
------END PGP SIGNATURE-----
+MD5 150b39ef2a38f6569e7439f0d135826f files/musicbrainz-2.1.1-gcc4.patch 670
+MD5 0b5843a63c6212b3a427b45939e1e2ae files/digest-musicbrainz-2.1.1-r1 72
diff --git a/media-libs/musicbrainz/files/digest-musicbrainz-2.1.1-r1 b/media-libs/musicbrainz/files/digest-musicbrainz-2.1.1-r1
new file mode 100644
index 000000000000..51912cee09a2
--- /dev/null
+++ b/media-libs/musicbrainz/files/digest-musicbrainz-2.1.1-r1
@@ -0,0 +1 @@
+MD5 4f753d93a85cf413e00f1394b8cbd269 libmusicbrainz-2.1.1.tar.gz 528162
diff --git a/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc4.patch b/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc4.patch
new file mode 100644
index 000000000000..c2b07c1783f3
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-2.1.1-gcc4.patch
@@ -0,0 +1,12 @@
+diff -ur libmusicbrainz-2.1.1/lib/comhttpsocket.cpp libmusicbrainz-2.1.1-gcc4/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.1/lib/comhttpsocket.cpp	2004-03-16 01:34:22.000000000 +0100
++++ libmusicbrainz-2.1.1-gcc4/lib/comhttpsocket.cpp	2005-04-27 08:52:55.243936504 +0200
+@@ -194,7 +194,7 @@
+ 	// advance to the data now, if there is any in this first buffer. 
+ 	char* pData = strstr(HeaderBuffer, "\r\n\r\n");
+ 	if (pData) pData += 4;
+-	int nOffset = (int)pData - (int)HeaderBuffer;
++	ptrdiff_t nOffset = (ptrdiff_t)pData - (ptrdiff_t)HeaderBuffer;
+ 	if (nTotal - nOffset >= nLen) // case 1: entire requested read is in header chunk
+ 	{
+ 		memcpy(pBuffer, pData, nLen);
diff --git a/media-libs/musicbrainz/musicbrainz-2.1.1-r1.ebuild b/media-libs/musicbrainz/musicbrainz-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..9c7329b35c49
--- /dev/null
+++ b/media-libs/musicbrainz/musicbrainz-2.1.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/04/27 07:17:13 flameeyes 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 ~ppc64 ~mips"
+
+RDEPEND="dev-libs/expat"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/lib${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc2.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_compile() {
+	econf --enable-cpp-headers || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README TODO docs/mb_howto.txt
+}
+
+pkg_postinst() {
+	einfo "The name of the library has changed from libmusicbrainz.so.2 to libmusicbrainz.so.4."
+	einfo "If you are updating from musicbrainz-2.0.x and you want to use the new library with"
+	einfo "existing applications, you must re-emerge them by doing:"
+	einfo "revdep-rebuild --soname libmusicbrainz.so.2"
+	einfo
+	einfo "After doing that, you can safely unmerge your old version by doing:"
+	einfo "emerge unmerge \=media-libs/musicbrainz-<old version>"
+}