Added patch to enable compilation against gcc-4.3 (fixes bug #219392).

Package-Manager: portage-2.1.5_rc6

4 files changed, 122 insertions, 4 deletions

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index a9fefaaf53fb..521016ddc3b1 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave-forge
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.26 2008/03/20 17:32:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.27 2008/04/27 15:09:40 markusle Exp $
+
+  27 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-forge-2006.03.17-gcc43.patch,
+  octave-forge-2006.03.17-r1.ebuild:
+  Added patch to enable compilation against gcc-4.3 (fixes bug #219392).
+  Thanks much to Peter Alfredsen <peter.alfredsen@gmail.com> for it.
 
   20 Mar 2008; Markus Dittrich <markusle@gentoo.org>
   +files/octave-forge-2006.03.17-imagemagick.patch,
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index fdad4e6c899c..b2c4980c5fba 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,3 +1,4 @@
+AUX octave-forge-2006.03.17-gcc43.patch 4484 RMD160 a338d6a509b7b26419523ea3c595ed7aae22c011 SHA1 8e61d8e81e189d29c153d39fabdcda9826ed9e37 SHA256 1dea2ce6950f7f9fe1e2af7b99ca7a66493bafed4196caa545044ce181438dcd
 AUX octave-forge-2006.03.17-imagemagick.patch 542 RMD160 36b4d2e0668619580e7c937b15041b33d7868176 SHA1 bc630ca2a74c599aa6c241bc583e054a0455175c SHA256 7f50b02f777cdf286a98b066c95144555881aa221bd2f49dc05efdf0df69afa2
 AUX octave-forge-config-fix.patch 3095 RMD160 9233a607627187ed77b353b357fd441d6e14e178 SHA1 d70bd9903b5dcff4ea197e65f497637d1afac9d7 SHA256 36cd0555fa07798594168126e1f76e28a4747adfb98706bfeb64c3b273e03489
 AUX octave-forge-mex.patch 1580 RMD160 013aac012cbe9d556ef50044b3a4c814e917ea55 SHA1 55894611900ce0552f3ce564be819a33fb816582 SHA256 64a013c222944ffd498c60175e330f141d4609975ff2796823b2850557f85807
@@ -5,7 +6,7 @@ AUX octave-forge-randmtzig.patch 428 RMD160 a5d630d5aa266f699bb645adf8d5537f15d1
 DIST octave-forge-2006.01.28.tar.gz 3741016 RMD160 23fd38b8d426db9885d83126acb22216ec4275c9 SHA1 fcf9fa08e3908d3ab800350c53834e5f2e4c22c1 SHA256 d8c7a163fbcc7841b957a3655f43e59fb265a162734f8e7615f22aa5cf6c4878
 DIST octave-forge-2006.03.17.tar.gz 3727272 RMD160 0875f4ea9c7d4f3b9b0834decdbf590fe5166fa6 SHA1 fca78a6eee1a2d44d2441c9ed9d3ffe3c51689de SHA256 65c066677556239d0567e5fcfdc55da40be81b2745b0aa852229bc4ebf23cc0f
 EBUILD octave-forge-2006.01.28.ebuild 1803 RMD160 dd2a28ad0b12ea0930d39a560c2b0da5cb4e52d2 SHA1 d78a1e582b25812678d6a5f79009e03bd8674453 SHA256 6fe08d92cb7944f048ee07ba6152ed44a982362d852833ebf4ebed861b1f69e0
-EBUILD octave-forge-2006.03.17-r1.ebuild 1698 RMD160 862e46232712eafd6b590bd73dd963996dba0bb9 SHA1 d6336eaa8fe58295a3154c39e33dc6191ce5ae5f SHA256 8c75ab1577336ed31a24d42bad9a72802daf58062929c0035bea9d6019f4003d
+EBUILD octave-forge-2006.03.17-r1.ebuild 1737 RMD160 b43354072b0fb3d200e7c227ed8ab221aa912c10 SHA1 352cab3ab9718e6a91803aaa0feddc44a00e1563 SHA256 1bb2afd1c41208aadf29337ad2c813842c32a26761d00e6376a9cf8c581da831
 EBUILD octave-forge-2006.03.17.ebuild 1622 RMD160 4100932f701da8f1588c42002fb85af88ce74724 SHA1 4eb669feff6d91ddfdaf498860f691d24fbf23a4 SHA256 1d43f51c7024ad0832d8055ca99b926db8718ff716ceeb4aef2243754809e709
-MISC ChangeLog 7366 RMD160 a5296d28de7832c3201e98b382eb8ad7f71a2fbe SHA1 4b02823593c67968d97be185829180ea792e281e SHA256 af743fcdb7cb1c3067cbe5b0d8707c286ec72eb84bdf61f54d97e0314580d99b
+MISC ChangeLog 7645 RMD160 37094cc7854d4c3c5d79f48728cb649a56631cbc SHA1 2bccc1124a88be38e5125c29660af86c53617251 SHA256 6594b21d349bac0f3ec111cd8805a7c39ccbfccca737d12b70e2cc4c67965f36
 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
diff --git a/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-gcc43.patch b/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-gcc43.patch
new file mode 100644
index 000000000000..d9c4deed5b67
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-gcc43.patch
@@ -0,0 +1,110 @@
+diff -Naur octave-forge-2006.03.17/extra/graceplot/__grcmd__.cc octave-forge-2006.03.17.new/extra/graceplot/__grcmd__.cc
+--- octave-forge-2006.03.17/extra/graceplot/__grcmd__.cc	2005-05-24 23:43:38.000000000 -0400
++++ octave-forge-2006.03.17.new/extra/graceplot/__grcmd__.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <string>
++#include <cstring>
+ #include <map>
+ #ifndef OPEN_MAX
+ #  define OPEN_MAX 256
+diff -Naur octave-forge-2006.03.17/extra/mex/mex.cc octave-forge-2006.03.17.new/extra/mex/mex.cc
+--- octave-forge-2006.03.17/extra/mex/mex.cc	2004-07-08 00:56:03.000000000 -0400
++++ octave-forge-2006.03.17.new/extra/mex/mex.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -26,6 +26,7 @@
+ #include <iomanip>
+ #include <set>
+ #include <string>
++#include <cstring>
+ typedef void * Pix;
+ typedef std::set<Pix> MemSet;
+ 
+diff -Naur octave-forge-2006.03.17/extra/pdb/creadpdb.cc octave-forge-2006.03.17.new/extra/pdb/creadpdb.cc
+--- octave-forge-2006.03.17/extra/pdb/creadpdb.cc	2006-01-08 00:47:57.000000000 -0500
++++ octave-forge-2006.03.17.new/extra/pdb/creadpdb.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -20,6 +20,7 @@
+ #include <sys/mman.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <cstring>
+ #include <fcntl.h>
+ 
+ #define BUFLEN 80
+diff -Naur octave-forge-2006.03.17/FIXES/oct-sort.cc octave-forge-2006.03.17.new/FIXES/oct-sort.cc
+--- octave-forge-2006.03.17/FIXES/oct-sort.cc	2004-01-25 10:17:25.000000000 -0500
++++ octave-forge-2006.03.17.new/FIXES/oct-sort.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -85,6 +85,7 @@
+ #include <octave/lo-mappers.h>
+ #include <octave/config.h>
+ #include <octave/quit.h>
++#include <cstring>
+ #include "oct-sort.h"
+ 
+ #define IFLT(a,b)  if (compare == NULL ? ((a) < (b)) : compare ((a), (b)))
+diff -Naur octave-forge-2006.03.17/FIXES/sort.cc octave-forge-2006.03.17.new/FIXES/sort.cc
+--- octave-forge-2006.03.17/FIXES/sort.cc	2004-04-28 04:55:14.000000000 -0400
++++ octave-forge-2006.03.17.new/FIXES/sort.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <octave/lo-ieee.h>
+ #include <octave/data-conv.h>
+ #include <octave/ov-cx-mat.h>
++#include <cstring>
+ #include "oct-sort.cc"
+ 
+ // ======= Cruft to support ancient versions of Octave =========
+diff -Naur octave-forge-2006.03.17/main/comm/gf.cc octave-forge-2006.03.17.new/main/comm/gf.cc
+--- octave-forge-2006.03.17/main/comm/gf.cc	2005-10-12 14:47:48.000000000 -0400
++++ octave-forge-2006.03.17.new/main/comm/gf.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include "galois.h"
+ #include "ov-galois.h"
+ #include <octave/utils.h>
++#include <cstring>
+ #include <octave/variables.h>
+ 
+ #ifndef OCTAVE_LOCAL_BUFFER
+diff -Naur octave-forge-2006.03.17/main/fixed/fixedComplex.cc octave-forge-2006.03.17.new/main/fixed/fixedComplex.cc
+--- octave-forge-2006.03.17/main/fixed/fixedComplex.cc	2004-07-06 16:55:23.000000000 -0400
++++ octave-forge-2006.03.17.new/main/fixed/fixedComplex.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -25,6 +25,7 @@
+ 
+ #include <complex>
+ #include <cmath>
++#include <cstdlib>
+ #include "int/fixed.h"
+ #include "fixedComplex.h"
+ 
+diff -Naur octave-forge-2006.03.17/main/miscellaneous/listen.cc octave-forge-2006.03.17.new/main/miscellaneous/listen.cc
+--- octave-forge-2006.03.17/main/miscellaneous/listen.cc	2005-11-16 16:41:07.000000000 -0500
++++ octave-forge-2006.03.17.new/main/miscellaneous/listen.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <cstdlib>
+ #include <unistd.h>
+ #include <cerrno>
++#include <cstring>
+ // #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff -Naur octave-forge-2006.03.17/main/miscellaneous/mfilename.cc octave-forge-2006.03.17.new/main/miscellaneous/mfilename.cc
+--- octave-forge-2006.03.17/main/miscellaneous/mfilename.cc	2005-12-21 15:42:40.000000000 -0500
++++ octave-forge-2006.03.17.new/main/miscellaneous/mfilename.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -22,6 +22,7 @@
+ //#ifdef HAVE_CONFIG_H
+ #include <config.h>
+ //#endif
++#include <algorithm>
+ 
+ #include "defun-dld.h"
+ #include "error.h"
+diff -Naur octave-forge-2006.03.17/main/plot/graphics.cc octave-forge-2006.03.17.new/main/plot/graphics.cc
+--- octave-forge-2006.03.17/main/plot/graphics.cc	2004-01-12 02:39:09.000000000 -0500
++++ octave-forge-2006.03.17.new/main/plot/graphics.cc	2008-04-27 10:43:59.000000000 -0400
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include <octave/oct.h>
+ #include <octave/toplev.h>
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
index 38d4ca1c7b18..af77d8618161 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.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/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.5 2008/03/20 17:32:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.6 2008/04/27 15:09:40 markusle Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${PN}-config-fix.patch
 	epatch "${FILESDIR}"/${P}-imagemagick.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {