Fix bug 217975

(Portage version: 2.1.5_rc3)

5 files changed, 258 insertions, 97 deletions

diff --git a/media-libs/adplug/ChangeLog b/media-libs/adplug/ChangeLog
index a143b7680853..3a6f0d5bbc6a 100644
--- a/media-libs/adplug/ChangeLog
+++ b/media-libs/adplug/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/adplug
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.22 2008/04/10 17:20:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/ChangeLog,v 1.23 2008/04/16 16:30:45 drac Exp $
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/adplug-2.1-gcc43.patch, adplug-2.1.ebuild:
+  Fix building with GCC 4.3 wrt #217975, thanks to Peter Alfredsen.
 
 *adplug-2.1 (10 Apr 2008)
 
diff --git a/media-libs/adplug/adplug-2.0.1.ebuild b/media-libs/adplug/adplug-2.0.1.ebuild
index 118dc182d9a3..b55f0a5cf2f5 100644
--- a/media-libs/adplug/adplug-2.0.1.ebuild
+++ b/media-libs/adplug/adplug-2.0.1.ebuild
@@ -1,10 +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/adplug/adplug-2.0.1.ebuild,v 1.6 2006/10/28 01:45:08 flameeyes Exp $
-
-inherit eutils
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-2.0.1.ebuild,v 1.7 2008/04/16 16:30:45 drac Exp $
 
 DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
 HOMEPAGE="http://adplug.sourceforge.net/"
@@ -13,12 +9,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
 
 RDEPEND=">=dev-cpp/libbinio-1.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install fialed."
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/media-libs/adplug/adplug-2.1.ebuild b/media-libs/adplug/adplug-2.1.ebuild
index d0e2fe260ddc..617f1e756afe 100644
--- a/media-libs/adplug/adplug-2.1.ebuild
+++ b/media-libs/adplug/adplug-2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-2.1.ebuild,v 1.1 2008/04/10 17:20:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-2.1.ebuild,v 1.2 2008/04/16 16:30:45 drac Exp $
+
+inherit eutils
 
 DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
 HOMEPAGE="http://adplug.sourceforge.net"
@@ -15,6 +17,12 @@ RDEPEND=">=dev-cpp/libbinio-1.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	econf --disable-dependency-tracking $(use_enable debug)
 	emake || die "emake failed."
