sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6

9 files changed, 135 insertions, 469 deletions

diff --git a/sci-misc/salome-smesh/ChangeLog b/sci-misc/salome-smesh/ChangeLog
index 1248ab8c8..5ca1e9844 100644
--- a/sci-misc/salome-smesh/ChangeLog
+++ b/sci-misc/salome-smesh/ChangeLog
@@ -1,5 +1,17 @@
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+
+*salome-smesh-5.1.3 (14 Mar 2010)
+
+  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+  -salome-smesh-3.2.6.ebuild,
+  -files/salome-smesh-3.2.6-amd64-relocation-error.patch,
+  -files/salome-smesh-3.2.6-gcc-4.3.patch,
+  -files/salome-smesh-3.2.6-vtk-5.2.patch,
+  -files/salome-smesh-3.2.6_makefiles.patch,
+  -files/salome-smesh-3.2.6.patch, +salome-smesh-5.1.3.ebuild:
+  Version bump 5.1.3 + removed broken 3.2.6
+
   20 Oct 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +salome-smesh-3.2.6-vtk-5.2.patch
   Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de>
diff --git a/sci-misc/salome-smesh/Manifest b/sci-misc/salome-smesh/Manifest
index 08f71a7b1..19b1bd1b4 100644
--- a/sci-misc/salome-smesh/Manifest
+++ b/sci-misc/salome-smesh/Manifest
@@ -1,9 +1,4 @@
-AUX salome-smesh-3.2.6-amd64-relocation-error.patch 795 RMD160 b75c24f4441888695a0488309f1799d317411db3 SHA1 26cdcf653e3b8b76fa67e7084bf4c7b64326a08e SHA256 cd09fb04bbcdcd6386a52dcd280c7739f2e7fe5e9352b7982527b6fb9c2c28f0
-AUX salome-smesh-3.2.6-gcc-4.3.patch 1819 RMD160 64f383736be1357d90fdcaaa2bcd28e61d3ecb5f SHA1 5e8682ec4917dcb9e1473efb9db8d29c1c978315 SHA256 316a48bde730ce3c5b67fc4a16d6b3e6698c413d921875b21aae2ed8c9b679f2
-AUX salome-smesh-3.2.6-vtk-5.2.patch 1193 RMD160 ee5b3b96d9a65793d6d5e883f8e28525308aec09 SHA1 17fe6508d1aaeb22038f6e9400fe2554170bcbab SHA256 da21d3790d48ae540beaf6d8b78a878537ffdf72e29f4adf42b16b64b32fdf2d
-AUX salome-smesh-3.2.6.patch 10793 RMD160 fa4f8e8db86d6d7d2ecc6b535467c6bd16ac9fe5 SHA1 79cb4dd4370a94f309b4f55da5333584362f5c2f SHA256 0e599d64bf2f22b033cb4fcfb59a06c1e4f7ea41a859518a6ab8d691bec104b2
-AUX salome-smesh-3.2.6_makefiles.patch 1289 RMD160 acb8f3382726b42e149a6c33b561772ea0d91ca6 SHA1 8452437b52bec4879de5a1e245547df919bf1301 SHA256 68a416ec2279ce13e7879a7ec8dcf8e5881efbef45e0433aac4201c539297ab7
-DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-smesh-3.2.6.ebuild 4202 RMD160 d50f7ea595d2a029fa238a8f9788feda94594653 SHA1 5d042fac70ff3115e26048552b64ad2c2c0b3a6e SHA256 33e46d5ebd47d9787f7aa5ae0ecb43d83362af9e4f0778916d963a8197dfd91f
-MISC ChangeLog 1385 RMD160 9b5ac4dc3fb510d2209bb69f57305d569bbaa1c7 SHA1 c97929994d8df9242b911ec82d44b34fbcca70da SHA256 9f1a7aa650c5be18353e677fb5328d8a6bcf98578f7c500efc94d550d0ebbf9c
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-smesh-5.1.3.ebuild 3140 RMD160 06151a8d7fb9ca539cb0d4e6e39021dd210c6a34 SHA1 ecfd4c65b449ebfab4d7f1bab295168d7faab1ea SHA256 06e0deb2571e2c5dea79865f836047a815bdd5e760c726c576fa1ce62054fbd5
+MISC ChangeLog 1809 RMD160 71a8f42402f3696440dd8893d09bc6e2db1adcf7 SHA1 99545b54f700ec192ceaaa1c1b2ec0e3a50810f5 SHA256 f48e6c1f57f39caee9c41f36f0b67731e530b35ca03a314de19bc69e260d336c
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
deleted file mode 100644
index e7df92bc1..000000000
--- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx
---- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx	2008-07-25 09:16:09.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx	2008-07-25 13:09:01.000000000 +0200
-@@ -92,7 +92,7 @@
- /*!
-  * \brief Return an edge from which hypotheses are propagated from
-  */
--TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
-+inline TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
-                                                          const TopoDS_Shape& theEdge)
- {
-   return PropagationMgr::GetSource(theMesh.GetSubMeshContaining( theEdge ));
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch
deleted file mode 100644
index b015022e6..000000000
--- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx
---- src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx	2008-05-25 19:32:52.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx	2008-05-26 03:23:15.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <string>
- #include <stdexcept>
- #include <cassert>
-+#include <cstdlib>
- 
- namespace UNV{
-   using namespace std;
-diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h
---- src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h	2008-05-25 19:32:52.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h	2008-05-26 03:38:58.000000000 +0200
-@@ -31,8 +31,8 @@
- #include <limits.h>   // limites min max int long real ...
- #include <unistd.h>   // gethostname, ...
- #include <stdio.h>
--#include <iostream.h> // pour cout cin ...
--#include <iomanip.h>  // pour le format des io setw, stx, setfill, ...
-+#include <iostream> // pour cout cin ...
-+#include <iomanip>  // pour le format des io setw, stx, setfill, ...
- #include <string.h>   // pour les fonctions sur les chaines de caracteres
- #include <ctype.h>
- #include <stdlib.h>
-diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx
---- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx	2008-05-25 19:32:52.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx	2008-05-26 03:47:51.000000000 +0200
-@@ -37,8 +37,8 @@
- #include "SMESH_MesherHelper.hxx"
- #include "SMESH_Comment.hxx"
- 
--#include <vector.h>
--#include <map.h>
-+#include <vector>
-+#include <map>
- 
- #include <Adaptor3d_Curve.hxx>
- #include <Adaptor3d_Surface.hxx>
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
deleted file mode 100644
index cbb59099d..000000000
--- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
---- src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx	2008-07-25 09:16:09.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx	2008-10-16 01:33:46.000000000 +0200
-@@ -86,7 +86,7 @@
- 
- namespace SMESH {
- 
--  void ReverseConnectivity( vector<int> & ids, int type )
-+  void ReverseConnectivity( vector<vtkIdType> & ids, int type )
-   {
-     // for reverse connectivity of other types keeping the first id, see
-     // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
-@@ -134,7 +134,7 @@
-       reverse( ids.begin(), ids.end() );
-     }
-     else {
--      vector<int> aRevIds( ids.size() );
-+      vector<vtkIdType> aRevIds( ids.size() );
-       for ( int i = 0; i < ids.size(); i++)
-         aRevIds[ i ] = ids[ conn[ i ]];
-       ids = aRevIds;
-@@ -597,7 +597,7 @@
-   if (IsValid() && !mySMESHGUI->isActiveStudyLocked()) {
-     myBusy = true;
-     
--    vector<int> anIds;
-+    vector<vtkIdType> anIds;
- 
-     switch (myType) {
-     case QUAD_EDGE:
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch
deleted file mode 100644
index 14e245be2..000000000
--- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Seulement dans src3.2.6: build
-Seulement dans src3.2.6/SMESH_SRC_3.2.6: aclocal.m4
-Seulement dans src3.2.6/SMESH_SRC_3.2.6: autom4te.cache
-Seulement dans src3.2.6/SMESH_SRC_3.2.6: configure
-Seulement dans src3.2.6/SMESH_SRC_3.2.6: configure.in
-Seulement dans src3.2.6/SMESH_SRC_3.2.6: salome_adm
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx	2007-11-27 23:55:25.000000000 +0100
-@@ -409,10 +409,10 @@
-   myPtsLabeledDataMapper->RemoveAllInputs();
-   myPtsLabeledDataMapper->Delete();
- 
--  myPtsSelectVisiblePoints->UnRegisterAllOutputs();
-+  //myPtsSelectVisiblePoints->UnRegisterAllOutputs();
-   myPtsSelectVisiblePoints->Delete();
- 
--  myPtsMaskPoints->UnRegisterAllOutputs();
-+  //myPtsMaskPoints->UnRegisterAllOutputs();
-   myPtsMaskPoints->Delete();
- 
-   myPointLabels->Delete();
-@@ -425,13 +425,13 @@
-   myClsLabeledDataMapper->RemoveAllInputs();
-   myClsLabeledDataMapper->Delete();
- 
--  myClsSelectVisiblePoints->UnRegisterAllOutputs();
-+  //myClsSelectVisiblePoints->UnRegisterAllOutputs();
-   myClsSelectVisiblePoints->Delete();
- 
--  myClsMaskPoints->UnRegisterAllOutputs();
-+  //myClsMaskPoints->UnRegisterAllOutputs();
-   myClsMaskPoints->Delete();
- 
--  myCellCenters->UnRegisterAllOutputs();
-+  //myCellCenters->UnRegisterAllOutputs();
-   myCellCenters->Delete();
- 
-   myCellsLabels->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_Actor.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx	2007-11-27 23:55:25.000000000 +0100
-@@ -374,7 +374,7 @@
-       for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
- 	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
-       
--      aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
-+      aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
-       SetUnstructuredGrid(aDataSet);
- 
-       aDataSet->GetCellData()->SetScalars(aScalars);
-@@ -434,7 +434,7 @@
-       for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
- 	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
-       
--      aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
-+      aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
-       SetUnstructuredGrid(aDataSet);
- 
-       aDataSet->GetCellData()->SetScalars(aScalars);
-@@ -516,7 +516,7 @@
-     for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
-       aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
-     
--    aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
-+    aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
- 
-     SetUnstructuredGrid(aDataSet);
-     aDataSet->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_DeviceActor.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx	2007-11-27 23:55:25.000000000 +0100
-@@ -84,7 +84,7 @@
-   vtkFloatingPointType multiplier;
-   vtkPoints *newPts;
-   vtkIdList *newCellPts;
--  vtkDataSet *input = this->GetInput();
-+  vtkDataSet *input = (vtkDataSet*) this->GetInput();
-   vtkPointData *pd = input->GetPointData();
-   vtkCellData *cd = input->GetCellData();
-   vtkUnstructuredGrid *output = this->GetOutput();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_ExtractGeometry.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx	2007-11-27 23:55:25.000000000 +0100
-@@ -436,7 +436,7 @@
-   for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
-     aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
- 
--  myGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
-+  myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
-   
-   aCellLocationsArray->Delete();
-   aCellTypesArray->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_Object.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -182,7 +182,7 @@
-     myMapper->RemoveAllInputs();
-     myMapper->Delete();
- 
--    myPlaneSource->UnRegisterAllOutputs();
-+    //myPlaneSource->UnRegisterAllOutputs();
-     myPlaneSource->Delete();
-   };
- 
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_ClippingDlg.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -261,10 +261,10 @@
-       myPtsLabeledDataMapper->RemoveAllInputs();
-       myPtsLabeledDataMapper->Delete();
- 
--      myPtsSelectVisiblePoints->UnRegisterAllOutputs();
-+      //myPtsSelectVisiblePoints->UnRegisterAllOutputs();
-       myPtsSelectVisiblePoints->Delete();
- 
--      myPtsMaskPoints->UnRegisterAllOutputs();
-+      //myPtsMaskPoints->UnRegisterAllOutputs();
-       myPtsMaskPoints->Delete();
- 
-       myPointLabels->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_EditMeshDlg.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -210,7 +210,7 @@
-   for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
-     aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
- 
--  myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );
-+  myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aConnectivity );
- 
-   myPreviewActor->GetMapper()->Update();
- 
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MeshEditPreview.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -1242,7 +1242,7 @@
-       aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
- 
-     aGrid->SetPoints(aPoints);
--    aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity);
-+    aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
- 
-     aConnectivity->Delete();
-     aPoints->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MeshPatternDlg.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -564,7 +564,7 @@
-   aGrid->SetPoints(aPoints);
-   aPoints->Delete();
- 
--  aGrid->SetCells(aCellTypesArray,aCellLocationsArray,aCells);
-+  aGrid->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aCells);
-   aCellLocationsArray->Delete();
-   aCellTypesArray->Delete();
-   aCells->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MoveNodesDlg.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -1346,7 +1346,7 @@
-     aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
- 
-   aGrid->SetPoints(aPoints);
--  aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity);
-+  aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
- 
-   // Create and display actor
-   vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MultiEditDlg.cxx~
-diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx	2007-04-24 18:41:03.000000000 +0200
-+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx	2007-11-27 23:55:26.000000000 +0100
-@@ -158,10 +158,10 @@
-       vtkIdType npts;
-       aCellLocationsArray->SetValue(0, aCells->GetTraversalLocation(npts));
- 
--      aGrid->SetCells(aCellTypesArray, aCellLocationsArray, aCells);
-+      aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aCells);
- 
-       aGrid->SetPoints(myPoints);
--      aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aCells);
-+      aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aCells);
-       aCellLocationsArray->Delete();
-       aCellTypesArray->Delete();
-       aCells->Delete();
-Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_NodesDlg.cxx~
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch
deleted file mode 100644
index 078fd5a4f..000000000
--- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./SMESH_SRC_3.2.6/build_configure.org	2007-04-24 18:41:03.000000000 +0200
-+++ ./SMESH_SRC_3.2.6/build_configure	2008-01-08 14:51:09.000000000 +0100
-@@ -135,7 +135,7 @@
- 
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
- echo "" >> 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  "" >> configure.in_tmp1
- echo "AC_OUTPUT([ \\" >> configure.in_tmp1
---- ./SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in.org	2007-04-24 18:41:03.000000000 +0200
-+++ ./SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in	2008-01-08 14:52:25.000000000 +0100
-@@ -30,7 +30,7 @@
- @COMMENCE@
- 
- usr_docs:
--	cp -fr $(srcdir)/SMESH ./
-+#	cp -fr $(srcdir)/SMESH ./
- 	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
- 
- docs: usr_docs
---- ./SMESH_SRC_3.2.6/adm_local/Makefile.in.org	2007-04-24 18:41:03.000000000 +0200
-+++ ./SMESH_SRC_3.2.6/adm_local/Makefile.in	2008-01-08 14:53:50.000000000 +0100
-@@ -27,12 +27,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:
- 
diff --git a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
deleted file mode 100644
index c9b04ce21..000000000
--- a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
+++ /dev/null
@@ -1,144 +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. SMESH 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"
-
-RDEPEND="opengl?  ( virtual/opengl )
-	 mpi?     ( sys-cluster/mpich2 )
-	 debug?   ( dev-util/cppunit )"
-
-DEPEND="${RDEPEND}
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-med-${PV}
-	>=sci-misc/salome-geom-${PV}"
-
-MODULE_NAME="SMESH"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-SMESH_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}.patch
-	epatch "${FILESDIR}"/${P}_makefiles.patch
-
-	# Gcc 4.3 support
-	if version_is_at_least "4.3" $(gcc-version) ; then
-		epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	fi
-	
-	# If vtk-5.O is used, include directory is named vtk-5.0 and not vtk
-	if has_version ">=sci-libs/vtk-5.0" && has_version "<=sci-libs/vtk-5.2" ; then
-		append-flags -I/usr/include/vtk-5.0
-	fi
-	# If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk
-	if has_version ">=sci-libs/vtk-5.2" ; then
-	   append-flags -I/usr/include/vtk-5.2
-	   epatch "${FILESDIR}"/${P}-vtk-5.2.patch
-	fi
-
-	# fix relocation error
-	if use amd64 ; then
-		epatch "${FILESDIR}"/${P}-amd64-relocation-error.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-visu 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
-	# 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
-
-	# 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
-	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-smesh/salome-smesh-5.1.3.ebuild b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild
new file mode 100644
index 000000000..7ab67a9e1
--- /dev/null
+++ b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild
@@ -0,0 +1,119 @@
+# 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
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. SMESH 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 opengl"
+
+RDEPEND="opengl?  ( virtual/opengl )
+		 mpi?     ( || ( sys-cluster/openmpi[cxx]
+		 				 sys-cluster/mpich2[cxx] ) )
+		 debug?   ( dev-util/cppunit )
+		 >=sci-misc/salome-kernel-${PV}
+		 >=sci-misc/salome-med-${PV}
+		 >=sci-misc/salome-geom-${PV}
+		 >=dev-python/omniorbpy-3.4
+		 >=net-misc/omniORB-4.1.4
+		 >=x11-libs/qt-core-4.5.2
+		 >=x11-libs/qt-gui-4.5.2
+		 >=x11-libs/qt-opengl-4.5.2
+		 >=x11-libs/qwt-5.2
+		 >=dev-libs/boost-1.40.0
+		 >=sci-libs/opencascade-6.3
+		 >=sci-libs/hdf5-1.6.4
+		 >=sci-libs/med-2.3.5
+		 >=sci-libs/vtk-5.0[python]"
+
+DEPEND="${RDEPEND}
+		dev-lang/swig
+		>=app-doc/doxygen-1.5.6
+		media-gfx/graphviz
+		>=dev-python/docutils-0.4"
+
+MODULE_NAME="SMESH"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+
+PYVER=$(python_get_version)
+
+pkg_setup() {
+	[[ ${PYVER} > 2.4 ]] && \
+		ewarn "Python 2.4 is highly recommended for Salome..."
+}
+
+src_prepare() {
+	cd "${MY_S}"
+
+	rm -r -f autom4te.cache
+	./build_configure
+}
+
+src_configure() {
+	cd "${MY_S}"
+
+	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"
+
+	# 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 \
+		  --with-vtk=${VTKHOME} \
+		  --with-vtk-version=${vtk_suffix} \
+		  --with-qt='/usr' \
+		  --with-qwt_inc='/usr/include/qwt5' \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with opengl opengl /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
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+}