libsidplay: fix gcc43 and repoman/qa-fixes

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4-git2 x86_64

6 files changed, 112 insertions, 24 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/Manifest b/media-libs/libsidplay/Manifest
index 1a4d06475744..c5c5a9f3e57d 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA1
 
 AUX libsidplay-2.1.1-fbsd.patch 494 RMD160 083c0d2b1a6cfe93f5b338250348fbfa62f47856 SHA1 fd232adb6b7b951fbdc10d646640db6293047a6b SHA256 91e4dafff5539527e8231f3e8c30fd7ad5afac4904d37c2e38199dfc09d6c419
+AUX libsidplay-2.1.1-gcc43.patch 2513 RMD160 6eabc62255f4c56d5cb790c092af563252f6931e SHA1 ae18384f86c615d00cdd3b1ce7e64306a0794645 SHA256 e21559e444b70a48bb009cd9fbcbbafde53472c59212c8f76034f4c35c2855f1
 AUX libsidplay-gcc34.patch 907 RMD160 ede02b956fd59a498db70a1d992e318fc8d3683c SHA1 52333ba1d37e827d7228b79874e20d50f4a97bf0 SHA256 2d953dfb0f24c9fbaa61558423c22733ce64db56296ffcf4e7721b0f34696377
 AUX libsidplay2-gcc41.patch 1555 RMD160 ea7daf7488121664583b29f8153b9994d24f2c35 SHA1 bb635997871d232e313a14db007344e9fed8a77c SHA256 f278aa8b9dfa322f7da57b11f99684092488dfaf304757ebeaa5fcd6298ae3c6
 DIST libsidplay-1.36.57.tgz 242267 RMD160 a6869bcff7b12d3afb5b5fec867e18217f484a41 SHA1 49469b0d9f78b1337fe1a56fa888ad25eacabd5a SHA256 42961c25ea23345589ce9e53fe267337e3617d0525a23cc047fcbd325cccd970
 DIST libsidplay-1.36.59.tgz 390097 RMD160 8dffb19abac64934f00a65a8adc859fbdf39657e SHA1 66056b55dc96b9ae1aab542f0260d1e6db158e51 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
 DIST sidplay-libs-2.1.1.tar.gz 1900252 RMD160 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd SHA1 8af6350866edc30b0d331e075fa97292f6f645a5 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9
-EBUILD libsidplay-1.36.57.ebuild 738 RMD160 c3b67702ed5de535b61b0f325232b7da159e8172 SHA1 307bb021f573056e69e99f3405d63a4b6fa0a6a8 SHA256 be87258b7365b69b25a9f61f1240665a90ad45201a386e12fb8c76893a32ece3
-EBUILD libsidplay-1.36.59.ebuild 729 RMD160 4a6dad571770033589b5a92fabac3510edb38e43 SHA1 d920b2741ba29912497f6f19c61315fa7e037383 SHA256 b32c2682f49a57aabe4dc8767a5814989daf0458c76ed72bdff581bc71924a06
-EBUILD libsidplay-2.1.1.ebuild 1067 RMD160 1356345d62508bab85b465059b2a907cd0886a94 SHA1 355745a3b21bcc1aca3e6e97a87c74c91790a32d SHA256 91d0ebdf8979bc0b83cffe5daa3bb9a54dc0b969c405b5dc141a6f39c0d612a8
-MISC ChangeLog 4419 RMD160 ea4fa8ddae8e0d3d53eaa70a7ed54d4902c4d639 SHA1 433facb0d053bf4dadf813e300189e1be62b0569 SHA256 823a14b079fd6d790b6ded45132d7cc2ebdba9c9d7ff778a6fdd698efb0167d2
+EBUILD libsidplay-1.36.57.ebuild 734 RMD160 39e40ec5b0e2d128d7738daca761c1cf45cda178 SHA1 83712d7d50b0d85a200d0e520e9510ba988a91e7 SHA256 5bfbfcb38bff595bb748c93eb71ca355487481c47d653862373f8ee1fc933fec
+EBUILD libsidplay-1.36.59.ebuild 718 RMD160 35d319d9a4ad8597a0311b821b976d6ac8952f21 SHA1 be178f1788a68ca6bd50f9c0923ae9cebe09cdbe SHA256 98785235dc331669ce6d5abf720ff5b6dd3290731d45d84e28187449ddfab2d5
+EBUILD libsidplay-2.1.1.ebuild 1133 RMD160 9f4d5322d57ebd39e77f9ccb6d8aecc3e73f0a64 SHA1 f74b25dabcf5a588325be67a3a5397326f9e353c SHA256 38f41d8a8960d5dcf0d697a78fe1ba4d2b8898c1b6d2ac27f10009f3ca092c72
+MISC ChangeLog 4730 RMD160 08fb2145fdcb234408f685dfd3dd5c3fc8720ae7 SHA1 41832d1ef73391dd01a3dd71537cd6db277fa982 SHA256 cdd53da5505dd629987b66cd6f1525e0142388cd3b6f43d2af5f0a0be280cb46
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkinEF4ACgkQvFcC4BYPU0repgCfY3JmmXs4DqtqXtyL61BHw8s3
-YxIAnA9l/dgOYXa0YOY0DuVaGTleAiN+
-=MFCZ
+iEYEARECAAYFAkkgZqUACgkQr2QksT29OyDzRwCfWwDFk/vxGncK/HHkWvHr+VDU
+q5QAn1AuWQhK5bXSi1lZnqUxJrFrjRYH
+=V6AP
 -----END PGP SIGNATURE-----
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
 }