Fix building with GCC 4.4 wrt #276691.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 115 insertions, 6 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/Manifest b/dev-embedded/srecord/Manifest
index c2a3b5bc9ab5..7ded73a9bd78 100644
--- a/dev-embedded/srecord/Manifest
+++ b/dev-embedded/srecord/Manifest
@@ -1,6 +1,7 @@
+AUX srecord-1.42-gcc44.patch 3418 RMD160 3b9e4c5ce2e8bbeaee4a299187961842528b7667 SHA1 8b8ad77c4ee6c3915cc62728b88aa880d705338d SHA256 2aed37e8bfa666a5263028f80191b3e56bbdc75fec77e6c1748a0ba9c4107031
 DIST srecord-1.40.tar.gz 470993 RMD160 76fa4419c4f0c1c36ed3b4ec986ab09a3906b6b4 SHA1 f8534826c7adc075193b0ea2dcf82875df094e70 SHA256 b908bd0508a4382c2b75b1310b4f8d9329ca5894fe60f142c63abaa25957b41a
 DIST srecord-1.42.tar.gz 476871 RMD160 708aa6ff5815502dde53ec00cdf5eb186194e689 SHA1 76001868ce6da65e3f7232fd5ec39313471776ae SHA256 55c3783ec1775e38bcc2c18befaf204c782f1f496df1c2e2d45367ce53a64d21
 EBUILD srecord-1.40.ebuild 1066 RMD160 224209f9c5b6f103baab8fdef1779093b746c11b SHA1 3ff86fb36f3f7f067a33524bfac3bfb312d8e0dd SHA256 21e161715cdae1e0d119541238f8a395ab89aeb2577af0f0d0cab40f56106d9c
-EBUILD srecord-1.42.ebuild 1066 RMD160 1110f50c7467a31974892bd3f697b819ebe188c1 SHA1 5bc8e571da4502af54841769e1e5ea6b04618c06 SHA256 c6b2029480864f9a19b8bedce070807ee1e5721fd4776bff0e1f8a6b7046721a
-MISC ChangeLog 1222 RMD160 d8c3d6cf23e8bd14f1bfaf902c01b52a4bc5b5f8 SHA1 452db0cae94d714e4e0b6ed485320f5144cd2227 SHA256 7b0cb4ffd248302f7cab19571320cf3e913c067dc96b17a4cb62fbf94b23ceb1
+EBUILD srecord-1.42.ebuild 1123 RMD160 28dcae5d394ef67d09d4f68db934897bee9c6fa3 SHA1 f4747e215ad6c633b5720346bf4648f798d34b15 SHA256 39c35f76bca0a5afd94273e43804721f0dcd98279e34360ca7f965aa6d551f06
+MISC ChangeLog 1376 RMD160 1a3190568da39c9b863e8b1ac7ef7f6b1cc41c62 SHA1 baab2210329f7cdfd45b778e37c5b435fa035552 SHA256 987e660e995710169404d8a39772311a03921cde9ebae49c22d7c8056442da5b
 MISC metadata.xml 291 RMD160 0ecdabd5fca765dac103dc5daca65dadf78c1460 SHA1 0c211e3574bac9147b34ed8ea213d7f827a1d161 SHA256 a9ec18854ceb490a20b2cce7b285368d3892234c96f16c2e1cdb91ef096ece29
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/' \