Fixup for gcc-4.3, bug #230898. Thank you very much to Marek Miller <mlm@shells.pl> for half of the gcc43 patch. Also fixup configure so it actually detects tiffio and gmp headers, which it did not do before. Drop old.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 762 insertions, 7 deletions

diff --git a/media-gfx/surf/ChangeLog b/media-gfx/surf/ChangeLog
index d69260ebda48..ceeed5c65e9c 100644
--- a/media-gfx/surf/ChangeLog
+++ b/media-gfx/surf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/surf
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.6 2007/05/03 23:33:46 matsuu Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.7 2008/07/09 21:41:27 loki_val Exp $
+
+*surf-1.0.5-r1 (09 Jul 2008)
+
+  09 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/surf-1.0.5-configurefixup.patch, +files/surf-1.0.5-gcc43.patch,
+  -surf-1.0.5.ebuild, +surf-1.0.5-r1.ebuild:
+  Fixup for gcc-4.3, bug #230898. Thank you very much to Marek Miller
+  <mlm@shells.pl> for half of the gcc43 patch. Also fixup configure so it
+  actually detects tiffio and gmp headers, which it did not do before. Drop
+  old.
 
 *surf-1.0.5 (03 May 2007)
 
diff --git a/media-gfx/surf/Manifest b/media-gfx/surf/Manifest
index 2aa2550a2c0f..95ce804740ca 100644
--- a/media-gfx/surf/Manifest
+++ b/media-gfx/surf/Manifest
@@ -1,4 +1,6 @@
+AUX surf-1.0.5-configurefixup.patch 1075 RMD160 38b8e286ac517a6acadf9c4277ddb57108e5a9b8 SHA1 a60302b3308353057d1cf2e446499bf7032ee912 SHA256 e53b4b32ff116e61b709e73f8f2b71fab4a3465c40923fe0461200fda2ff0f3c
+AUX surf-1.0.5-gcc43.patch 19886 RMD160 6d8badcd9c7f4a83f54add584392ebf0ad41eed4 SHA1 ddda24b2e41dc2b1605c17f1cfaf255fde4c8db7 SHA256 5fb54666ca3c9f75dee4e8c384b0a3b4627485861f237ada6104329e4d286c17
 DIST surf-1.0.5.tar.gz 433369 RMD160 aa48172bb938831b20c19f16596e37182de44802 SHA1 b40e3813fb0339ce4d7716d5e77206882df25d5f SHA256 54ae9b0298e85ba1ca265c8517a5adecbdf570563dcaedd9c3255e6e6a5e8afd
-EBUILD surf-1.0.5.ebuild 849 RMD160 b14e0642ac9a68295a19bdae46bd1a92c9105579 SHA1 0226a941855e4a479eb930c410ec0a013ec564ed SHA256 143febaf042794162863a3e1252efb10e09af386b632b291246c297ed8ea45d6
-MISC ChangeLog 814 RMD160 97dd2b30dc8968aa18264a79a7e98a8676fb4502 SHA1 b6e5e3b28a178f42def6c56af9bdb0711eff0354 SHA256 52124961848c56cc1156536d92c94c31036972121543fdb076e9698a73342e46
+EBUILD surf-1.0.5-r1.ebuild 1027 RMD160 2a922c1b6c4869dc4b26f33a5a26a655905afe19 SHA1 4773c05606da28f6c6fe1200b2a05c02e73c9f51 SHA256 e6d66c749e727eb6cb05883906e3b4ed0da72ce4afe1a42bd89fa6abcfd4b95a
+MISC ChangeLog 1245 RMD160 897168d6e16e379fcb465e38d18ffbc479cc535f SHA1 f5dccb163b7176cb28aee3c44db15c6132f42f61 SHA256 6dc15c30cd6a5d7f56a04894c5a5de12a7790b79d93a0a3ed98a09a283adbacf
 MISC metadata.xml 506 RMD160 1bc5168634f1397559e66a0caa94f9f0f98e36b3 SHA1 3211a030dff918380a1aa9031316a2e59ac88da7 SHA256 cb6775a605cbb73486f0ee05870180a64147605666be4c80d4c8c572be766b64
