Added Gcc-4.3 support. Thanks to Bert K. for his patches!

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1117 32389bae-6d03-0410-99cf-db05cde120eb

4 files changed, 71 insertions, 2 deletions

diff --git a/sci-misc/salome-med/Changelog b/sci-misc/salome-med/Changelog
index 4199b54ce..cf7ed20cb 100644
--- a/sci-misc/salome-med/Changelog
+++ b/sci-misc/salome-med/Changelog
@@ -1,5 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+  29 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  +salome-med-3.2.6-gcc-4.3.patch
+  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de>
+
   20 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   Initial import.
   +salome-med-3.2.6.ebuild, +salome-med-3.2.6_environ.patch, +salome-med-3.2.6_gcc4.patch, +salome-med-3.2.6.patch
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 4a89042a9..293435d51 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -1,6 +1,7 @@
+AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e8147b7b SHA1 3cac370c4f6fed86ec70587b3abe72149c6c07c3 SHA256 1a3ace4ce4b6423d34c934dd2768d8169ac8f3895f95b01b488f0da26ca811cf
 AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b
 AUX salome-med-3.2.6_environ.patch 829 RMD160 b2d457296e389d0f26344d1667cbd39f95bced69 SHA1 e3b584cef8a149c2bc92e98892714617383b8271 SHA256 718ce88901ec43210dcf67e7b36cae6cd1bde6f7e334f316da73bf8368304556
 AUX salome-med-3.2.6_gcc4.patch 947 RMD160 c2af9d3fa5b8dd87baae7dab13798f71d61dd4f9 SHA1 16b58dbc90eb61835547f7c4987426fb295f242b SHA256 02f59ca69ee92a0a7378f0fa9662f00078fbcd8c4fa24f8c097ef5046787ed07
 DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-med-3.2.6.ebuild 4129 RMD160 8f3fc72c05a0301efaf3dfcf7255bceceddb1883 SHA1 0d285d0c003dd6d66c8f085e8cb946221a1b01f6 SHA256 84a565c476d89f3cf678d85019532c9585f6aa2c1f0b665b5a001e32b7de2ffc
-MISC Changelog 627 RMD160 4c25c92a565adcf18da31b69331170d3f2733469 SHA1 117edd9b95ee10a09101e23f88dc8646ec582fc7 SHA256 3300a46d6b6f39123fbd7feb8bf42cd505f723920487e9936c91ad03b009834b
+EBUILD salome-med-3.2.6.ebuild 4247 RMD160 640f3c04e7fe084dbba7e6f1ed057807f309413d SHA1 21b7a9d4b43b28c23f845bdc8aa68c567285897a SHA256 f982ec08f6b5ca180ecfdc455c8f13eea48bf3d3f631df31cbc263fe80e40fb2
+MISC Changelog 797 RMD160 3d732e18768005003db79c26f8d83e1bfba46e5c SHA1 326ec2b1ebe99f3673742ce32a93746f9298db8f SHA256 b04200127ad1db3573775ec3d1892e8c507740c9be81a64bd96dbb85949f8123
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch b/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch
new file mode 100644
index 000000000..a82924f1d
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch
@@ -0,0 +1,59 @@
+diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx
+--- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx	2008-05-25 19:32:53.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx	2008-05-26 01:21:12.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include "stdio.h"
+ #include "stdlib.h"
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "MEDMEM_InterpolationHighLevelObjects.hxx"
+ 
+diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx
+--- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx	2008-05-25 19:32:53.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx	2008-05-26 01:33:32.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include "stdio.h"
+ #include "stdlib.h"
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "MEDMEM_InterpolationHighLevelObjects.hxx"
+ 
+diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx
+--- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx	2008-05-25 19:32:53.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx	2008-05-26 01:41:07.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include "stdio.h"
+ #include "stdlib.h"
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "MEDMEM_InterpolationHighLevelObjects.hxx"
+ 
+diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx
+--- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx	2008-05-25 19:32:53.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx	2008-05-26 00:59:23.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include <iomanip>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <fstream.h>
++#include <fstream>
+ 
+ #define PRECISION_IN_ASCII_FILE 10
+ #define PRECISION_IN_COMPARE 1e-10
+diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx
+--- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx	2008-05-25 19:32:53.000000000 +0200
++++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx	2008-05-26 01:55:21.000000000 +0200
+@@ -18,6 +18,7 @@
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+ #include "MEDMEM_Grid.hxx"
++#include <memory>
+ 
+ using namespace MEDMEM;
+ using namespace MED_EN;
diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild
index 94f2352e6..991de35e7 100644
--- a/sci-misc/salome-med/salome-med-3.2.6.ebuild
+++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild
@@ -57,6 +57,11 @@ src_unpack()
 	epatch ${FILESDIR}/${P}_gcc4.patch
 	epatch ${FILESDIR}/${P}.patch
 	epatch ${FILESDIR}/${P}_environ.patch
+
+	# Gcc 4.3 support
+	if version_is_at_least "4.3" $(gcc-version) ; then
+		epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	fi
 }