yummy gcc-3.4 goodness- never make patches at 2:00 AM; added IUSE; closes #53322

5 files changed, 57 insertions, 6 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index 4bb8d75224e9..ee89c696abc5 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.13 2004/07/01 08:00:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.14 2004/07/03 07:17:00 squinky86 Exp $
+
+  03 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/libsidplay-gcc34.patch,
+  libsidplay-1.36.57.ebuild:
+  add gcc-3.4 patch, closes #53322, added IUSE
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libsidplay-1.36.54.ebuild, libsidplay-1.36.57.ebuild:
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 386f1080d198..710d5ae2f82c 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,5 +1,6 @@
-MD5 21d3fb9e8a578153ac950d78a9a47c88 libsidplay-1.36.54.ebuild 689
-MD5 95b8095b046caf63f02691f83942d381 libsidplay-1.36.57.ebuild 623
-MD5 c9508505e4f54908f7a7a3804e37ff7a ChangeLog 1601
+MD5 cfb6f7d1cda6ced34bbbe0ff41e2038e libsidplay-1.36.57.ebuild 729
+MD5 143425b5322a9cbe9625a081f13c0cd3 libsidplay-1.36.54.ebuild 696
+MD5 4c621fd43ff54f534a61e66718b50420 ChangeLog 1755
+MD5 b9ebd672165b7c4552a7f9cc90236c49 files/libsidplay-gcc34.patch 1143
 MD5 fdd6f8c52d3a1c27f89ca988e013a116 files/digest-libsidplay-1.36.54 67
 MD5 4e2a41563a14e632e37d162203ef4d45 files/digest-libsidplay-1.36.57 67
diff --git a/media-libs/libsidplay/files/libsidplay-gcc34.patch b/media-libs/libsidplay/files/libsidplay-gcc34.patch
new file mode 100644
index 000000000000..134b227cac14
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-gcc34.patch
@@ -0,0 +1,36 @@
+diff -Naur libsidplay/src/smart.h xmms-fc-0.5.3/src/smart.h
+--- libsidplay.vanilla/src/smart.h	1998-11-30 13:10:00.000000000 -0600
++++ libsidplay/src/smart.h	2004-07-03 01:49:33.991970368 -0500
+@@ -24,7 +24,7 @@
+         }
+         else
+         {
+-            pBufCurrent = ( bufBegin = ( bufEnd = 0 ));
++            T* pBufCurrent = ( bufBegin = ( bufEnd = 0 ));
+             bufLen = 0;
+             status = false;
+         }
+@@ -207,16 +207,16 @@
+     {
+         if ( bufferLen >= 1 )
+         {
+-            pBufCurrent = ( bufBegin = buffer );
+-            bufEnd = bufBegin + bufferLen;
+-            bufLen = bufferLen;
+-            status = true;
++            this->pBufCurrent = ( this->bufBegin = buffer );
++            this->bufEnd = this->bufBegin + bufferLen;
++            this->bufLen = bufferLen;
++            this->status = true;
+         }
+         else
+         {
+-            pBufCurrent = bufBegin = bufEnd = 0;
+-            bufLen = 0;
+-            status = false;
++            this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++            this->bufLen = 0;
++            this->status = false;
+         }
+     }
+ };
diff --git a/media-libs/libsidplay/libsidplay-1.36.54.ebuild b/media-libs/libsidplay/libsidplay-1.36.54.ebuild
index abcf875e1a3d..b2f7ee41858c 100644
--- a/media-libs/libsidplay/libsidplay-1.36.54.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.54.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.54.ebuild,v 1.8 2004/07/01 08:00:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.54.ebuild,v 1.9 2004/07/03 07:17:00 squinky86 Exp $
 
 S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="C64 SID player library"
 HOMEPAGE="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html"
 SRC_URI="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/${P}.tgz"
diff --git a/media-libs/libsidplay/libsidplay-1.36.57.ebuild b/media-libs/libsidplay/libsidplay-1.36.57.ebuild
index 5fa4f69a8ebb..fc194fcc20d0 100644
--- a/media-libs/libsidplay/libsidplay-1.36.57.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.57.ebuild
@@ -1,7 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.57.ebuild,v 1.10 2004/07/01 08:00:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.57.ebuild,v 1.11 2004/07/03 07:17:00 squinky86 Exp $
 
+inherit eutils
+
+IUSE=""
 DESCRIPTION="C64 SID player library"
 HOMEPAGE="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/linux.html"
 SRC_URI="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/${P}.tgz"
@@ -12,6 +15,12 @@ KEYWORDS="x86 sparc alpha hppa ia64 ~ppc"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libsidplay-gcc34.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING DEVELOPER INSTALL