libsidplay: fix gcc43 and repoman/qa-fixes

(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4-git2 x86_64)

5 files changed, 104 insertions, 17 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index aece51d453bd..605496897b2d 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.36 2008/08/16 17:37:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.37 2008/11/16 18:30:04 hanno Exp $
+
+  16 Nov 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/libsidplay-2.1.1-gcc43.patch, libsidplay-1.36.57.ebuild,
+  libsidplay-1.36.59.ebuild, libsidplay-2.1.1.ebuild:
+  Fix QA issues.
+
+  16 Nov 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/libsidplay-2.1.1-gcc43.patch, libsidplay-2.1.1.ebuild:
+  Fix for gcc 4.3.
 
   16 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   libsidplay-1.36.59.ebuild:
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
new file mode 100644
index 000000000000..3b0b31ff5982
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
@@ -0,0 +1,77 @@
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp.old	2008-07-25 17:00:41.000000000 \
++0000
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp	2008-07-25 16:59:44.000000000 \
++0000
+@@ -16,6 +16,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstring>
++
+ #include "config.h"
+ 
+ #ifdef HAVE_EXCEPTIONS
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp.old	2008-07-25 \
+17:02:00.000000000 +0000
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp	2008-07-25 17:01:47.000000000 \
++0000
+@@ -37,6 +37,7 @@
+  ***************************************************************************/
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #include "config.h"
+ #ifdef HAVE_EXCEPTIONS
+--- sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp.old	2008-07-25 \
+17:08:50.000000000 +0000
++++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp	2008-07-25 \
+17:08:17.000000000 +0000
+@@ -47,6 +47,7 @@
+  ***************************************************************************/
+ 
+ #include <stdio.h>
++#include <cstring>
+ #include "config.h"
+ 
+ #ifdef HAVE_EXCEPTIONS
+--- sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp.old	2008-07-25 16:55:02.000000000 \
++0000
++++ sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp	2008-07-25 16:53:58.000000000 \
++0000
+@@ -283,7 +283,7 @@
+     uint_least32_t fileLen = 0;
+ 
+     // This sucks big time
+-    openmode createAtrr = std::ios::in;
++    std::_Ios_Openmode createAtrr = std::ios::in;
+ #ifdef HAVE_IOS_NOCREATE
+     createAtrr |= std::ios::nocreate;
+ #endif
+@@ -952,7 +952,7 @@
+     if ( status )
+     {
+         // Open binary output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
+@@ -1002,7 +1002,7 @@
+     if ( status )
+     {
+         // Open ASCII output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+         if ( overWriteFlag )
+             createAttr |= std::ios::trunc;
+         else
+@@ -1036,7 +1036,7 @@
+     if ( status )
+     {
+         // Open binary output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
diff --git a/media-libs/libsidplay/libsidplay-1.36.57.ebuild b/media-libs/libsidplay/libsidplay-1.36.57.ebuild
index 23df52ceaf7c..679901d18444 100644
--- a/media-libs/libsidplay/libsidplay-1.36.57.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.57.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.16 2007/10/15 14:34:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.57.ebuild,v 1.17 2008/11/16 18:30:04 hanno Exp $
 
 inherit eutils
 
@@ -17,11 +17,11 @@ DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libsidplay-gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}/libsidplay-gcc34.patch"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING DEVELOPER INSTALL
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS DEVELOPER INSTALL
 }
diff --git a/media-libs/libsidplay/libsidplay-1.36.59.ebuild b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
index 37441b756f1b..70db59d5a75e 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.2 2008/08/16 17:37:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.3 2008/11/16 18:30:04 hanno Exp $
 
 inherit libtool
 
@@ -25,5 +25,5 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS COPYING DEVELOPER INSTALL || die
+	dodoc AUTHORS DEVELOPER INSTALL || die
 }
diff --git a/media-libs/libsidplay/libsidplay-2.1.1.ebuild b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
index f0a13145d3cd..5f5400ea8848 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.13 2006/11/01 15:24:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.14 2008/11/16 18:30:04 hanno Exp $
 
 inherit libtool eutils
 
@@ -22,9 +22,10 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/libsidplay2-gcc41.patch
-	epatch "${FILESDIR}/${P}-fbsd.patch"
+	cd "${S}"
+	epatch "${FILESDIR}/libsidplay2-gcc41.patch" || die
+	epatch "${FILESDIR}/${P}-fbsd.patch" || die
+	epatch "${FILESDIR}/${P}-gcc43.patch" || die
 
 	elibtoolize
 }
@@ -37,15 +38,15 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	cd ${S}/libsidplay
+	cd "${S}/libsidplay"
 	docinto libsidplay
 	dodoc AUTHORS ChangeLog README TODO
 
-	cd ${S}/libsidutils
+	cd "${S}/libsidutils"
 	docinto libsidutils
 	dodoc AUTHORS ChangeLog README TODO
 
-	cd ${S}/resid
+	cd "${S}/resid"
 	docinto resid
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }