Fix build with gcc 4.3 by fixing configure checks; autreconfing it requires to rewrite many parts of the build system if we want it to work with eg libtool 2... closes bug #251251

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 79 insertions, 6 deletions

diff --git a/media-sound/sidplay/ChangeLog b/media-sound/sidplay/ChangeLog
index 2792eb2f0967..dedb34461eb8 100644
--- a/media-sound/sidplay/ChangeLog
+++ b/media-sound/sidplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/sidplay
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.15 2007/07/02 15:22:38 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.16 2008/12/19 11:50:38 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sidplay-2.0.9-gcc43.patch, sidplay-2.0.9.ebuild:
+  Fix build with gcc 4.3 by fixing configure checks; autreconfing it
+  requires to rewrite many parts of the build system if we want it to work
+  with eg libtool 2... closes bug #251251
 
   02 Jul 2007; Samuli Suominen <drac@gentoo.org> sidplay-2.0.9.ebuild:
   Remove RESTRICT as it's not required. Old policy for not mirroring files
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index 919d37632edd..fb6ec7d23abc 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sidplay-2.0.9-gcc43.patch 1097 RMD160 ba323bfbbbba319acb46a0c26b14582fe3a08633 SHA1 ff6bc13e849535c06f6befbe2bd21874d650441a SHA256 0cc4fd75e6745048e9868039f559720d093a7ee7db99dcffde2f83043412bcd5
 DIST sidplay-2.0.9.tar.gz 362140 RMD160 9d7d2cbcb472ab413093e85827de2c7099782e47 SHA1 2e4589cc59b3d2d37f38b98d7a0a0ba37b82da7a SHA256 b850986ce9226cb6eecca50057967be313771b67aed721421e74e6c931e02215
-EBUILD sidplay-2.0.9.ebuild 602 RMD160 1e82297c981a4812649a2586e0b5a48fc23e88e2 SHA1 808e32aca4ef0699ca84ae1a2cc96b07487c4882 SHA256 4fe9678e12ac0406bbccf594da64fa039f33e920fd538c40584827c6fe9c1bf9
-MISC ChangeLog 1919 RMD160 1ebeab5f27f6d91268efd6a81ae39b8f1d02f7a0 SHA1 cc4e01b70081f238feb53a43b50a2790399aaff5 SHA256 754da01e7a386af978e6b031a2161cd1f51f227df830b9877a9d61bef5b1f1cc
+EBUILD sidplay-2.0.9.ebuild 703 RMD160 903990d08404f461895fd1e40d290d74e86a8666 SHA1 a344ed04c414a44fd02b038d90def08724d73386 SHA256 baa8b24b071a208f5e8711e8efec00c6456c45534996aa860ade3f98176ae606
+MISC ChangeLog 2220 RMD160 32a73017cbb948ba982a93bd148d9d3013993f8b SHA1 5f2a296467fef91e655de1453771d3c64e1725c2 SHA256 025031f1c955082443a73032a66a67bab399dcc4261c2502f69654051c7e79bc
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklLipQACgkQvFcC4BYPU0owqACgoBADamTE8JD0vaDewB0OvYFD
+ozwAniNYjCfYlWVO3x+Ehunw7+50uLGq
+=hhS4
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch b/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch
new file mode 100644
index 000000000000..b1a24e59b9a7
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch
@@ -0,0 +1,48 @@
+Index: sidplay-2.0.9/configure
+===================================================================
+--- sidplay-2.0.9.orig/configure
++++ sidplay-2.0.9/configure
+@@ -19985,11 +19985,11 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <new.h>
++#include <new>
+ int
+ main ()
+ {
+-char* buf = new(nothrow) char[1024];
++char* buf = new(std::nothrow) char[1024];
+   ;
+   return 0;
+ }
+@@ -20052,11 +20052,11 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <fstream.h>
++#include <fstream>
+ int
+ main ()
+ {
+-ifstream myTest(ios::in|ios::binary);
++std::ifstream myTest("test.txt", std::ios::in|std::ios::binary);
+   ;
+   return 0;
+ }
+@@ -20118,12 +20118,12 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <fstream.h>
+-             #include <iomanip.h>
++#include <fstream>
++             #include <iomanip>
+ int
+ main ()
+ {
+-ios::openmode myTest = ios::in;
++std::ios::openmode myTest = std::ios::in;
+   ;
+   return 0;
+ }
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
index 6d4fde29cf72..bcccac1f5e20 100644
--- a/media-sound/sidplay/sidplay-2.0.9.ebuild
+++ b/media-sound/sidplay/sidplay-2.0.9.ebuild
@@ -1,6 +1,8 @@
-# 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-sound/sidplay/sidplay-2.0.9.ebuild,v 1.7 2007/07/02 15:22:38 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/sidplay-2.0.9.ebuild,v 1.8 2008/12/19 11:50:38 aballier Exp $
+
+inherit eutils
 
 DESCRIPTION="C64 SID player"
 HOMEPAGE="http://sidplay2.sourceforge.net/"
@@ -15,6 +17,12 @@ RDEPEND=">=media-libs/libsidplay-2.1.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
 src_install () {
 	emake DESTDIR=${D} install || die "emake install failed."
 	dodoc TODO AUTHORS ChangeLog