diff --git a/media-gfx/surf/files/surf-1.0.5-configurefixup.patch b/media-gfx/surf/files/surf-1.0.5-configurefixup.patch
new file mode 100644
index 000000000000..e382af0c516c
--- /dev/null
+++ b/media-gfx/surf/files/surf-1.0.5-configurefixup.patch
@@ -0,0 +1,31 @@
+diff -NrU5 surf-1.0.5.orig/configure.in surf-1.0.5/configure.in
+--- surf-1.0.5.orig/configure.in	2008-07-09 23:01:08.000000000 +0200
++++ surf-1.0.5/configure.in	2008-07-09 23:25:32.000000000 +0200
+@@ -129,11 +129,11 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+ 
+-AM_CONDITIONAL(GUI, test "x$gui" = "xyes");
++AM_CONDITIONAL(GUI, test "x$gui" = "xyes")
+ 
+ 
+ dnl math lib, power function and (g)zlib:
+ 
+ RS_CHECK_LIB(m, main)
+@@ -152,13 +152,11 @@
+ 
+ AC_CHECK_LIB(tiff, main,,
+              AC_CHECK_LIB(tiff34, main,,
+                           AC_MSG_ERROR([Sorry: can't find libtiff])))
+ 
+-AC_CHECK_HEADER(tiffio.h,,
+-                [AC_CHECK_HEADER(tiff34/tiffio.h,AC_DEFINE(TIFF_HEADER_34))],
+-		[AC_MSG_ERROR(["Sorry: cannot find header file tiffio.h"])] )
++AC_CHECK_HEADER([tiffio.h],[],[AC_CHECK_HEADER(tiff34/tiffio.h,[AC_DEFINE([TIFF_HEADER_34])],[AC_MSG_ERROR(["Sorry: cannot find header file tiffio.h"])])])
+ 
+ dnl gmp library and header file:
+ 
+ if test x"$gmp_prefix" != x ; then
+ 	LDFLAGS="-L$gmp_prefix/lib $LDFLAGS"
diff --git a/media-gfx/surf/files/surf-1.0.5-gcc43.patch b/media-gfx/surf/files/surf-1.0.5-gcc43.patch
new file mode 100644
index 000000000000..64127b9f536f
--- /dev/null
+++ b/media-gfx/surf/files/surf-1.0.5-gcc43.patch
@@ -0,0 +1,702 @@
+diff -NrU3 surf-1.0.5.orig/curve/Bezout.h surf-1.0.5/curve/Bezout.h
+--- surf-1.0.5.orig/curve/Bezout.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/Bezout.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,9 @@
+ #ifndef Bezout_h
+ #define Bezout_h
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ 
+ #include "TreePolynom.h"
+ #include "Monom.h"
+diff -NrU3 surf-1.0.5.orig/curve/BigInteger.h surf-1.0.5/curve/BigInteger.h
+--- surf-1.0.5.orig/curve/BigInteger.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/BigInteger.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,9 @@
+ #ifndef BIGINTEGER_H
+ #define BIGINTEGER_H
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ 
+ #include "mygmp.h"
+ 
+diff -NrU3 surf-1.0.5.orig/curve/Monom.h surf-1.0.5/curve/Monom.h
+--- surf-1.0.5.orig/curve/Monom.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/Monom.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,11 +26,13 @@
+ #ifndef CMonom_H
+ #define CMonom_H
+ 
+-#include <stdlib.h>
+-#include <string.h>
+-#include <iostream.h>
+ 
+-#include "doubleMath.h"
++#include <cstdlib>
++#include <cstring>
++#include <iostream>
++using namespace std;
++
++#include "BigInteger.h"
+ 
+ 
+ template<class Coeff, int num> 
+@@ -122,7 +124,7 @@
+ template<class Coeff,  int num> 
+ inline void negate(CMonom<Coeff,num> &m)
+ {
+-	negate(m.getCoeff());
++	::negate(m.getCoeff());
+ }
+ 
+ 
+diff -NrU3 surf-1.0.5.orig/curve/mygmp.h surf-1.0.5/curve/mygmp.h
+--- surf-1.0.5.orig/curve/mygmp.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/mygmp.h	2008-07-09 17:42:33.000000000 +0200
+@@ -32,7 +32,9 @@
+ #include <gmp.h>
+ #endif
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ 
+ extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);
+ extern ostream & operator << (ostream &os, mpz_t z);
+diff -NrU3 surf-1.0.5.orig/curve/RBTree.cc surf-1.0.5/curve/RBTree.cc
+--- surf-1.0.5.orig/curve/RBTree.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/RBTree.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,9 @@
+  */
+ 
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ #include <assert.h>
+ 
+ #include "RBTree.h"
+diff -NrU3 surf-1.0.5.orig/curve/RBTree.h surf-1.0.5/curve/RBTree.h
+--- surf-1.0.5.orig/curve/RBTree.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/RBTree.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,8 +26,10 @@
+ #ifndef RBTREE_H
+ #define RBTREE_H
+ 
++
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "debug.h"
+ 
+diff -NrU3 surf-1.0.5.orig/curve/RootFinder2d.cc surf-1.0.5/curve/RootFinder2d.cc
+--- surf-1.0.5.orig/curve/RootFinder2d.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/RootFinder2d.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "RootFinder2d.h"
+ #include "degree.h"
+diff -NrU3 surf-1.0.5.orig/curve/RootFinder3d.cc surf-1.0.5/curve/RootFinder3d.cc
+--- surf-1.0.5.orig/curve/RootFinder3d.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/RootFinder3d.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <math.h>
+ 
+ #include "degree.h"
+diff -NrU3 surf-1.0.5.orig/curve/TreePolynom.h surf-1.0.5/curve/TreePolynom.h
+--- surf-1.0.5.orig/curve/TreePolynom.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/curve/TreePolynom.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,12 +26,14 @@
+ #ifndef TREEPOLYNOM_H
+ #define TREEPOLYNOM_H
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "defs.h"
+ #include "debug.h"
+ #include "RBTree.h"
+ #include "RefCounter.h"
++#include "Monom.h"
+ 
+ template<class Monom> 
+ class TreePolynomNode : public RBNode
+@@ -200,7 +202,7 @@
+ 	
+ 	TreePolynomNode<Monom> *x = new TreePolynomNode<Monom>();
+ 	x->monom = mon;
+-	negate(x->monom);
++	::negate(x->monom);
+ 	if (parent) {
+ 		// cmp might not be used uninitialized, because if parent != 0 we made a
+ 		// call to cmp = lexorder(mon, current->monom) (see above)
+diff -NrU3 surf-1.0.5.orig/debug/debug.cc surf-1.0.5/debug/debug.cc
+--- surf-1.0.5.orig/debug/debug.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/debug/debug.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <string.h>
+ 
+ #include "debug.h"
+diff -NrU3 surf-1.0.5.orig/debug/debug.h surf-1.0.5/debug/debug.h
+--- surf-1.0.5.orig/debug/debug.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/debug/debug.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,9 @@
+ #ifndef DEBUG_H
+ #define DEBUG_H
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ 
+ class FunctionCall
+ {
+diff -NrU3 surf-1.0.5.orig/debug/Timer.h surf-1.0.5/debug/Timer.h
+--- surf-1.0.5.orig/debug/Timer.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/debug/Timer.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,8 +26,10 @@
+ #ifndef TIMER_H
+ #define TIMER_H
+ 
+-#include <time.h>
+-#include <iostream.h>
++
++#include <ctime>
++#include <iostream>
++using namespace std;
+ 
+ #define TIMER(s) Timer aTimer(s)
+ class Timer
+diff -NrU3 surf-1.0.5.orig/draw/NewClip.cc surf-1.0.5/draw/NewClip.cc
+--- surf-1.0.5.orig/draw/NewClip.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/draw/NewClip.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "NewClip.h"
+ #include "NewClipSphereParallel.h"
+diff -NrU3 surf-1.0.5.orig/drawfunc/DrawFunc.cc surf-1.0.5/drawfunc/DrawFunc.cc
+--- surf-1.0.5.orig/drawfunc/DrawFunc.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/drawfunc/DrawFunc.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,9 +24,11 @@
+ 
+ 
+ 
++
+ #include <stdio.h>
+-#include <math.h>
+-#include <iostream.h>
++#include <cmath>
++#include <iostream>
++using namespace std;
+ 
+ #include "Script.h"
+ 
+diff -NrU3 surf-1.0.5.orig/drawfunc/Monomial.h surf-1.0.5/drawfunc/Monomial.h
+--- surf-1.0.5.orig/drawfunc/Monomial.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/drawfunc/Monomial.h	2008-07-09 17:42:33.000000000 +0200
+@@ -28,8 +28,10 @@
+ #ifndef CLMONOM_H
+ #define CLMONOM_H
+ 
+-#include <math.h>
+-#include <iostream.h>
++
++#include <cmath>
++#include <iostream>
++using namespace std;
+ 
+ #include "simple.h"
+ #include "monomarith.h"
+diff -NrU3 surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h surf-1.0.5/drawfunc/MultiVariatePolynom.h
+--- surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/drawfunc/MultiVariatePolynom.h	2008-07-09 17:42:33.000000000 +0200
+@@ -28,7 +28,9 @@
+ #ifndef CLMULTIPOLY_H
+ #define CLMULTIPOLY_H
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ 
+ #define  VARIABLE_X         0
+ #define  VARIABLE_Y         1
+diff -NrU3 surf-1.0.5.orig/gtkgui/ClipWindow.cc surf-1.0.5/gtkgui/ClipWindow.cc
+--- surf-1.0.5.orig/gtkgui/ClipWindow.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/ClipWindow.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "ClipWindow.h"
+ #include "RadioButtonBuilder.h"
+ #include "OptionMenuBuilder.h"
+diff -NrU3 surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc surf-1.0.5/gtkgui/ColorSelectionButton.cc
+--- surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/ColorSelectionButton.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -25,7 +25,8 @@
+ 
+ #include <assert.h>
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "ColorSelectionButton.h"
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/ColorWindow.cc surf-1.0.5/gtkgui/ColorWindow.cc
+--- surf-1.0.5.orig/gtkgui/ColorWindow.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/ColorWindow.cc	2008-07-09 17:51:38.000000000 +0200
+@@ -23,8 +23,8 @@
+  */
+ 
+ 
+-#include<iostream>
+-#include <string.h>
++#include <iostream>
++#include <cstring>
+ 
+ #include "ColorWindow.h"
+ #include "MainWindowController.h"
+diff -NrU3 surf-1.0.5.orig/gtkgui/ConfigurationWindow.h surf-1.0.5/gtkgui/ConfigurationWindow.h
+--- surf-1.0.5.orig/gtkgui/ConfigurationWindow.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/ConfigurationWindow.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,8 @@
+ #ifndef CONFIGURATIONWINDOW_H
+ #define CONFIGURATIONWINDOW_H
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "mygtk.h"
+ 
+ #include "ParameterWindow.h"
+diff -NrU3 surf-1.0.5.orig/gtkgui/DitherWindow.cc surf-1.0.5/gtkgui/DitherWindow.cc
+--- surf-1.0.5.orig/gtkgui/DitherWindow.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/DitherWindow.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include "DitherWindow.h"
+ #include "RadioButtonBuilder.h"
+ #include "TableBuilder.h"
+diff -NrU3 surf-1.0.5.orig/gtkgui/Document.cc surf-1.0.5/gtkgui/Document.cc
+--- surf-1.0.5.orig/gtkgui/Document.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/Document.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <string.h>
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/DrawingArea.cc surf-1.0.5/gtkgui/DrawingArea.cc
+--- surf-1.0.5.orig/gtkgui/DrawingArea.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/DrawingArea.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include <gdk/gdkx.h>
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/mycolor.cc surf-1.0.5/gtkgui/mycolor.cc
+--- surf-1.0.5.orig/gtkgui/mycolor.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/mycolor.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdlib.h>
+ #include <strstream>
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/mygtk.h surf-1.0.5/gtkgui/mygtk.h
+--- surf-1.0.5.orig/gtkgui/mygtk.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/mygtk.h	2008-07-09 17:42:33.000000000 +0200
+@@ -28,7 +28,8 @@
+ 
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #define RECALL(method,klass)							\
+ static void _ ## method (klass *k)						\
+diff -NrU3 surf-1.0.5.orig/gtkgui/NumericWindow.h surf-1.0.5/gtkgui/NumericWindow.h
+--- surf-1.0.5.orig/gtkgui/NumericWindow.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/NumericWindow.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,8 @@
+ #ifndef NUMERICWINDOW_H
+ #define NUMERICWINDOW_H
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <gtk/gtk.h>
+ #include "mygtk.h"
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/ProgressDialog.cc surf-1.0.5/gtkgui/ProgressDialog.cc
+--- surf-1.0.5.orig/gtkgui/ProgressDialog.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/ProgressDialog.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "ProgressDialog.h"
+ #include "Thread.h"
+diff -NrU3 surf-1.0.5.orig/gtkgui/Requester.cc surf-1.0.5/gtkgui/Requester.cc
+--- surf-1.0.5.orig/gtkgui/Requester.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/Requester.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <strstream>
+ 
+ #include <gtk/gtk.h>
+diff -NrU3 surf-1.0.5.orig/gtkgui/SaveImageDialog.cc surf-1.0.5/gtkgui/SaveImageDialog.cc
+--- surf-1.0.5.orig/gtkgui/SaveImageDialog.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/SaveImageDialog.cc	2008-07-09 17:56:32.000000000 +0200
+@@ -27,7 +27,7 @@
+ 
+ #include "SaveImageDialog.h"
+ 
+-using std::ostrstream;
++using namespace std;
+ 
+ void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
+ {
+diff -NrU3 surf-1.0.5.orig/gtkgui/showAbout.cc surf-1.0.5/gtkgui/showAbout.cc
+--- surf-1.0.5.orig/gtkgui/showAbout.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/showAbout.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -24,7 +24,8 @@
+ 
+ 
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include <gtk/gtk.h>
+ 
+diff -NrU3 surf-1.0.5.orig/gtkgui/start.cc surf-1.0.5/gtkgui/start.cc
+--- surf-1.0.5.orig/gtkgui/start.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/gtkgui/start.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "mygtk.h"
+ #include "GuiThread.h"
+diff -NrU3 surf-1.0.5.orig/misc/Misc.cc surf-1.0.5/misc/Misc.cc
+--- surf-1.0.5.orig/misc/Misc.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/misc/Misc.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include "Misc.h"
+ 
+diff -NrU3 surf-1.0.5.orig/misc/Misc.h surf-1.0.5/misc/Misc.h
+--- surf-1.0.5.orig/misc/Misc.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/misc/Misc.h	2008-07-09 17:48:50.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ #include <strstream>
+ 
+-using std::ostrstream;
++using namespace std;
+ 
+ class Misc
+ {
+diff -NrU3 surf-1.0.5.orig/mt/GuiThread.cc surf-1.0.5/mt/GuiThread.cc
+--- surf-1.0.5.orig/mt/GuiThread.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/mt/GuiThread.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -27,7 +27,8 @@
+ 
+ #include <unistd.h>
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <errno.h>
+diff -NrU3 surf-1.0.5.orig/mt/Thread.cc surf-1.0.5/mt/Thread.cc
+--- surf-1.0.5.orig/mt/Thread.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/mt/Thread.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,7 +23,8 @@
+  */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <pthread.h>
+ 
+ #include "Thread.h"
+diff -NrU3 surf-1.0.5.orig/src/bit_buffer.cc surf-1.0.5/src/bit_buffer.cc
+--- surf-1.0.5.orig/src/bit_buffer.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/src/bit_buffer.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,8 +23,10 @@
+  */
+ 
+ 
+-#include <limits.h>
+-#include <iostream.h>
++
++#include <climits>
++#include <iostream>
++using namespace std;
+ 
+ #include "bit_buffer.h"
+ 
+diff -NrU3 surf-1.0.5.orig/src/main.cc surf-1.0.5/src/main.cc
+--- surf-1.0.5.orig/src/main.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/src/main.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -22,7 +22,9 @@
+  *
+  */
+ 
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ #include <string.h>
+ #include <stdlib.h>
+ #include <signal.h>
+diff -NrU3 surf-1.0.5.orig/src/Options.cc surf-1.0.5/src/Options.cc
+--- surf-1.0.5.orig/src/Options.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/src/Options.cc	2008-07-09 17:50:51.000000000 +0200
+@@ -23,10 +23,12 @@
+  */
+ 
+ #include "Options.h"
+-#include<iostream>
++#include <iostream>
+ #include <string.h>
+ #include <stdlib.h>
+ 
++using namespace std;
++
+ #ifndef NO_GUI
+ 
+ #include <gtk/gtk.h>
+@@ -72,7 +74,7 @@
+ 			    strcmp(argv[i], "--exec") == 0) {
+ 				execute = true;
+ 			} else if(strcmp(argv[i], "--help") == 0) {
+-				std::cerr << usage_text;
++				cerr << usage_text;
+ 				exit(0);
+ 			} else if(strcmp(argv[i], "--progress-dialog") == 0) {
+ 				progress_dialog = true;
+@@ -80,11 +82,11 @@
+ 				auto_resize = true;
+ 			} else if(strcmp(argv[i], "-n") == 0 ||
+ 				  strcmp(argv[i], "--no-gui") == 0) {
+-				std::cerr << "Error: \'" << argv[i] << "\' must be the only option\n\n"
++				cerr << "Error: \'" << argv[i] << "\' must be the only option\n\n"
+ 					  << usage_text;
+ 				exit(1);
+ 			} else {
+-				std::cerr << "Error: unknown option \'" << argv[i] << "\'\n\n"
++				cerr << "Error: unknown option \'" << argv[i] << "\'\n\n"
+ 					  << usage_text;
+ 				exit(1);
+ 			}
+diff -NrU3 surf-1.0.5.orig/src/RgbBuffer.cc surf-1.0.5/src/RgbBuffer.cc
+--- surf-1.0.5.orig/src/RgbBuffer.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/src/RgbBuffer.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -34,9 +34,11 @@
+ 
+ 
+ 
+-#include <math.h>
+-#include <stdlib.h>
+-#include <iostream.h>
++
++#include <cmath>
++#include <cstdlib>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <string.h>
+ 
+diff -NrU3 surf-1.0.5.orig/yaccsrc/bezierarith.cc surf-1.0.5/yaccsrc/bezierarith.cc
+--- surf-1.0.5.orig/yaccsrc/bezierarith.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/bezierarith.cc	2008-07-09 17:52:41.000000000 +0200
+@@ -32,9 +32,9 @@
+ /* Date:     8 march 96                                                      */
+ /* ------------------------------------------------------------------------- */
+ 
+-#include<stdio.h>
+-#include<stdlib.h>
+-#include<math.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cmath>
+ 
+ #include"degree.h"
+ #include"mymemory.h"
+diff -NrU3 surf-1.0.5.orig/yaccsrc/mymemory.cc surf-1.0.5/yaccsrc/mymemory.cc
+--- surf-1.0.5.orig/yaccsrc/mymemory.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/mymemory.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -32,8 +32,10 @@
+ /* Date:     14.8.94                                                         */
+ /* ------------------------------------------------------------------------- */
+ 
+-#include <iostream.h>
+-#include <stdlib.h>
++
++#include <iostream>
++using namespace std;
++#include <cstdlib>
+ 
+ #include "mymemory.h"
+ 
+diff -NrU3 surf-1.0.5.orig/yaccsrc/polyx.h surf-1.0.5/yaccsrc/polyx.h
+--- surf-1.0.5.orig/yaccsrc/polyx.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/polyx.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,7 +26,8 @@
+ #ifndef POLYX_H
+ #define POLYX_H
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ /*****************************************************************************/
+ /*  POLYNIMIALS IN X                                                         */
+diff -NrU3 surf-1.0.5.orig/yaccsrc/Script.cc surf-1.0.5/yaccsrc/Script.cc
+--- surf-1.0.5.orig/yaccsrc/Script.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/Script.cc	2008-07-09 17:46:13.000000000 +0200
+@@ -27,13 +27,12 @@
+ #include <stdio.h>
+ #include <errno.h>
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-
+-
+ #include "FileWriter.h"
+ #include "TreePolynom.h"
+ #include "Misc.h"
+@@ -662,7 +661,7 @@
+ 	int width  = getBuffer()->getWidth();
+ 	int height = getBuffer()->getHeight();
+ 
+-	std::cerr << width << ", " << height << "\n";
++	cerr << width << ", " << height << "\n";
+ 
+ 	float_buffer buffer (width, height);           
+ 
+diff -NrU3 surf-1.0.5.orig/yaccsrc/SymbolTable.cc surf-1.0.5/yaccsrc/SymbolTable.cc
+--- surf-1.0.5.orig/yaccsrc/SymbolTable.cc	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/SymbolTable.cc	2008-07-09 17:42:38.000000000 +0200
+@@ -23,10 +23,11 @@
+  */
+ 
+ 
+-#include <iostream.h>
+-#include <iostream.h>
++
++#include <iostream>
++using namespace std;
+ #include <assert.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ 
+ #include <string.h>
+ #include "SymbolTable.h"
+diff -NrU3 surf-1.0.5.orig/yaccsrc/SymbolTable.h surf-1.0.5/yaccsrc/SymbolTable.h
+--- surf-1.0.5.orig/yaccsrc/SymbolTable.h	2008-07-09 15:20:35.000000000 +0200
++++ surf-1.0.5/yaccsrc/SymbolTable.h	2008-07-09 17:42:33.000000000 +0200
+@@ -26,10 +26,12 @@
+ #ifndef SYMBOLTABLE_H
+ #define SYMBOLTABLE_H
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ 
+-#include <iostream.h>
+-#include <stdio.h>
++
++#include <iostream>
++using namespace std;
++#include <cstdio>
+ 
+ class SymbolTable
+ {
diff --git a/media-gfx/surf/surf-1.0.5.ebuild b/media-gfx/surf/surf-1.0.5-r1.ebuild
index 196d59eeebc9..f6db51bda579 100644
--- a/media-gfx/surf/surf-1.0.5.ebuild
+++ b/media-gfx/surf/surf-1.0.5-r1.ebuild
@@ -1,8 +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-gfx/surf/surf-1.0.5.ebuild,v 1.1 2007/05/03 23:33:46 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.5-r1.ebuild,v 1.1 2008/07/09 21:41:27 loki_val Exp $
 
-inherit eutils
+inherit eutils base autotools
 
 DESCRIPTION="a tool to visualize algebraic curves and algebraic surfaces"
 HOMEPAGE="http://surf.sourceforge.net/"
@@ -22,6 +22,15 @@ RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5"
 
+PATCHES=(	"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-configurefixup.patch"	)
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	eautoreconf
+}
+
 src_compile() {
 	econf $(use_enable gtk gui) || die
 	emake || die
@@ -36,4 +45,5 @@ src_install() {
 		docinto ${d}
 		dodoc ${d}/*
 	done
+	prepalldocs
 }