diff --git a/media-libs/adplug/files/adplug-1.5.1-libbinio.patch b/media-libs/adplug/files/adplug-1.5.1-libbinio.patch
deleted file mode 100644
index d662eac8691a..000000000000
--- a/media-libs/adplug/files/adplug-1.5.1-libbinio.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ru adplug-1.5.1/adplugdb/adplugdb.cpp adplug-1.5.1-r2/adplugdb/adplugdb.cpp
---- adplug-1.5.1/adplugdb/adplugdb.cpp	2004-08-08 21:20:07.000000000 +0200
-+++ adplug-1.5.1-r2/adplugdb/adplugdb.cpp	2006-05-14 15:59:43.000000000 +0200
-@@ -26,7 +26,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>
--#include <binfile.h>
-+#include <libbinio/binfile.h>
- #include <string>
- #include <iostream>
- 
-diff -ru adplug-1.5.1/src/adplug.cpp adplug-1.5.1-r2/src/adplug.cpp
---- adplug-1.5.1/src/adplug.cpp	2005-05-12 18:48:10.000000000 +0200
-+++ adplug-1.5.1-r2/src/adplug.cpp	2006-05-14 15:59:07.000000000 +0200
-@@ -20,7 +20,7 @@
-  */
- 
- #include <string>
--#include <binfile.h>
-+#include <libbinio/binfile.h>
- 
- #include "adplug.h"
- #include "debug.h"
-diff -ru adplug-1.5.1/src/database.cpp adplug-1.5.1-r2/src/database.cpp
---- adplug-1.5.1/src/database.cpp	2003-03-01 19:51:59.000000000 +0100
-+++ adplug-1.5.1-r2/src/database.cpp	2006-05-14 15:59:31.000000000 +0200
-@@ -21,8 +21,8 @@
-  * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
-  */
- 
--#include <binio.h>
--#include <binfile.h>
-+#include <libbinio/binio.h>
-+#include <libbinio/binfile.h>
- #include <string.h>
- 
- #include "database.h"
-diff -ru adplug-1.5.1/src/database.h adplug-1.5.1-r2/src/database.h
---- adplug-1.5.1/src/database.h	2003-03-01 19:51:59.000000000 +0100
-+++ adplug-1.5.1-r2/src/database.h	2006-05-14 15:51:38.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- #include <iostream>
- #include <string>
--#include <binio.h>
-+#include <libbinio/binio.h>
- 
- class CAdPlugDatabase
- {
-diff -ru adplug-1.5.1/src/dmo.cpp adplug-1.5.1-r2/src/dmo.cpp
---- adplug-1.5.1/src/dmo.cpp	2004-09-02 21:48:12.000000000 +0200
-+++ adplug-1.5.1-r2/src/dmo.cpp	2006-05-14 16:35:22.000000000 +0200
-@@ -26,7 +26,7 @@
- */
- 
- #include <string.h>
--#include <binstr.h>
-+#include <libbinio/binstr.h>
- 
- #include "dmo.h"
- #include "debug.h"
-diff -ru adplug-1.5.1/src/fprovide.cpp adplug-1.5.1-r2/src/fprovide.cpp
---- adplug-1.5.1/src/fprovide.cpp	2003-02-17 17:42:50.000000000 +0100
-+++ adplug-1.5.1-r2/src/fprovide.cpp	2006-05-14 15:59:20.000000000 +0200
-@@ -20,8 +20,8 @@
-  */
- 
- #include <string.h>
--#include <binio.h>
--#include <binfile.h>
-+#include <libbinio/binio.h>
-+#include <libbinio/binfile.h>
- 
- #include "fprovide.h"
- 
-diff -ru adplug-1.5.1/src/fprovide.h adplug-1.5.1-r2/src/fprovide.h
---- adplug-1.5.1/src/fprovide.h	2003-01-28 14:34:35.000000000 +0100
-+++ adplug-1.5.1-r2/src/fprovide.h	2006-05-14 15:51:57.000000000 +0200
-@@ -23,7 +23,7 @@
- #define H_ADPLUG_FILEPROVIDER
- 
- #include <string>
--#include <binio.h>
-+#include <libbinio/binio.h>
- 
- class CFileProvider
- {
diff --git a/media-libs/adplug/files/adplug-2.1-gcc43.patch b/media-libs/adplug/files/adplug-2.1-gcc43.patch
new file mode 100644
index 000000000000..00e63d705a33
--- /dev/null
+++ b/media-libs/adplug/files/adplug-2.1-gcc43.patch
@@ -0,0 +1,240 @@
+diff -ur adplug-2.1.orig/src/a2m.cpp adplug-2.1/src/a2m.cpp
+--- adplug-2.1.orig/src/a2m.cpp	2007-04-08 21:33:31.000000000 +0300
++++ adplug-2.1/src/a2m.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -31,6 +31,8 @@
+ 
+ #include "a2m.h"
+ 
++#include <cstring>
++
+ const unsigned int Ca2mLoader::MAXFREQ = 2000,
+ Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY,
+ Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY,
+Vain hakemistossa adplug-2.1/src: a2m.cpp.orig
+diff -ur adplug-2.1.orig/src/adl.cpp adplug-2.1/src/adl.cpp
+--- adplug-2.1.orig/src/adl.cpp	2006-08-16 03:20:45.000000000 +0300
++++ adplug-2.1/src/adl.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -49,6 +49,7 @@
+  */
+ 
+ #include <inttypes.h>
++#include <cstring>
+ #include <stdarg.h>
+ #include <assert.h>
+ 
+diff -ur adplug-2.1.orig/src/bmf.cpp adplug-2.1/src/bmf.cpp
+--- adplug-2.1.orig/src/bmf.cpp	2006-05-17 20:53:10.000000000 +0300
++++ adplug-2.1/src/bmf.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -43,6 +43,8 @@
+ #include "bmf.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] =
+ {
+   0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3,
+diff -ur adplug-2.1.orig/src/cff.cpp adplug-2.1/src/cff.cpp
+--- adplug-2.1.orig/src/cff.cpp	2006-07-04 16:31:12.000000000 +0300
++++ adplug-2.1/src/cff.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -28,6 +28,8 @@
+ 
+ #include "cff.h"
+ 
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+ 
+ CPlayer *CcffLoader::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/dro.cpp adplug-2.1/src/dro.cpp
+--- adplug-2.1.orig/src/dro.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/dro.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -27,6 +27,8 @@
+ 
+ #include "dro.h"
+ 
++#include <cstring>
++
+ /*** public methods *************************************/
+ 
+ CPlayer *CdroPlayer::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/dtm.cpp adplug-2.1/src/dtm.cpp
+--- adplug-2.1.orig/src/dtm.cpp	2006-07-06 10:07:23.000000000 +0300
++++ adplug-2.1/src/dtm.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -24,6 +24,8 @@
+ 
+ #include "dtm.h"
+ 
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+ 
+ CPlayer *CdtmLoader::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/fmc.cpp adplug-2.1/src/fmc.cpp
+--- adplug-2.1.orig/src/fmc.cpp	2007-04-08 15:00:04.000000000 +0300
++++ adplug-2.1/src/fmc.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "fmc.h"
+ 
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+ 
+ CPlayer *CfmcLoader::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/mad.cpp adplug-2.1/src/mad.cpp
+--- adplug-2.1.orig/src/mad.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/mad.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "mad.h"
+ 
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+ 
+ CPlayer *CmadLoader::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/mkj.cpp adplug-2.1/src/mkj.cpp
+--- adplug-2.1.orig/src/mkj.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/mkj.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -24,6 +24,8 @@
+ #include "mkj.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ CPlayer *CmkjPlayer::factory(Copl *newopl)
+ {
+   return new CmkjPlayer(newopl);
+diff -ur adplug-2.1.orig/src/msc.cpp adplug-2.1/src/msc.cpp
+--- adplug-2.1.orig/src/msc.cpp	2006-05-17 21:13:07.000000000 +0300
++++ adplug-2.1/src/msc.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -24,6 +24,8 @@
+ #include "msc.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = {
+   'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ',
+   'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' };
+diff -ur adplug-2.1.orig/src/mtk.cpp adplug-2.1/src/mtk.cpp
+--- adplug-2.1.orig/src/mtk.cpp	2006-07-04 16:39:10.000000000 +0300
++++ adplug-2.1/src/mtk.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "mtk.h"
+ 
++#include <cstring>
++
+ /*** public methods **************************************/
+ 
+ CPlayer *CmtkLoader::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/protrack.cpp adplug-2.1/src/protrack.cpp
+--- adplug-2.1.orig/src/protrack.cpp	2007-04-08 20:14:27.000000000 +0300
++++ adplug-2.1/src/protrack.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -28,6 +28,8 @@
+ #include "protrack.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ #define SPECIALARPLEN	256	// Standard length of special arpeggio lists
+ #define JUMPMARKER	0x80	// Orderlist jump marker
+ 
+diff -ur adplug-2.1.orig/src/rad.cpp adplug-2.1/src/rad.cpp
+--- adplug-2.1.orig/src/rad.cpp	2007-04-08 14:57:32.000000000 +0300
++++ adplug-2.1/src/rad.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -24,6 +24,8 @@
+ 
+ #include "rad.h"
+ 
++#include <cstring>
++
+ CPlayer *CradLoader::factory(Copl *newopl)
+ {
+   return new CradLoader(newopl);
+diff -ur adplug-2.1.orig/src/rat.cpp adplug-2.1/src/rat.cpp
+--- adplug-2.1.orig/src/rat.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/rat.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -32,6 +32,8 @@
+ #include "rat.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ const unsigned char CxadratPlayer::rat_adlib_bases[18] =
+ {
+   0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12,
+diff -ur adplug-2.1.orig/src/raw.cpp adplug-2.1/src/raw.cpp
+--- adplug-2.1.orig/src/raw.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/raw.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "raw.h"
+ 
++#include <cstring>
++
+ /*** public methods *************************************/
+ 
+ CPlayer *CrawPlayer::factory(Copl *newopl)
+diff -ur adplug-2.1.orig/src/rix.cpp adplug-2.1/src/rix.cpp
+--- adplug-2.1.orig/src/rix.cpp	2007-04-01 18:32:49.000000000 +0300
++++ adplug-2.1/src/rix.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -23,6 +23,9 @@
+ #include "rix.h"
+ #include "debug.h"
+ 
++#include <cstdlib>
++#include <cstring>
++
+ const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
+ const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
+ const unsigned char CrixPlayer::ad_C0_offs[] = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
+diff -ur adplug-2.1.orig/src/rol.h adplug-2.1/src/rol.h
+--- adplug-2.1.orig/src/rol.h	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/rol.h	2008-04-16 19:23:40.000000000 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include <vector>
+ #include <string>
++#include <cstring>
+ 
+ #include "player.h"
+ 
+diff -ur adplug-2.1.orig/src/s3m.cpp adplug-2.1/src/s3m.cpp
+--- adplug-2.1.orig/src/s3m.cpp	2006-07-02 08:27:00.000000000 +0300
++++ adplug-2.1/src/s3m.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -24,6 +24,8 @@
+ 
+ #include "s3m.h"
+ 
++#include <cstring>
++
+ const char Cs3mPlayer::chnresolv[] =	// S3M -> adlib channel conversion
+   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
+ 
+diff -ur adplug-2.1.orig/src/sa2.cpp adplug-2.1/src/sa2.cpp
+--- adplug-2.1.orig/src/sa2.cpp	2007-04-08 14:58:45.000000000 +0300
++++ adplug-2.1/src/sa2.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -25,6 +25,8 @@
+ #include "sa2.h"
+ #include "debug.h"
+ 
++#include <cstring>
++
+ CPlayer *Csa2Loader::factory(Copl *newopl)
+ {
+   return new Csa2Loader(newopl);
+diff -ur adplug-2.1.orig/src/sng.cpp adplug-2.1/src/sng.cpp
+--- adplug-2.1.orig/src/sng.cpp	2006-05-13 08:36:42.000000000 +0300
++++ adplug-2.1/src/sng.cpp	2008-04-16 19:23:40.000000000 +0300
+@@ -21,6 +21,8 @@
+ 
+ #include "sng.h"
+ 
++#include <cstring>
++
+ CPlayer *CsngPlayer::factory(Copl *newopl)
+ {
+   return new CsngPlayer(newopl);