aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-med
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-med')
-rw-r--r--sci-misc/salome-med/ChangeLog17
-rw-r--r--sci-misc/salome-med/Manifest20
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch59
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch367
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6.patch28
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch20
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_environ.patch27
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch26
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch48
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch74
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch43
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch13
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch11
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch11
-rw-r--r--sci-misc/salome-med/metadata.xml3
-rw-r--r--sci-misc/salome-med/salome-med-3.2.6.ebuild140
-rw-r--r--sci-misc/salome-med/salome-med-5.1.3.ebuild138
17 files changed, 366 insertions, 679 deletions
diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
index 163d3a1ad..9ecb0e368 100644
--- a/sci-misc/salome-med/ChangeLog
+++ b/sci-misc/salome-med/ChangeLog
@@ -1,7 +1,22 @@
# ChangeLog for sci-misc/salome-med
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*salome-med-5.1.3 (14 Mar 2010)
+
+ 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ -salome-med-3.2.6.ebuild, -files/salome-med-3.2.6-gcc-4.3.patch,
+ -files/salome-med-3.2.6-hdf5-1.6.7.patch,
+ -files/salome-med-3.2.6_boost-1.35.patch,
+ -files/salome-med-3.2.6_environ.patch, -files/salome-med-3.2.6_gcc4.patch,
+ -files/salome-med-3.2.6.patch, +salome-med-5.1.3.ebuild,
+ +files/salome-med-5.1.3-check_metis.patch,
+ +files/salome-med-5.1.3-check_scotch.patch,
+ +files/salome-med-5.1.3-gcc.patch, +files/salome-med-5.1.3-mpi.patch,
+ +files/salome-med-5.1.3-qt4-path.patch,
+ +files/salome-med-5.1.3-scotch.patch, metadata.xml:
+ Version bump 5.1.3 + removed broken 3.2.6
+
03 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de>
salome-med-3.2.6.ebuild, metadata.xml:
Reordered dependencies
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 065910ea7..97fea3036 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -1,10 +1,10 @@
-AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e8147b7b SHA1 3cac370c4f6fed86ec70587b3abe72149c6c07c3 SHA256 1a3ace4ce4b6423d34c934dd2768d8169ac8f3895f95b01b488f0da26ca811cf
-AUX salome-med-3.2.6-hdf5-1.6.7.patch 13390 RMD160 5e7b4f18bc5d4aba21a37dbe56aa165f4d48a70b SHA1 67c9203deaf9709eee70bbc38db1bf775bfa4500 SHA256 24ef7737f766135812584e94c0fe13a3b375d7f14dd2582866935cbbc8072bf8
-AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b
-AUX salome-med-3.2.6_boost-1.35.patch 774 RMD160 db99f619e4cd989e3de772863f14bb2185e8bce3 SHA1 1fd5d3b49c8d804eefdc7fb7f2cd64c0b0ea74a6 SHA256 a896371677425ddcb6bd5902d83f1a65cceddd7a77e1f5f40b1d9fd0c9267cd2
-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 src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-med-3.2.6.ebuild 3997 RMD160 a21789bb50593cd813e744b098bd3e26859ddab8 SHA1 5b1edb5a8af084072e67906c455a5921be2f3550 SHA256 7b87d167860c8420a7a647679e6d440e110f28108f253558748bc410fa2d0e59
-MISC ChangeLog 1580 RMD160 cb2b3a176a8394d2004e2cd71de6bbe00ce28b6e SHA1 15bf503c36c67c0904725b4f5b235fd317a5ee94 SHA256 0146cd8fd2716ecc5658e389ae09e21a671202641161c3c0b15332a6b1ef4d58
-MISC metadata.xml 251 RMD160 eef01ec04622ef90a25b1bf2ba4a716b0ff0c70b SHA1 aff4c2037afcc36714bbdbca60ab49e0f0e49c21 SHA256 e9487884fb1dc92a38d9e5ff21abb4ab6984c0bbc90296cbc546124d58fe8fb8
+AUX salome-med-5.1.3-check_metis.patch 1573 RMD160 fdcc8a1fcba4d16f4c3a8e8636820c49876476b7 SHA1 28b0021cabc939a7f45df84e36953ea4cf1622f5 SHA256 471f36d3ecb15c5ebf6e4664237958c6f6b01f84d9fb4a184c5d5cf988721aac
+AUX salome-med-5.1.3-check_scotch.patch 2538 RMD160 b501d483cdf6accd0f562676179d1be9ecfa038a SHA1 0ad2ef4901f02396c812b26e6e0264c3ae3321d4 SHA256 6802967adc584ba37317c85a8a100cef4734ce12515732b271e9057d788d14ff
+AUX salome-med-5.1.3-gcc.patch 1641 RMD160 09962970219edb007984413cd1a010044ec19cef SHA1 233f51828285c4b9fe0dc5a473fa76f7dc8fb2aa SHA256 a6c70ba8dc12f6c2a11565c9551801dc8d3eee63435f2c6977bd2e4d5e545241
+AUX salome-med-5.1.3-mpi.patch 780 RMD160 cc39b630de3f2576fea941b01aa1543b25547dee SHA1 c6afde49f3315e41ad034083290d449a57d3b82b SHA256 8ffd65e56b57ffa3351cc5451562ded665bd3ccba2ccd53865868b763c2bc616
+AUX salome-med-5.1.3-qt4-path.patch 466 RMD160 1be9c383e3db380bc1d9a91792d89fa65071685f SHA1 4c4bcde03173ee5f911a925bd7190215761bdab3 SHA256 94b4730b80bfd6abd71d203309467cb4a0fc027d8dbc634633b1f0f4f8e3a08d
+AUX salome-med-5.1.3-scotch.patch 411 RMD160 9ecd63a9cd71e6f6a4767c30baa135b6f3e3dadc SHA1 44eb2455570716883643b9c08160924a40c9ef0c SHA256 717c995a718f52ef889c4f204457d22614d85696bb0cca3df96756906791464a
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-med-5.1.3.ebuild 3815 RMD160 21e8d281958e4cae2dfc254551109228a282da09 SHA1 13fd83f79be0488b5fd75b154b3df096bf5d9c45 SHA256 3d2d72d01e3f0360707b93b0a2ed9591f8e56249ec6d9b0625687d98bfd5d5c5
+MISC ChangeLog 2269 RMD160 fe98e6f0fdc379ac4af6798c41056bc1d830c7e5 SHA1 7305757b576069db861de45161fa8b80665de527 SHA256 5d6ce488d4ef2c00402baa06e75a735ebdc14ffc105daff85fe046894d29db75
+MISC metadata.xml 274 RMD160 81f0dbbb32fd2de80832c9872616b0a48b2d4c04 SHA1 72f2c4ce931ef27e7f913218049757f318f0415d SHA256 49d1680ffc0598f56db8198488dc66263eef05571d59bb3875e0a8858f54f5e4
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
deleted file mode 100644
index a82924f1d..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/files/salome-med-3.2.6-hdf5-1.6.7.patch b/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch
deleted file mode 100644
index 7342af130..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-10-15 12:03:32.000000000 +0200
-@@ -258,12 +258,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -291,13 +301,23 @@
- }
- }
-
--#ifdef HDF_NEW_API
-+#ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -378,9 +398,16 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
-@@ -418,11 +445,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
-- return -1;
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-10-15 12:03:08.000000000 +0200
-@@ -205,27 +205,37 @@
- { /* switch pflmod pout FULL_INTERLACE*/
- case MED_GLOBALE :
-
-- /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
-- if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
-- return -1;
-+ /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
-+ if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
-+ return -1;
-+
-+ for (dim=firstdim; dim < lastdim; dim++) {
-+
-+ for (i=0; i < psize; i++) /* i balaye les élements du profil */
-+ for (j=0; j < ngauss; j++) {
-+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-+ pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
-+ pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
-+ }
-+ }
-+
-+ #ifdef HDF_NEW_API
-
-- for (dim=firstdim; dim < lastdim; dim++) {
--
-- for (i=0; i < psize; i++) /* i balaye les élements du profil */
-- for (j=0; j < ngauss; j++) {
-- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
-- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
-- }
-- }
--
--#ifdef HDF_NEW_API
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -255,12 +265,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -326,39 +346,46 @@
- pfldsk = (med_size *) malloc(sizeof(med_size)*pcount[0]);
- #else
- pfldsk = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]);
--#endif
-+ #endif
-
-- switch(pflmod)
-- { /*switch plfmod pour NO_INTERLACE */
-- case MED_GLOBALE :
--
-- for (dim=firstdim; dim < lastdim; dim++) {
--
-- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
-- for (j=0; j < ngauss; j++) {
-- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j;
-- }
-- }
--
-+ switch(pflmod)
-+ { /*switch plfmod pour NO_INTERLACE */
-+ case MED_GLOBALE :
-+
-+ for (dim=firstdim; dim < lastdim; dim++) {
-+
-+ for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
-+ for (j=0; j < ngauss; j++) {
-+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-+ pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j;
-+ }
-+ }
-+
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
--
-+
- if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0)
- return -1;
--
-+
- break;
--
-+
- case MED_COMPACT :
--
-- /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */
-- /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */
-- /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */
-+
-+ /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */
-+ /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */
-+ /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */
-
- if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0)
- return -1;
-@@ -368,26 +395,36 @@
- #else
- pflmem = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]);
- #endif
--
-+
- /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/
--
-+
- for (dim=firstdim; dim < lastdim; dim++) {
--
-+
- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
- for (j=0; j < ngauss; j++) {
- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j;
-+ pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j;
- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
- }
- }
--
-+
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-10-15 12:01:30.000000000 +0200
-@@ -204,12 +204,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -239,11 +249,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
- return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-@@ -325,9 +345,16 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
-@@ -369,11 +396,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
-- return -1;
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6.patch b/sci-misc/salome-med/files/salome-med-3.2.6.patch
deleted file mode 100644
index 7ffd0ac23..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./MED_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:51.000000000 +0200
-+++ ./MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-04 15:51:44.000000000 +0100
-@@ -26,12 +26,12 @@
- all: resources
-
- install:
-- cp -rf @top_srcdir@/adm_local @prefix@
-+# cp -rf @top_srcdir@/adm_local @prefix@
-
- bin:
-
- resources :
-- cp -rf @top_srcdir@/adm_local $(top_builddir)
-+# cp -rf @top_srcdir@/adm_local $(top_builddir)
-
- inc:
-
---- ./MED_SRC_3.2.6/build_configure.org 2007-04-24 18:40:51.000000000 +0200
-+++ ./MED_SRC_3.2.6/build_configure 2008-01-04 15:14:30.000000000 +0100
-@@ -174,7 +174,7 @@
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
- echo "" >> configure.in_tmp1
- echo 'if test ${MED_WITH_KERNEL} = yes; then' >> configure.in_tmp1
--echo ' ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-+echo ' cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
- echo 'else' >> configure.in_tmp1
- echo ' ln -fsn ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
- echo 'fi' >> configure.in_tmp1
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch b/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
deleted file mode 100644
index 7425b13e9..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src3.2.6_orig/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:10:27.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:14:06.000000000 +0200
-@@ -23,7 +23,7 @@
- ::TLockProxy(TWrapper* theWrapper):
- myWrapper(theWrapper)
- {
-- boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
-+ myWrapper->myMutex.lock();
- INITMSG(MYDEBUG,"TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
- }
-
-@@ -31,7 +31,7 @@
- ::~TLockProxy()
- {
- INITMSG(MYDEBUG,"~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
-- boost::detail::thread::lock_ops<TWrapper::TMutex>::unlock(myWrapper->myMutex);
-+ myWrapper->myMutex.unlock();
- }
-
- TWrapper*
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
deleted file mode 100644
index 8af83ea5a..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/MedClient/test/environ/Makefile.in_orig 2008-01-04 17:11:06.000000000 +0100
-+++ src/MedClient/test/environ/Makefile.in 2008-01-04 17:12:08.000000000 +0100
-@@ -29,6 +29,7 @@
- top_builddir=../../../..
- srcdir=@srcdir@
- VPATH=.:@srcdir@
-+prefix=@prefix@
-
- BIN= runEnvironTests
-
-@@ -53,11 +54,11 @@
- chmod +x csh/*
-
- install:
-- mkdir -p @prefix@/Tests/environ
-- cp -rf ${BIN} csh @prefix@/Tests/environ
-- cd @prefix@/Tests/environ ; chmod u+x ${BIN}
-- cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin
-- chmod +x @prefix@/bin/runTestMedCorba
-+ mkdir -p ${prefix}/Tests/environ
-+ cp -rf ${BIN} csh ${prefix}/Tests/environ
-+ cd ${prefix}/Tests/environ ; chmod u+x ${BIN}
-+ cp -f ${top_builddir}/bin/runTestMedCorba ${prefix}/bin
-+ chmod +x ${prefix}/bin/runTestMedCorba
-
- ./%: @srcdir@/%.in
- cd $(top_builddir) ; \
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
deleted file mode 100644
index 7ec5dac34..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:27:29.000000000 +0100
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:28:23.000000000 +0100
-@@ -222,7 +222,7 @@
- case MED_FLOAT64 :
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_FLOAT64,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- break;
-
-@@ -230,12 +230,12 @@
- #if defined(F77INT64)
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT64,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- #else
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT32,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- #endif
- break;
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
new file mode 100644
index 000000000..c133b7f37
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
@@ -0,0 +1,48 @@
+--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4 2009-09-27 22:41:46.471297649 +0200
+@@ -28,6 +28,10 @@
+
+ METIS_CPPFLAGS=""
+ METIS_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) METIS_LIBSUFFIX="64" ;;
++*) METIS_LIBSUFFIX="" ;;
++esac
+ METIS_LIBS=""
+ ENABLE_METIS="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${METISDIR}" != "x" ; then
+- METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
+- METIS_LIBS="-L${METISDIR} -lmetis"
++ METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
++ METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
+ fi
+
+ metis_ok=no
+@@ -57,7 +61,7 @@
+
+ metis_include_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
++ AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
+ metis_include_dir_ok=yes,
+ metis_include_dir_ok=no)
+ fi
+@@ -81,12 +85,12 @@
+ AC_CHECKING(for METIS binaries)
+ metis_lib_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ if test "x${metis_lib_dir_ok}" = "xno" ; then
+ METIS_LIBSUFFIX=""
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ fi
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
new file mode 100644
index 000000000..64c8bb2d8
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
@@ -0,0 +1,74 @@
+--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4 2009-09-27 23:11:02.080868671 +0200
+@@ -28,6 +28,10 @@
+
+ SCOTCH_CPPFLAGS=""
+ SCOTCH_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) SCOTCH_LIBSUFFIX="64" ;;
++*) SCOTCH_LIBSUFFIX="" ;;
++esac
+ SCOTCH_LIBS=""
+ ENABLE_SCOTCH="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${SCOTCHDIR}" != "x" ; then
+- SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
+- SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
++ SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
++ SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
+ fi
+
+ scotch_ok=no
+@@ -57,14 +61,14 @@
+
+ scotch_include_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
++ AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
+ scotch_include_dir_ok=yes,
+ scotch_include_dir_ok=no)
+ fi
+
+ if test "x${scotch_include_dir_ok}" = "xyes" ; then
+ AC_TRY_COMPILE([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_headers_ok=yes,
+@@ -83,12 +87,12 @@
+ AC_CHECKING(for SCOTCH binaries)
+ scotch_lib_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ if test "x${scotch_lib_dir_ok}" = "xno" ; then
+ SCOTCH_LIBSUFFIX=""
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ fi
+@@ -96,7 +100,7 @@
+ if test "x${scotch_lib_dir_ok}" = "xyes" ; then
+ LIBS="${LIBS_old} ${SCOTCH_LIBS}"
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
+@@ -105,7 +109,7 @@
+ SCOTCH_LIBSUFFIX=""
+ LIBS="${LIBS_old} ${SCOTCH_LIBS} "
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
new file mode 100644
index 000000000..15e349204
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
@@ -0,0 +1,43 @@
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:18:07.064072621 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:19:44.920271906 +0100
+@@ -23,6 +23,7 @@
+ #include <cmath>
+ #include <list>
+ #include <stdexcept>
++#include <cstdlib>
+
+ //================================================================================
+ /*!
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:18:07.102331566 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:24:44.300321009 +0100
+@@ -21,7 +21,7 @@
+ #include <map>
+ #include <iostream>
+ #include <mpi.h>
+-#include <time.h>
++#include <ctime>
+
+ #include "MPIAccessDECTest.hxx"
+ #include <cppunit/TestAssert.h>
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:18:07.084009650 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:25:22.930322599 +0100
+@@ -22,7 +22,7 @@
+ #include <map>
+ #include <iostream>
+ #include <mpi.h>
+-#include <time.h>
++#include <ctime>
+
+ #include "MPIAccessDECTest.hxx"
+ #include <cppunit/TestAssert.h>
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:15:35.420479255 +0100
+@@ -21,7 +21,7 @@
+ //
+ #include <med.h>
+ #include <string.h>
+-
++#include <stdlib.h>
+
+ /*****************************************************************************************************/
+
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
new file mode 100644
index 000000000..a4dc19909
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
@@ -0,0 +1,13 @@
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:42:49.442822826 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:43:38.710252330 +0100
+@@ -39,8 +39,8 @@
+ void addElementFromSource(int distant_proc, int distant_elem);
+ void prepareSendRecv();
+ void sendRecv(MEDCouplingFieldDouble& field);
+- void sendRecv(double* field, MEDCouplingFieldDouble& field) const ;
+- void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ;
++ void sendRecv(double* sendfield, MEDCouplingFieldDouble& field) const ;
++ void reverseSendRecv(double* recvfield, MEDCouplingFieldDouble& field) const ;
+
+ //
+ const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; }
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..0737e67bf
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100
+@@ -333,7 +333,7 @@
+
+ LIBS_old=$LIBS
+ if test "x$QTDIR" = "x/usr" ; then
+- QT_LIB_DIR=""
++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
+ elif test -d ${QTDIR}/lib; then
+ QT_LIB_DIR="-L$QTDIR/lib"
+ elif test -d ${QTDIR}/lib64; then
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
new file mode 100644
index 000000000..0cfcaf708
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2009-09-27 23:26:59.010112791 +0200
+@@ -19,7 +19,7 @@
+ #include <cstdio>
+ extern "C" {
+ #define restrict
+-#include "bin/scotch.h"
++#include "scotch.h"
+ }
+ #include "MEDSPLITTER_Graph.hxx"
+ #include "MEDSPLITTER_SCOTCHGraph.hxx"
diff --git a/sci-misc/salome-med/metadata.xml b/sci-misc/salome-med/metadata.xml
index e2b812a5b..e67b4dd31 100644
--- a/sci-misc/salome-med/metadata.xml
+++ b/sci-misc/salome-med/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>sci</herd>
<use>
- <flag name='openpbs'>Enable support for <pkg>sys-cluster/torque</pkg></flag>
+ <flag name='metis'>Add support for metis</flag>
+ <flag name='scotch'>Add support for scotch</flag>
</use>
</pkgmetadata>
diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild
deleted file mode 100644
index 350eaa798..000000000
--- a/sci-misc/salome-med/salome-med-3.2.6.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl openpbs"
-
-RDEPEND="opengl? ( virtual/opengl )
- mpi? ( sys-cluster/mpich2 )
- debug? ( dev-util/cppunit )
- openpbs? ( sys-cluster/torque )
- >=sci-misc/salome-kernel-${PV}
- >=sci-misc/salome-gui-${PV}
- sci-libs/med"
-
-DEPEND="${RDEPEND}"
-
-MODULE_NAME="MED"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-export OPENPBS="/usr"
-
-src_unpack() {
- python_version
- distutils_python_version
-
- if ! built_with_use sci-libs/vtk python ; then
- die "You must rebuild sci-libs/vtk with python USE flag"
- fi
-
- unpack ${A}
- cd "${MY_S}"
- epatch "${FILESDIR}"/${P}_gcc4.patch
- epatch "${FILESDIR}"/${P}.patch
- epatch "${FILESDIR}"/${P}_environ.patch
- epatch "${FILESDIR}"/${P}-hdf5-1.6.7.patch
-
- # boost 1.35.0 support
- if has_version ">=dev-libs/boost-1.35.0" ; then
- epatch "${FILESDIR}"/${P}_boost-1.35.patch
- fi
-
- # Gcc 4.3 support
- if version_is_at_least "4.3" $(gcc-version) ; then
- epatch "${FILESDIR}"/${P}-gcc-4.3.patch
- fi
-}
-
-
-src_compile() {
- local myconf=""
- cd "${MY_S}"
- rm -r -f autom4te.cache
- ./build_configure
-
- # CXXFLAGS are slightly modified to allow the compilation of
- # salome-med with OpenCascade and gcc-4.1.x
- if version_is_at_least "4.1" $(gcc-version) ; then
- append-flags -ffriend-injection -fpermissive
- fi
-
- # Compiler and linker flags
- if use amd64 ; then
- append-flags -m64
- fi
-
- # Specifying --without-<flag> for mpi / mpich / openpbs
- # has the same effect as turning it on
- # so we just ommit it if it's not required to turn it off
- if use mpi ; then
- myconf="${myconf} --with-mpi --with-mpich"
- fi
- if use openpbs ; then
- myconf="${myconf} --with-openpbs"
- fi
-
- # Configuration
- econf --prefix=${INSTALL_DIR} \
- --datadir=${INSTALL_DIR}/share/salome \
- --docdir=${INSTALL_DIR}/doc/salome \
- --infodir=${INSTALL_DIR}/share/info \
- --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
- --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
- --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
- ${myconf} \
- $(use_enable debug ) \
- $(use_enable !debug production ) \
- $(use_with debug cppunit /usr ) \
- $(use_with opengl opengl /usr) \
- || die "configuration failed"
-
- # Compilation
- MAKEOPTS="-j1" emake || die "Compilation failed"
-}
-
-
-src_install() {
- cd "${MY_S}"
-
- # Installation
- emake prefix="${D}/${INSTALL_DIR}" \
- docdir="${D}/${INSTALL_DIR}/doc/salome" \
- infodir="${D}/${INSTALL_DIR}/share/info" \
- datadir="${D}/${INSTALL_DIR}/share/salome" \
- libdir="${D}/${INSTALL_DIR}/$(get_libdir)/salome" \
- pythondir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages" install \
- || die "emake install failed"
-
- if use amd64 ; then
- dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
- fi
-
- echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
- echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
- echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
- echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
- doenvd 90${P}
- rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb
- insinto "${INSTALL_DIR}"
- doins -r adm_local
- if use doc; then
- dodoc INSTALL README
- fi
-}
-
-pkg_postinst() {
- elog "Run \`env-update && source /etc/profile\`"
- elog "now to set up the correct paths."
- elog ""
-}
-
diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild
new file mode 100644
index 000000000..a754e9158
--- /dev/null
+++ b/sci-misc/salome-med/salome-med-5.1.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+PYTHON_DEPEND="2:2.4"
+
+inherit distutils eutils flag-o-matic
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED Component"
+HOMEPAGE="http://www.salome-platform.org"
+SRC_URI="http://www.stasyan.com/devel/distfiles/src${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc mpi metis opengl scotch"
+
+RDEPEND="opengl? ( virtual/opengl )
+ mpi? ( || ( sys-cluster/openmpi[cxx]
+ sys-cluster/mpich2[cxx] ) )
+ debug? ( dev-util/cppunit )
+ metis? ( >=sci-libs/metis-4.0 )
+ scotch? ( >=sci-libs/scotch-4.0 )
+ >=sci-misc/salome-kernel-${PV}
+ >=sci-misc/salome-gui-${PV}
+ >=x11-libs/qt-core-4.5.2
+ >=x11-libs/qt-gui-4.5.2
+ >=x11-libs/qt-opengl-4.5.2
+ >=dev-libs/boost-1.40.0
+ >=sci-libs/opencascade-6.3
+ >=sci-libs/med-2.3.5
+ >=sci-libs/vtk-5.0[python]"
+
+DEPEND="${RDEPEND}
+ dev-lang/swig
+ dev-libs/libxml2"
+
+MODULE_NAME="MED"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+export OPENPBS="/usr"
+
+PYVER=$(python_get_version)
+
+pkg_setup() {
+ [[ ${PYVER} > 2.4 ]] && \
+ ewarn "Python 2.4 is highly recommended for Salome..."
+}
+
+src_prepare() {
+ cd "${MY_S}"
+
+ epatch "${FILESDIR}"/${P}-qt4-path.patch
+ epatch "${FILESDIR}"/${P}-gcc.patch
+ use mpi && epatch "${FILESDIR}"/${P}-mpi.patch
+ use metis && epatch "${FILESDIR}"/${P}-check_metis.patch
+ if use scotch; then
+ epatch "${FILESDIR}"/${P}-check_scotch.patch
+ epatch "${FILESDIR}"/${P}-scotch.patch
+ fi
+
+ rm -r -f autom4te.cache
+ ./clean_configure
+ ./build_configure
+}
+
+src_configure() {
+ cd "${MY_S}"
+ local myconf=""
+ local vtk_suffix=""
+
+ has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
+ has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
+ has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
+
+# --without-mpi does not disable mpi support, just omit it to disable
+ if use mpi; then
+ if has_version ">=sys-cluster/openmpi-1.2.9"; then
+ myconf="${myconf} --with-mpi --with-openmpi"
+ elif has_version ">=sys-cluster/mpich2-1.0.8"; then
+ myconf="${myconf} --with-mpi --with-mpich"
+ fi
+ fi
+
+ cd "${MY_S}"
+
+ econf --prefix=${INSTALL_DIR} \
+ --datadir=${INSTALL_DIR}/share/salome \
+ --docdir=${INSTALL_DIR}/doc/salome \
+ --infodir=${INSTALL_DIR}/share/info \
+ --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
+ --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+ --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+ --with-qt=/usr \
+ --with-vtk=${VTKHOME} \
+ --with-vtk-version=${vtk_suffix} \
+ ${myconf} \
+ $(use_enable debug ) \
+ $(use_enable !debug production ) \
+ $(use_with debug cppunit_inc /usr/include/cppunit) \
+ $(use_with opengl opengl /usr) \
+ $(use_with metis metis /usr) \
+ $(use_with scotch scotch /usr) \
+ || die "econf failed"
+}
+
+src_compile() {
+ cd "${MY_S}"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ cd "${MY_S}"
+
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
+
+ echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
+ echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
+ echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
+ echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
+ doenvd 90${P}
+ rm adm_local/Makefile
+ insinto "${INSTALL_DIR}"
+ doins -r adm_local
+
+ use doc && dodoc INSTALL README
+}
+
+pkg_postinst() {
+ elog "Run \`env-update && source /etc/profile\`"
+ elog "now to set up the correct paths."
+ elog ""
+}