Added support to VTK 5.2

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

5 files changed, 211 insertions, 11 deletions

diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog
index 37a169776..a3c8f02ff 100644
--- a/sci-misc/salome-gui/ChangeLog
+++ b/sci-misc/salome-gui/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+  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>
 
   04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
   salome-gui-3.2.6.ebuild, +files/salome-gui-3.2.6_pyobject.patch:
diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest
index 2645fda89..4af530d64 100644
--- a/sci-misc/salome-gui/Manifest
+++ b/sci-misc/salome-gui/Manifest
@@ -1,11 +1,12 @@
 AUX salome-gui-3.2.6-gcc-4.3.patch 2808 RMD160 18acd8191f87846712fe1a49a9cf0ede36c8d1e9 SHA1 aa0a2de9c868daee034f286d43074770313f3589 SHA256 363e9c3c194a7124a091ff6ddc8afc3a448de203a2a5cfbb26eb61ba815a97e8
-AUX salome-gui-3.2.6.patch 3012 RMD160 22fb336711a1247d5cc072128e4464beb7fa5df9 SHA1 5a9228794bb143d75c9d1bba7c8cdf46ab6f47bc SHA256 6fe97d1363d257cddd40ce284d4b84f58849a3f75955bd792091b02d9a034ec0
+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 4717 RMD160 52e955f2be56a68b7fbb1d53c5c224ab63b990a2 SHA1 c24b8fcb29b1131c7fdb829b41db7ca650122b15 SHA256 65d1ac44956a0d828ca3b9504ea77dfc0e15bbe55703065447d6b8fd07166ba8
-MISC ChangeLog 1333 RMD160 6219001044848c41ec0f2f61649a55a8c77e450a SHA1 8babe3ba1c5fe10a0831a143e6817ef0f94bd758 SHA256 4e940b65bd932fe37e4c8493c6083786df6c5fea69b9d8678b2f93206189d33f
+EBUILD salome-gui-3.2.6.ebuild 4806 RMD160 c18e6387c3b105db11071e8b6fee5f55f8779548 SHA1 949318d00bf911b00ba5c84e63d880312bd223a5 SHA256 0bc3601a61966009e078ec680159a531bcc515475e6051a57fc0a4e3bda16b8c
+MISC ChangeLog 1516 RMD160 fd35856ebe9b6dc9732457ec0065e7a894c31ef4 SHA1 96c11ffd809648fd8b1e62507bca9b06edc36e42 SHA256 23f0eae8944f4bd31a5f25ac92855f7ffbd16d330b8cf865b09450d4f1322cb5
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
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
new file mode 100644
index 000000000..0f7efaf90
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch
@@ -0,0 +1,188 @@
+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
index 8170914cd..c5a9988ab 100644
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
@@ -54,20 +54,23 @@ diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4
 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,9 @@
+@@ -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,10 @@
+@@ -44,6 +44,14 @@
  QT_VERS = Qt_3_3_0
  endif
  
@@ -75,6 +78,10 @@ diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile
 +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/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
index 80388f067..928691cd3 100644
--- a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
+++ b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
@@ -30,7 +30,6 @@ export OPENPBS="/usr"
 src_unpack() {
 	python_version
 	distutils_python_version
-	ewarn "Python 2.4 is highly recommended for Salome..."
 
 	if ! built_with_use sci-libs/vtk python ; then
 		die "You must rebuild sci-libs/vtk with python USE flag"
@@ -54,12 +53,14 @@ src_unpack() {
 	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" ; then
-	   einfo "vtk version 5 detected"
+	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}"/salome-gui-vtk-5.0.patch
-	else
-	   einfo "vtk version 4 or prior detected";
+	   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}"