Fix building with GCC 4.4 wrt #276691.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 112 insertions, 4 deletions

diff --git a/dev-embedded/srecord/ChangeLog b/dev-embedded/srecord/ChangeLog
index 65ebd93e5d7a..d98905578fd2 100644
--- a/dev-embedded/srecord/ChangeLog
+++ b/dev-embedded/srecord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/srecord
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/ChangeLog,v 1.8 2008/06/17 08:32:08 calchan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/ChangeLog,v 1.9 2009/07/25 19:21:34 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> srecord-1.42.ebuild,
+  +files/srecord-1.42-gcc44.patch:
+  Fix building with GCC 4.4 wrt #276691.
 
 *srecord-1.42 (17 Jun 2008)
 
diff --git a/dev-embedded/srecord/files/srecord-1.42-gcc44.patch b/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
new file mode 100644
index 000000000000..392037dc4209
--- /dev/null
+++ b/dev-embedded/srecord/files/srecord-1.42-gcc44.patch
@@ -0,0 +1,101 @@
+diff -ur srecord-1.42.orig/lib/arglex.cc srecord-1.42/lib/arglex.cc
+--- srecord-1.42.orig/lib/arglex.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/arglex.cc	2009-07-25 21:58:48.000000000 +0300
+@@ -16,6 +16,7 @@
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ #include <cctype>
+ #include <cstring>
+ #include <cstdlib>
+diff -ur srecord-1.42.orig/lib/interval.cc srecord-1.42/lib/interval.cc
+--- srecord-1.42.orig/lib/interval.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/interval.cc	2009-07-25 22:01:00.000000000 +0300
+@@ -18,6 +18,8 @@
+ //
+ 
+ 
++#include <cstdio>
++
+ #include <lib/interval.h>
+ #include <iostream>
+ using namespace std;
+diff -ur srecord-1.42.orig/lib/quit/normal.cc srecord-1.42/lib/quit/normal.cc
+--- srecord-1.42.orig/lib/quit/normal.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/quit/normal.cc	2009-07-25 22:01:57.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ #include <cstdarg>
+ #include <cstdlib>
+ #include <cstring>
+diff -ur srecord-1.42.orig/lib/srec/input/file.cc srecord-1.42/lib/srec/input/file.cc
+--- srecord-1.42.orig/lib/srec/input/file.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/input/file.cc	2009-07-25 22:03:08.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ 
+ #include <errno.h>
+ #include <iostream>
+diff -ur srecord-1.42.orig/lib/srec/input/generator/constant.cc srecord-1.42/lib/srec/input/generator/constant.cc
+--- srecord-1.42.orig/lib/srec/input/generator/constant.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/input/generator/constant.cc	2009-07-25 22:04:11.000000000 +0300
+@@ -17,6 +17,8 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
++
+ #include <lib/srec/input/generator/constant.h>
+ 
+ 
+diff -ur srecord-1.42.orig/lib/srec/output/file/asm.cc srecord-1.42/lib/srec/output/file/asm.cc
+--- srecord-1.42.orig/lib/srec/output/file/asm.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/output/file/asm.cc	2009-07-25 22:08:49.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ #include <cstring>
+ 
+ #include <lib/interval.h>
+diff -ur srecord-1.42.orig/lib/srec/output/file/basic.cc srecord-1.42/lib/srec/output/file/basic.cc
+--- srecord-1.42.orig/lib/srec/output/file/basic.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/output/file/basic.cc	2009-07-25 22:14:36.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ #include <cstring>
+ 
+ #include <lib/interval.h>
+diff -ur srecord-1.42.orig/lib/srec/output/file.cc srecord-1.42/lib/srec/output/file.cc
+--- srecord-1.42.orig/lib/srec/output/file.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/output/file.cc	2009-07-25 22:07:17.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ 
+ #include <errno.h>
+ #include <iostream>
+diff -ur srecord-1.42.orig/lib/srec/output.cc srecord-1.42/lib/srec/output.cc
+--- srecord-1.42.orig/lib/srec/output.cc	2008-06-02 01:38:46.000000000 +0300
++++ srecord-1.42/lib/srec/output.cc	2009-07-25 22:05:56.000000000 +0300
+@@ -17,6 +17,7 @@
+ //      <http://www.gnu.org/licenses/>.
+ //
+ 
++#include <cstdio>
+ #include <cerrno>
+ #include <cstring>
+ 
diff --git a/dev-embedded/srecord/srecord-1.42.ebuild b/dev-embedded/srecord/srecord-1.42.ebuild
index 330478e8304f..a86ab49c86d4 100644
--- a/dev-embedded/srecord/srecord-1.42.ebuild
+++ b/dev-embedded/srecord/srecord-1.42.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/srecord-1.42.ebuild,v 1.1 2008/06/17 08:32:08 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/srecord/srecord-1.42.ebuild,v 1.2 2009/07/25 19:21:34 ssuominen Exp $
+
+inherit eutils
 
 DESCRIPTION="A collection of powerful tools for manipulating EPROM load files."
 HOMEPAGE="http://srecord.sourceforge.net/"
@@ -19,6 +21,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	sed -i \
 		-e 's/(SOELIM) -I. -Ietc man\/man1/(SOELIM) -I. -Ietc -Iman\/man1 man\/man1/' \
 		-e 's/(SOELIM) -I. -Ietc man\/man5/(SOELIM) -I. -Ietc -Iman\/man5 man\/man5/' \