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

13 files changed, 151 insertions, 922 deletions

diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog
index a3c8f02ff..a36b6e7f2 100644
--- a/sci-misc/salome-gui/ChangeLog
+++ b/sci-misc/salome-gui/ChangeLog
@@ -1,5 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+
+*salome-gui-5.1.3 (14 Mar 2010)
+
+  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+  -salome-gui-3.2.6.ebuild, -files/salome-gui-3.2.6-gcc-4.3.patch,
+  -files/salome-gui-3.2.6-vtk-5.2.patch,
+  -files/salome-gui-3.2.6_configure_in_base.patch,
+  -files/salome-gui-3.2.6_pyobject.patch,
+  -files/salome-gui-3.2.6_qwt-4.patch,
+  -files/salome-gui-3.2.6_sip-4.1.7.patch, -files/salome-gui-3.2.6.patch,
+  -files/salome-gui-vtk-5.0.patch, +salome-gui-5.1.3.ebuild,
+  +files/salome-gui-5.1.3-qt4-path.patch:
+  Version bump 5.1.3 + removed broken 3.2.6
+
   20 Oct 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +salome-gui-3.2.6-vtk-5.2.patch
   Added support to vtk 5.2 and QT-3.3.8b. Patch provided by Bert Karwatzki <spasswolf@web.de>
diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest
index 4af530d64..6c2623fee 100644
--- a/sci-misc/salome-gui/Manifest
+++ b/sci-misc/salome-gui/Manifest
@@ -1,12 +1,5 @@
-AUX salome-gui-3.2.6-gcc-4.3.patch 2808 RMD160 18acd8191f87846712fe1a49a9cf0ede36c8d1e9 SHA1 aa0a2de9c868daee034f286d43074770313f3589 SHA256 363e9c3c194a7124a091ff6ddc8afc3a448de203a2a5cfbb26eb61ba815a97e8
-AUX salome-gui-3.2.6-vtk-5.2.patch 8949 RMD160 6a969ca06714858735cc04c3e8e62312227b8054 SHA1 73681781173b54e998ff36a11d5b0163d4879f8e SHA256 b9f0ccfa4b55dfdeb78b10ea7c6133634e18a3684cccba441d44a5f7040aad26
-AUX salome-gui-3.2.6.patch 3127 RMD160 2440a51dd74e2d7abda68b33f907de036c1653de SHA1 9e689187cc6b89f53c0f8e89c2cb86cc059df19a SHA256 9a9466186799c2f30b5ab9996537128681495d1be18a2dbb060f855f2936d6d7
-AUX salome-gui-3.2.6_configure_in_base.patch 4588 RMD160 feab6b36319891f65665280d8f6e3e50078ec2f9 SHA1 abf258e19af6601f64215b9d0cc1fadc942f8025 SHA256 2ce9d880a0d7a4be6fca4ac5c1d2b927bd80c25aae41c4ee56eef2007dfe42d4
-AUX salome-gui-3.2.6_pyobject.patch 535 RMD160 fa4f7002be33a33ee6a4b3ff3e6ca09f982c0b92 SHA1 27174db2f84912b77cb117fd1bf7216e67a1088a SHA256 8d7589b22717ee3305917d6696ecbd899b1c67c1e71b83f7771924f8b7c3df43
-AUX salome-gui-3.2.6_qwt-4.patch 1853 RMD160 921d470a2aa3be47113c6c0f1cf6d913d08ae47f SHA1 7a35b01bcda7d63b357fd67bd48be16cbf4438fb SHA256 c7fc34c220f4d19896783f43e444de245eae5d8464315fa55d0093adfc0e2b97
-AUX salome-gui-3.2.6_sip-4.1.7.patch 785 RMD160 0531e5ab612a973359ed96ce6afdbe09c0894678 SHA1 35207f32922b48782b08b17e85dcae596cfb2123 SHA256 daf7c76dfead2da15a4857849d119843ae5702f163c5d4a45404cdd8fd706185
-AUX salome-gui-vtk-5.0.patch 8618 RMD160 e529f86abaad3991ba9e4d9664bf0b55dd9a6bbc SHA1 02cfa2dea47e8d3b8eff50ab90fb6acf2e15befd SHA256 15489b2ee67611077a7e988fcafdab20dab59335a34519baef6797ac4b4e2c30
-DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-gui-3.2.6.ebuild 4806 RMD160 c18e6387c3b105db11071e8b6fee5f55f8779548 SHA1 949318d00bf911b00ba5c84e63d880312bd223a5 SHA256 0bc3601a61966009e078ec680159a531bcc515475e6051a57fc0a4e3bda16b8c
-MISC ChangeLog 1516 RMD160 fd35856ebe9b6dc9732457ec0065e7a894c31ef4 SHA1 96c11ffd809648fd8b1e62507bca9b06edc36e42 SHA256 23f0eae8944f4bd31a5f25ac92855f7ffbd16d330b8cf865b09450d4f1322cb5
+AUX salome-gui-5.1.3-qt4-path.patch 466 RMD160 eccedc638d748a4cfa0e394ebe04cc748bacbc5e SHA1 539a3105d97c38a4d30fd8e8620af63fe4278568 SHA256 051e0e2c75328e4a9b301d33ba77944befbc2603c656c096a05db8cb64f70fc0
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-gui-5.1.3.ebuild 3194 RMD160 09db3f07fba1f7e90c374b0d8a1d3eeb307cd8b4 SHA1 d79e87f15ad3dd7ec251414d199129cf12ceddb4 SHA256 2377bd6e7eb606cdc017204ffcfbcac68e9cc1f71d3ef1c04a1a3976113de06a
+MISC ChangeLog 2073 RMD160 a54c5af7f69746202dacd9f76aa5f1751b37593b SHA1 b9e6151d569ab4fd580e499d59ef015446bdb368 SHA256 75f51c8cfc00245e7c1028ab8718e1036b967a3f3a848648c96a690d7ddbfd16
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
deleted file mode 100644
index 63eab18b9..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx	2008-05-26 00:04:12.000000000 +0200
-@@ -27,7 +27,9 @@
- 
- #include <GL/gl.h>
- 
--#include <iostream.h>
-+#include <iostream>
-+
-+using std::cout;
- 
- /*!
-   Constructor
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx	2008-05-26 00:38:10.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <qstringlist.h>
- #include <qapplication.h>
- #include <iostream>
-+#include <cstdlib>
- 
- /*!
-   \return the SALOME version number
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx	2008-05-26 00:28:19.000000000 +0200
-@@ -36,7 +36,7 @@
- #include <qdict.h>
- 
- #include "utilities.h"
--#include <iostream.h>
-+#include <iostream>
- #include <string>
- #include <vector>
- 
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx	2008-05-25 23:41:44.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <qdir.h>
- #include <qapplication.h>
- #include <qregexp.h>
-+#include <cstdlib>
- 
- /*!
-     Constructor
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx	2008-05-26 00:19:17.000000000 +0200
-@@ -67,7 +67,7 @@
- //VRV: porting on Qt 3.0.5
- #include <algorithm>
- 
--#include <iostream.h>
-+#include <iostream>
- 
- using namespace std;
- 
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx	2008-05-26 00:12:09.000000000 +0200
-@@ -31,6 +31,7 @@
- 
- #include <set>
- #include <map>
-+#include <algorithm>
- 
- #include <vtkUnstructuredGrid.h>
- #include <vtkGeometryFilter.h>
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch
deleted file mode 100644
index 0f7efaf90..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4
---- src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4	2008-10-16 23:05:29.000000000 +0200
-@@ -76,7 +76,7 @@
- if test -z $VTKHOME
- then 
-    AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
--   if test -f /usr/include/vtk/vtkPlane.h ; then
-+   if test -f /usr/include/vtk-5.2/vtkPlane.h ; then
-       AC_MSG_RESULT(trying /usr)
-       VTKHOME="/usr"
-    fi
-@@ -84,9 +84,9 @@
- 
- if test ! -z $VTKHOME
- then
--   LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
--   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS"
--   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS"
-+   LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.2 $LOCAL_INCLUDES"
-+   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
-+   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
- fi
- 
- dnl vtk headers
-@@ -142,4 +142,4 @@
- # Save cache
- AC_CACHE_SAVE
- 
--])dnl
-\ Kein Zeilenumbruch am Dateiende.
-+])dnl
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip	2008-10-16 23:05:29.000000000 +0200
-@@ -13,7 +13,7 @@
- 
- class SALOME_Selection : QObject
- {
--%HeaderCode
-+%TypeHeaderCode
- #include <SalomePyQt.h>
- %End
- 
-@@ -75,7 +75,7 @@
- 
- class SalomePyQt
- {
--%HeaderCode
-+%TypeHeaderCode
- #include <SalomePyQt.h>
- %End
- 
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -46,8 +46,8 @@
- #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"
- #endif
- 
--#include <sipqtQWidget.h>
--#include <sipqtQPopupMenu.h>
-+//#include <sipqtQWidget.h>
-+//#include <sipqtQPopupMenu.h>
- 
- #include <CORBA.h>
- 
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx	2008-10-16 23:12:43.000000000 +0200
-@@ -143,7 +143,7 @@
-   if(int aNbOfParts = theMapIndex.Extent()){
-     vtkPoints *aPoints = vtkPoints::New();
-     aPoints->SetNumberOfPoints(aNbOfParts);
--    for(int i = 0; i < aNbOfParts; i++){
-+    for(vtkIdType i = 0; i < aNbOfParts; i++){
-       int aPartId = theMapIndex( i+1 );
-       if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){
- 	aPoints->SetPoint(i,aCoord);
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -119,8 +119,8 @@
-   vtkIdType aPntStartId = 0;
-   vtkIdType aCellStartId = 0;
- 
--  for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){
--    vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);
-+  for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){
-+    vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId));
-     // Do mapping of the nodes
-     if(!GetSharedPointsDataSet()){
-       vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
-@@ -265,11 +265,11 @@
- 
-   numCells = 0;
- 
--  vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);
-+  vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems());
-   int firstCD=1;
- 
--  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
--    ds = (vtkDataSet *)(this->Inputs[idx]);
-+  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
-+    ds = (vtkDataSet *)(this->GetInput(idx));
-     if (ds != NULL)  {
-       if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 )  {
-         continue; //no input, just skip
-@@ -308,8 +308,8 @@
-   output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
- 
-   // 2.cells
--  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
--    ds = (vtkDataSet *)(this->Inputs[idx]);
-+  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
-+    ds = (vtkDataSet *)(this->GetInput(idx));
-     if (ds != NULL) {
-       numCells = ds->GetNumberOfCells(); 
-       cd = ds->GetCellData();
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -240,7 +240,7 @@
- 	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
- 	  aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
- 	}
--	anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+	anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
- 	anOutput->SetPoints(anInput->GetPoints());
- 	aCellLocationsArray->Delete();
-       }
-@@ -329,7 +329,7 @@
-       for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
- 	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-       }
--      anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+      anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
-       anOutput->SetPoints(anInput->GetPoints());
-       aCellLocationsArray->Delete();
-     }
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -80,7 +80,7 @@
- VTKViewer_GeometryFilter
- ::Execute()
- {
--  vtkDataSet *input= this->GetInput();
-+  vtkDataSet *input= (vtkDataSet*) this->GetInput();
-   vtkIdType numCells=input->GetNumberOfCells();
- 
-   if (numCells == 0)
-@@ -134,7 +134,8 @@
-   vtkIdType newCellId;
-   int faceId, *faceVerts, numFacePts;
-   vtkFloatingPointType *x;
--  int PixelConvert[4], aNewPts[VTK_CELL_SIZE];
-+  int PixelConvert[4];
-+  vtkIdType aNewPts[VTK_CELL_SIZE];
-   // ghost cell stuff
-   unsigned char  updateLevel = (unsigned char)(output->GetUpdateGhostLevel());
-   unsigned char  *cellGhostLevels = 0;  
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -58,7 +58,7 @@
-   vtkFloatingPointType center[3], *p, pt[3];
-   vtkPointData *pd, *outPD;;
-   vtkIdList *ptIds, *newPtIds;
--  vtkDataSet *input= this->GetInput();
-+  vtkDataSet *input= (vtkDataSet*) this->GetInput();
-   vtkUnstructuredGrid *output = this->GetOutput();
-   vtkIdType tenth;
-   vtkFloatingPointType decimal;
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx	2008-10-16 23:05:29.000000000 +0200
-@@ -43,8 +43,8 @@
-   vtkPoints *inPts;
-   vtkPoints *newPts;
-   int numPts, numCells;
--  vtkPointSet *input = this->GetInput();
--  vtkPointSet *output = this->GetOutput();
-+  vtkPointSet *input = (vtkPointSet*) this->GetInput();
-+  vtkPointSet *output = (vtkPointSet*) this->GetOutput();
-   vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData();
-   vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData();
-   output->CopyStructure( input );
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
deleted file mode 100644
index c5a9988ab..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org	2007-04-24 18:41:04.000000000 +0200
-+++ GUI_SRC_3.2.6/doc/salome/gui/Makefile.in	2008-01-03 12:51:11.000000000 +0100
-@@ -28,7 +28,7 @@
- @COMMENCE@
- 
- usr_docs:
--	cp -fr $(srcdir)/GUI ./
-+#	cp -fr $(srcdir)/GUI ./
- 	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
- 
- docs: usr_docs
---- ./GUI_SRC_3.2.6/adm_local/Makefile.in.org     2007-04-24 18:41:04.000000000 +0200
-+++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200
-@@ -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:
-
---- ./GUI_SRC_3.2.6/build_configure.org   2007-04-24 18:41:04.000000000 +0200
-+++ ./GUI_SRC_3.2.6/build_configure       2007-05-26 12:29:53.000000000 +0200
-@@ -109,7 +109,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
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4
---- ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4.org	2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4	2007-11-25 19:15:45.000000000 +0100
-@@ -50,6 +50,10 @@
-            SIP_VERS=v4_new ;;
-          4.5*)
-            SIP_VERS=v4_new ;;
-+	 4.6*)
-+	   SIP_VERS=v4_new ;;
-+	 4.7*)
-+	   SIP_VERS=v4_new ;;
-          *)
-            AC_MSG_RESULT(sip version $version not supported)
-            SIP_VERS=unsupported ;;
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in
---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org	2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in	2007-11-25 19:14:50.000000000 +0100
-@@ -41,6 +41,12 @@
- ifeq ($(QT_VERS),Qt_3_3_7)
- QT_VERS = Qt_3_3_0
- endif
-+ifeq ($(QT_VERS),Qt_3_3_8)
-+QT_VERS = Qt_3_3_0
-+endif
-+ifeq ($(QT_VERS),Qt_3_3_8b)
-+QT_VERS = Qt_3_3_6
-+endif
- 
- # Sip flags
- SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org	2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in	2007-11-25 19:14:21.000000000 +0100
-@@ -44,6 +44,14 @@
- QT_VERS = Qt_3_3_0
- endif
- 
-+ifeq ($(QT_VERS),Qt_3_3_8)
-+QT_VERS = Qt_3_3_0
-+endif
-+
-+ifeq ($(QT_VERS),Qt_3_3_8b)
-+QT_VERS = Qt_3_3_6
-+endif
-+
- # Sip flags
- SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
- 
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
deleted file mode 100644
index 71044edad..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Seulement dans src3.2.6/GUI_SRC_3.2.6: #configure.in.base#
-diff -abur src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base src3.2.6/GUI_SRC_3.2.6/configure.in.base
---- src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base	2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/configure.in.base	2008-03-24 16:41:34.000000000 +0100
-@@ -35,37 +35,82 @@
- ########################################################################
- # Check --disable-corba-gen and other --disable-* options
- 
--GUI_DISABLE_CORBA="no"
--DISABLE_PYCONSOLE="no"
--DISABLE_GLVIEWER="no"
--DISABLE_PLOT2DVIEWER="no"
--DISABLE_SUPERVGRAPHVIEWER="no"
--DISABLE_OCCVIEWER="no"
--DISABLE_VTKVIEWER="no"
--DISABLE_SALOMEOBJECT="no"
--
--for option
--do
--  case $option in
--      -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen)
--          GUI_DISABLE_CORBA="yes";;
--      -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole)
--          DISABLE_PYCONSOLE="yes";;
--      -disable-glViewer=yes | --disable-glViewer=yes | -disable-glViewer | --disable-glViewer)
--          DISABLE_GLVIEWER="yes";;
--      -disable-plot2dViewer=yes | --disable-plot2dViewer=yes | -disable-plot2dViewer | --disable-plot2dViewer)
--          DISABLE_PLOT2DVIEWER="yes";;
--      -disable-supervGraphViewer=yes | --disable-supervGraphViewer=yes | \
--      -disable-supervGraphViewer | --disable-supervGraphViewer)
--          DISABLE_SUPERVGRAPHVIEWER="yes";;
--      -disable-occViewer=yes | --disable-occViewer=yes | -disable-occViewer | --disable-occViewer)
--          DISABLE_OCCVIEWER="yes";;
--      -disable-vtkViewer=yes | --disable-vtkViewer=yes | -disable-vtkViewer | --disable-vtkViewer)
--          DISABLE_VTKVIEWER="yes";;
--      -disable-salomeObject=yes | --disable-salomeObject=yes | -disable-salomeObject | --disable-salomeObject)
--          DISABLE_SALOMEOBJECT="yes";;
--  esac
--done
-+AC_ARG_ENABLE([corba-gen],
-+              [--enable-corba-gen],
-+              [if test x$enableval = "xyes"; then
-+                 GUI_DISABLE_CORBA="no";
-+               elif test x$enableval = "xno"; then
-+                 GUI_DISABLE_CORBA="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([pyConsole],
-+              [--enable-pyConsole],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_PYCONSOLE="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_PYCONSOLE="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([glViewer],
-+              [--enable-glViewer],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_GLVIEWER="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_GLVIEWER="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([plot2dViewer],
-+              [--enable-plot2dViewer],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_PLOT2DVIEWER="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_PLOT2DVIEWER="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([supervGraphViewer],
-+              [--enable-supervGraphViewer],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_SUPERVGRAPHVIEWER="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_SUPERVGRAPHVIEWER="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([occViewer],
-+              [--enable-occViewer],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_OCCVIEWER="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_OCCVIEWER="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
-+
-+AC_ARG_ENABLE([salomeObject],
-+              [--enable-salomeObject],
-+              [if test x$enableval = "xyes"; then
-+                 DISABLE_SALOMEOBJECT="no";
-+               elif test x$enableval = "xno"; then
-+                 DISABLE_SALOMEOBJECT="yes";
-+               else
-+                 echo "Error : unknown value : $enableval"
-+		 exit 1
-+               fi])
- 
- dnl
- dnl Initialize source and build root directories
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
deleted file mode 100644
index 0607ae387..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-09-04 10:20:58.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-09-04 10:21:43.000000000 +0200
-@@ -764,7 +764,7 @@
-       if ( PyDict_Check( res1 ) ) {
-         PyObject* key;
-         PyObject* value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while ( PyDict_Next( res1, &pos, &key, &value ) ) {
- 	  // parse the return value
- 	  // it should be a map: {integer:integer}
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
deleted file mode 100644
index c4c703cd9..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4.org	2008-02-19 14:43:03.000000000 +0100
-+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4	2008-02-19 14:46:31.000000000 +0100
-@@ -27,17 +27,17 @@
-   exits_ok=no	
-   if test "x$exits_ok" = "xno"; then
-      for d in /usr/local /usr ; do
--        AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exits_ok=yes,exits_ok=no)
-+        AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no)
-         if test "x$exits_ok" = "xyes"; then
-            QWTHOME=$d
--           AC_MSG_RESULT(libqwt.so detected in $d/lib)
-+           AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
-         fi
-      done
-   fi
-   if test "x$exits_ok" = "xno"; then
-      for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
--        if test -f $d/libqwt.so ; then
--           AC_MSG_RESULT(libqwt.so detected in $d)
-+        if test -f $d/libqwt.so.4 ; then
-+           AC_MSG_RESULT(libqwt.so.4 detected in $d)
-            QWTHOME=$d
-            QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-            exits_ok=yes
---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4_orig	2008-01-06 12:46:14.000000000 +0100
-+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4	2008-01-06 13:16:14.000000000 +0100
-@@ -96,9 +96,9 @@
-   fi
-   if test "x$QWTHOME" = "x/usr"
-   then
--    LIBS="$LIBS -lqwt"
-+    LIBS="$LIBS -l:libqwt.so.4"
-   else
--    LIBS="$LIBS -L$QWTHOME/lib -lqwt"
-+    LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
-   fi
- 
-   CXXFLAGS_old=$CXXFLAGS
-@@ -126,9 +126,9 @@
-     QWT_INCLUDES="-I$QWT_INCLUDES"
-     if test "x$QWTHOME" = "x/usr"
-     then
--      QWT_LIBS=" -lqwt"
-+      QWT_LIBS=" -l:libqwt.so.4"
-     else
--      QWT_LIBS="-L$QWTHOME/lib -lqwt"
-+      QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4"
-     fi
- 
-     AC_SUBST(QWT_INCLUDES)
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
deleted file mode 100644
index f389a65a4..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip	2007-12-21 23:04:12.000000000 +0100
-+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip	2007-12-21 23:05:26.000000000 +0100
-@@ -63,6 +63,43 @@
-   PT_User
- };
- 
-+%ModuleCode
-+
-+enum MenuName {
-+  File        = 1,
-+  View        = 2,
-+  Edit        = 3,
-+  Preferences = 4,
-+  Tools       = 5,
-+  Window      = 6,
-+  Help        = 7  
-+};
-+
-+enum WindowType {
-+  WT_ObjectBrowser,
-+  WT_PyConsole,
-+  WT_LogWindow,
-+  WT_User
-+};
-+
-+enum PrefType { 
-+  PT_Space,
-+  PT_Bool, 
-+  PT_Color,
-+  PT_String, 
-+  PT_Selector, 
-+  PT_DblSpin, 
-+  PT_IntSpin, 
-+  PT_Double, 
-+  PT_Integer, 
-+  PT_GroupBox, 
-+  PT_Font, 
-+  PT_DirList, 
-+  PT_File, 
-+  PT_User
-+};
-+%End
-+
- class QtxAction : QAction
- {
- %TypeHeaderCode
diff --git a/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..da9c6d089
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/GUI_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-gui/files/salome-gui-vtk-5.0.patch b/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
deleted file mode 100644
index 032ed937f..000000000
--- a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4	2007-05-26 12:32:50.000000000 +0200
-@@ -76,7 +76,7 @@
- if test -z $VTKHOME
- then 
-    AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
--   if test -f /usr/include/vtk/vtkPlane.h ; then
-+   if test -f /usr/include/vtk-5.0/vtkPlane.h ; then
-       AC_MSG_RESULT(trying /usr)
-       VTKHOME="/usr"
-    fi
-@@ -84,9 +84,9 @@
- 
- if test ! -z $VTKHOME
- then
--   LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
--   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS"
--   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS"
-+   LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.0 $LOCAL_INCLUDES"
-+   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
-+   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
- fi
- 
- dnl vtk headers
-@@ -142,4 +142,4 @@
- # Save cache
- AC_CACHE_SAVE
- 
--])dnl
-\ No newline at end of file
-+])dnl
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: autom4te.cache
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure.in
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: salome_adm
-diff -abur /home/francois/Desktop/salome/src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
---- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip	2007-11-26 00:18:40.000000000 +0100
-@@ -13,7 +13,7 @@
- 
- class SALOME_Selection : QObject
- {
--%HeaderCode
-+%TypeHeaderCode
- #include <SalomePyQt.h>
- %End
- 
-@@ -75,7 +75,7 @@
- 
- class SalomePyQt
- {
--%HeaderCode
-+%TypeHeaderCode
- #include <SalomePyQt.h>
- %End
- 
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt: SalomePyQt.sip~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2007-11-25 23:34:31.000000000 +0100
-@@ -46,8 +46,8 @@
- #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"
- #endif
- 
--#include <sipqtQWidget.h>
--#include <sipqtQPopupMenu.h>
-+//#include <sipqtQWidget.h>
-+//#include <sipqtQPopupMenu.h>
- 
- #include <CORBA.h>
- 
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI: SALOME_PYQT_Module.cxx~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx	2007-11-25 21:39:54.000000000 +0100
-@@ -119,8 +119,8 @@
-   vtkIdType aPntStartId = 0;
-   vtkIdType aCellStartId = 0;
- 
--  for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){
--    vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);
-+  for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){
-+    vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId));
-     // Do mapping of the nodes
-     if(!GetSharedPointsDataSet()){
-       vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
-@@ -265,11 +265,11 @@
- 
-   numCells = 0;
- 
--  vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);
-+  vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems());
-   int firstCD=1;
- 
--  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
--    ds = (vtkDataSet *)(this->Inputs[idx]);
-+  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
-+    ds = (vtkDataSet *)(this->GetInput(idx));
-     if (ds != NULL)  {
-       if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 )  {
-         continue; //no input, just skip
-@@ -308,8 +308,8 @@
-   output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
- 
-   // 2.cells
--  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
--    ds = (vtkDataSet *)(this->Inputs[idx]);
-+  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
-+    ds = (vtkDataSet *)(this->GetInput(idx));
-     if (ds != NULL) {
-       numCells = ds->GetNumberOfCells(); 
-       cd = ds->GetCellData();
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_AppendFilter.cxx~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx	2007-11-25 20:53:53.000000000 +0100
-@@ -240,7 +240,7 @@
- 	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
- 	  aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
- 	}
--	anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+	anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
- 	anOutput->SetPoints(anInput->GetPoints());
- 	aCellLocationsArray->Delete();
-       }
-@@ -329,7 +329,7 @@
-       for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
- 	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-       }
--      anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+      anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
-       anOutput->SetPoints(anInput->GetPoints());
-       aCellLocationsArray->Delete();
-     }
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ExtractUnstructuredGrid.cxx~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx	2007-11-25 20:55:38.000000000 +0100
-@@ -80,7 +80,7 @@
- VTKViewer_GeometryFilter
- ::Execute()
- {
--  vtkDataSet *input= this->GetInput();
-+  vtkDataSet *input= (vtkDataSet*) this->GetInput();
-   vtkIdType numCells=input->GetNumberOfCells();
- 
-   if (numCells == 0)
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_GeometryFilter.cxx~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx	2007-11-25 21:40:41.000000000 +0100
-@@ -58,7 +58,7 @@
-   vtkFloatingPointType center[3], *p, pt[3];
-   vtkPointData *pd, *outPD;;
-   vtkIdList *ptIds, *newPtIds;
--  vtkDataSet *input= this->GetInput();
-+  vtkDataSet *input= (vtkDataSet*) this->GetInput();
-   vtkUnstructuredGrid *output = this->GetOutput();
-   vtkIdType tenth;
-   vtkFloatingPointType decimal;
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ShrinkFilter.cxx~
-diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx
---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx	2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx	2007-11-25 21:41:40.000000000 +0100
-@@ -43,8 +43,8 @@
-   vtkPoints *inPts;
-   vtkPoints *newPts;
-   int numPts, numCells;
--  vtkPointSet *input = this->GetInput();
--  vtkPointSet *output = this->GetOutput();
-+  vtkPointSet *input = (vtkPointSet*) this->GetInput();
-+  vtkPointSet *output = (vtkPointSet*) this->GetOutput();
-   vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData();
-   vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData();
-   output->CopyStructure( input );
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_TransformFilter.cxx~
diff --git a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
deleted file mode 100644
index 928691cd3..000000000
--- a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
+++ /dev/null
@@ -1,163 +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. GUI 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 vtkviewer"
-
-RDEPEND="opengl?  ( virtual/opengl )
-	 mpi?     ( sys-cluster/mpich2 )
-	 debug?   ( dev-util/cppunit )"
-
-DEPEND="${RDEPEND}
-	 >=sci-misc/salome-kernel-${PV}"
-
-MODULE_NAME="GUI"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GUI_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 "${WORKDIR}/src${PV}"
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${P}_sip-4.1.7.patch
-	epatch "${FILESDIR}"/${P}_qwt-4.patch
-	epatch "${FILESDIR}"/${P}_configure_in_base.patch
-
-	# Python 2.5 support
-	if version_is_at_least "2.5" "${PYVER}"; then
-		epatch "${FILESDIR}"/${P}_pyobject.patch
-	fi
-
-	# 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
-	   epatch "${FILESDIR}"/${P}-vtk-5.0.patch
-	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
-
-	cd "${MY_S}"
-
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-
-src_compile() {
-	local myconf=""
-	cd "${MY_S}"
-
-	# CXXFLAGS are slightly modified to allow the compilation of
-	# salome-gui 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
-
-	# Quick hack to fix the patch to vtkLibs
-	append-flags -L/usr/$(get_libdir)/python${PYVER}/site-packages/vtk
-
-	# Fix a bug concerning a missing header	
-	append-flags -I${MY_S}/../KERNEL_SRC_${PV}/src/Basics/Test
-
-	# Specifying --without-<flag> for 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-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 \
-	      --enable-corba-gen \
-	      --enable-pyConsole \
-	      --enable-glViewer \
-	      --enable-plot2dViewer \
-	      --enable-supervGraphViewer \
-	      --enable-occViewer \
-	      --enable-salomeObject \
-	      ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit /usr ) \
-	      $(use_with opengl opengl /usr) \
-	      $(use_enable vtkviewer vtkViewer) \
-	|| 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 AUTHORS INSTALL NEWS README README.FIRST.txt
-	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-gui/salome-gui-5.1.3.ebuild b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild
new file mode 100644
index 000000000..93334abb4
--- /dev/null
+++ b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild
@@ -0,0 +1,121 @@
+# 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. GUI 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 opengl"
+
+RDEPEND="opengl?  ( virtual/opengl )
+		 debug?   ( dev-util/cppunit )
+		 >=sci-misc/salome-kernel-${PV}
+		 >=net-misc/omniORB-4.1.4
+		 >=dev-python/omniorbpy-3.4
+		 >=sci-libs/hdf5-1.6.4
+		 >=dev-libs/boost-1.40.0
+		 >=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-python/PyQt4-4.5.4
+		 >=sci-libs/vtk-5.0[python]
+		 >=sci-libs/opencascade-6.3
+		 app-text/dgs"
+
+DEPEND="${RDEPEND}
+		>=app-doc/doxygen-1.5.6
+		media-gfx/graphviz
+		>=dev-python/sip-4.8.2
+		dev-lang/swig
+		dev-libs/libxml2"
+
+MODULE_NAME="GUI"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+GUI_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}"
+
+	epatch "${FILESDIR}"/${P}-qt4-path.patch
+
+	rm -r -f autom4te.cache
+	./clean_configure
+	./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"
+
+	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-qwt=/usr \
+		  --with-qwt_inc=/usr/include/qwt5 \
+		  --with-vtk=${VTKHOME} \
+		  --with-vtk-version=${vtk_suffix} \
+		  ${myconf} \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with debug cppunit /usr ) \
+	      $(use_with opengl opengl /usr) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	cd "${MY_S}"
+
+	MAKEOPTS="-j1" 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 AUTHORS INSTALL NEWS README
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+}