Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sci-misc/salome-visu/Changelog7
-rw-r--r--sci-misc/salome-visu/Manifest5
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6.patch348
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch39
-rw-r--r--sci-misc/salome-visu/salome-visu-3.2.6.ebuild150
5 files changed, 549 insertions, 0 deletions
diff --git a/sci-misc/salome-visu/Changelog b/sci-misc/salome-visu/Changelog
new file mode 100644
index 000000000..879e7c3ec
--- /dev/null
+++ b/sci-misc/salome-visu/Changelog
@@ -0,0 +1,7 @@
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+21 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+ Initial import.
+ +salome-visu-3.2.6.ebuild, +salome-visu-3.2.6.patch, +salome-visu-3.2.6_makefiles.patch
+ A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
+ See bug #155974 for more info
diff --git a/sci-misc/salome-visu/Manifest b/sci-misc/salome-visu/Manifest
new file mode 100644
index 000000000..c6ea8c76b
--- /dev/null
+++ b/sci-misc/salome-visu/Manifest
@@ -0,0 +1,5 @@
+AUX salome-visu-3.2.6.patch 16848 RMD160 34b4460e7b01c8f5200cfdd46570c0517afd3201 SHA1 cd787bfbb330c6abe859990225a14e1ecdf319b6 SHA256 1d48148857b7958872b7c0e4ab64ae774a156aef59aa46d6239d35e53955e644
+AUX salome-visu-3.2.6_makefiles.patch 1283 RMD160 fd663c12446b91ffdba4bba689ed16da64455763 SHA1 0b9ca2d2e9e44f43387f5428fba0111dd5cd6e52 SHA256 20b7130d7b3172dd6f357ae329f4d2bdcb73d39ff5686d400d9796f254bf7795
+DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
+EBUILD salome-visu-3.2.6.ebuild 4228 RMD160 fc79533f10758efac0985ed431fdd5df5a2b85e1 SHA1 2942b6c299c4baafaf9b0ea947d1397ebde20bce SHA256 fae40feb68e853f9a5c4a46299977946279d6ba0b221821c58585d691978eb5d
+MISC Changelog 601 RMD160 0a99846c8ae58bc0968af91e241ab6a7b7d567d2 SHA1 af869604f9c8bf826b5b029ab374e0effc6a08fd SHA256 f92eca2238fc5b491c061813f68da9762d21e91836b5b2353ed5a19b7f02fe76
diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6.patch
new file mode 100644
index 000000000..139415712
--- /dev/null
+++ b/sci-misc/salome-visu/files/salome-visu-3.2.6.patch
@@ -0,0 +1,348 @@
+Seulement dans src3.2.6: build
+Seulement dans src3.2.6/VISU_SRC_3.2.6: aclocal.m4
+Seulement dans src3.2.6/VISU_SRC_3.2.6: autom4te.cache
+Seulement dans src3.2.6/VISU_SRC_3.2.6: configure
+Seulement dans src3.2.6/VISU_SRC_3.2.6: configure.in
+Seulement dans src3.2.6/VISU_SRC_3.2.6: salome_adm
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-11-28 17:30:04.000000000 +0100
+@@ -235,8 +235,8 @@
+ {
+ VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute");
+ vtkUnstructuredGrid *anOutput = this->GetOutput();
+- if(this->NumberOfInputs == 1){
+- anOutput->ShallowCopy(this->Inputs[0]);
++ if(this->InputList->GetNumberOfItems() == 1){
++ anOutput->ShallowCopy(this->GetInput(0));
+ return;
+ }
+
+@@ -247,8 +247,8 @@
+ return;
+
+ if(IsMergingInputs()){
+- TCellIdMerger aFunctor(this->NumberOfInputs);
+- ForEachInput<TCellIdMerger>(this->Inputs, this->NumberOfInputs, aFunctor);
++ TCellIdMerger aFunctor(this->InputList->GetNumberOfItems());
++ ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
+
+ vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
+ TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap;
+@@ -275,7 +275,7 @@
+ //TObjectId anObjectId = anIter->first;
+ const TInputCellId& anInputCellId = anIter->second;
+ TInputId anInputId = anInputCellId.first;
+- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){
++ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
+ TCellId aCellId = anInputCellId.second;
+ aDataSet->GetCellPoints(aCellId, anIdList);
+
+@@ -288,8 +288,8 @@
+ }
+ anIdList->Delete();
+ }else{
+- TCellCounter aFunctor(this->NumberOfInputs);
+- ForEachInput<TCellCounter>(this->Inputs, this->NumberOfInputs, aFunctor);
++ TCellCounter aFunctor(this->InputList->GetNumberOfItems());
++ ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
+
+ vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
+ vtkIdType aNbCells = aFunctor.GetNbCells();
+@@ -309,8 +309,8 @@
+ // 2.cells
+ vtkIdList *anIdList = vtkIdList::New();
+ anIdList->Allocate(VTK_CELL_SIZE);
+- for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) {
+- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){
++ for(vtkIdType anInputId = 0; anInputId < this->InputList->GetNumberOfItems(); anInputId++) {
++ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
+ vtkIdType aNbCells = aDataSet->GetNumberOfCells();
+ vtkCellData *aCellData = aDataSet->GetCellData();
+ // copy cell and cell data
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_AppendFilter.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-11-28 17:30:04.000000000 +0100
+@@ -1307,7 +1307,7 @@
+ aConnectivity->InitTraversal();
+ for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+
+ if(MYVTKDEBUG) aConnectivity->DebugOn();
+
+@@ -1397,7 +1397,7 @@
+ aConnectivity->InitTraversal();
+ for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+
+ if(MYVTKDEBUG) aConnectivity->DebugOn();
+
+@@ -1561,7 +1561,7 @@
+ aConnectivity->InitTraversal();
+ for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+
+ {
+ int aNbTuples = aNbCells;
+@@ -1829,7 +1829,7 @@
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+
+ const TVTKSource& aSource = theGaussSubMesh->GetSource();
+- aSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+ aSource->SetPoints(aPoints.GetPointer());
+
+ aCellLocationsArray->Delete();
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_Convertor_impl.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-11-28 17:30:04.000000000 +0100
+@@ -51,7 +51,7 @@
+ vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
+ //aWriter->SetFileType(VTK_BINARY);
+ aWriter->SetFileName(theFileName.c_str());
+- aWriter->SetInput(theDataSet);
++ aWriter->SetInput((vtkDataObject*)theDataSet);
+ aWriter->Write();
+ aWriter->Delete();
+ }
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_ConvertorUtils.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-11-28 17:30:01.000000000 +0100
+@@ -104,7 +104,7 @@
+ $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
+
+ LDFLAGS+= \
+- $(VTK_LIBS) -lVTKViewer -lVisuConvertor \
++ $(VTK_LIBS) -lVTKViewer -lVisuConvertor -lvtkWidgets \
+ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+ $(GUI_LDFLAGS) \
+ $(MED_LDFLAGS)
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-11-28 17:30:02.000000000 +0100
+@@ -202,7 +202,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/VISU_SRC_3.2.6/src/PIPELINE: SALOME_ExtractGeometry.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-11-28 17:30:01.000000000 +0100
+@@ -127,7 +127,8 @@
+ VISU_CutPlanesPL
+ ::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData)
+ {
+- int iEnd = theAppendPolyData->GetNumberOfInputs();
++ //int iEnd = theAppendPolyData->GetNumberOfInputs();
++ int iEnd = theAppendPolyData->GetUserManagedInputs();
+ for(int i = iEnd-1; i >= 0; i--)
+ theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i));
+ }
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_CutPlanesPL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100
+@@ -43,10 +43,10 @@
+ VISU_DeformedShapePL
+ ::~VISU_DeformedShapePL()
+ {
+- myWarpVector->UnRegisterAllOutputs();
++ //myWarpVector->UnRegisterAllOutputs();
+ myWarpVector->Delete();
+
+- myCellDataToPointData->UnRegisterAllOutputs();
++ //myCellDataToPointData->UnRegisterAllOutputs();
+ myCellDataToPointData->Delete();
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_DeformedShapePL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-11-28 17:30:02.000000000 +0100
+@@ -311,7 +311,7 @@
+ ::GetNodeCoord(int theObjID)
+ {
+ vtkIdType anID = GetNodeVTKID(theObjID);
+- vtkDataSet* aDataSet = myGeomFilter->GetInput();
++ vtkDataSet* aDataSet = (vtkDataSet*)(myGeomFilter->GetInput());
+ return aDataSet->GetPoint(anID);
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_GaussPointsPL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-11-28 17:30:02.000000000 +0100
+@@ -44,10 +44,10 @@
+ VISU_IsoSurfacesPL
+ ::~VISU_IsoSurfacesPL()
+ {
+- myContourFilter->UnRegisterAllOutputs();
++ //myContourFilter->UnRegisterAllOutputs();
+ myContourFilter->Delete();
+
+- myCellDataToPointData->UnRegisterAllOutputs();
++ //myCellDataToPointData->UnRegisterAllOutputs();
+ myCellDataToPointData->Delete();
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_IsoSurfacesPL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-11-28 17:30:01.000000000 +0100
+@@ -34,7 +34,7 @@
+ #include <vtkLookupTable.h>
+ #include <vtkTextProperty.h>
+ #include <vtkScalarBarActor.h>
+-#include <vtkIdType.h>
++//#include <vtkIdType.h>
+
+ #include <string.h>
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarBarCtrl.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100
+@@ -66,7 +66,7 @@
+ VISU_ScalarMapOnDeformedShapePL
+ ::~VISU_ScalarMapOnDeformedShapePL()
+ {
+- myDeformVectors->UnRegisterAllOutputs();
++ // myDeformVectors->UnRegisterAllOutputs();
+ myDeformVectors->Delete();
+
+ myMergeFilter->UnRegisterAllOutputs();
+@@ -75,7 +75,7 @@
+ myExtractorScalars->UnRegisterAllOutputs();
+ myExtractorScalars->Delete();
+
+- myCellDataToPointData->UnRegisterAllOutputs();
++ //myCellDataToPointData->UnRegisterAllOutputs();
+ myCellDataToPointData->Delete();
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarMapOnDeformedShapePL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-11-28 17:30:01.000000000 +0100
+@@ -61,16 +61,16 @@
+ }
+
+ VISU_StreamLinesPL::~VISU_StreamLinesPL(){
+- myPointsFilter->UnRegisterAllOutputs();
++ //myPointsFilter->UnRegisterAllOutputs();
+ myPointsFilter->Delete();
+
+- myCenters->UnRegisterAllOutputs();
++ //myCenters->UnRegisterAllOutputs();
+ myCenters->Delete();
+
+- myGeomFilter->UnRegisterAllOutputs();
++ //myGeomFilter->UnRegisterAllOutputs();
+ myGeomFilter->Delete();
+
+- myStream->UnRegisterAllOutputs();
++ //myStream->UnRegisterAllOutputs();
+ myStream->Delete();
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_StreamLinesPL.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-11-28 17:30:04.000000000 +0100
+@@ -218,7 +218,7 @@
+ myMapper->RemoveAllInputs();
+ myMapper->Delete();
+
+- myPlaneSource->UnRegisterAllOutputs();
++ //myPlaneSource->UnRegisterAllOutputs();
+ myPlaneSource->Delete();
+ }
+
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_ClippingDlg.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-11-28 17:30:04.000000000 +0100
+@@ -119,7 +119,7 @@
+ ~TPlane() {
+ myMapper->RemoveAllInputs();
+ myMapper->Delete();
+- myPlaneSource->UnRegisterAllOutputs();
++ // myPlaneSource->UnRegisterAllOutputs();
+ myPlaneSource->Delete();
+ };
+ // Not implemented.
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_Plot3DDlg.cxx~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-11-28 17:30:03.000000000 +0100
+@@ -122,7 +122,7 @@
+ LDFLAGS += \
+ $(PYTHON_LIBS) \
+ $(QT_MT_LIBS) \
+- $(VTK_LIBS) \
++ $(VTK_LIBS) -lvtkWidgets \
+ $(QWT_LIBS) \
+ $(BOOST_LIBS) \
+ $(KERNEL_LDFLAGS) \
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-11-28 17:30:04.000000000 +0100
+@@ -409,7 +409,8 @@
+ aTitle = aTitle.simplifyWhiteSpace();
+ aTableOfReal->SetTitle(aTitle.latin1());
+
+- int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();
++ // int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();
++ int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetUserManagedInputs();
+ if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd);
+ TXCont aXCont;
+ TXYMapCont aXYMapCont;
+@@ -461,7 +462,7 @@
+ aXYMap[aDist] = aScalars->GetTuple1(i);
+ }
+ if(aFilter){
+- aFilter->UnRegisterAllOutputs();
++ // aFilter->UnRegisterAllOutputs();
+ aFilter->Delete();
+ }
+ }
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_CutLines_i.cc~
+diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc
+--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-11-28 17:30:04.000000000 +0100
+@@ -161,7 +161,7 @@
+
+ VISU::StreamLines_i::~StreamLines_i(){
+ if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()");
+- myAppendFilter->UnRegisterAllOutputs();
++ //myAppendFilter->UnRegisterAllOutputs();
+ myAppendFilter->Delete();
+ }
+
+@@ -178,8 +178,9 @@
+ vtkPointSet* aSource = NULL;
+ if(!thePrs3d->_is_nil())
+ if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){
+- for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
+- myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
++ // for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
++ // myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
++ myAppendFilter->RemoveAllInputs();
+ myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput());
+ aSource = myAppendFilter->GetOutput();
+ }
+Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_StreamLines_i.cc~
diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch
new file mode 100644
index 000000000..a54090945
--- /dev/null
+++ b/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch
@@ -0,0 +1,39 @@
+--- ./VISU_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200
++++ ./VISU_SRC_3.2.6/build_configure 2008-01-07 14:43:19.000000000 +0100
+@@ -127,7 +127,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
+--- ./VISU_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
++++ ./VISU_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 14:44:21.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:
+
+--- ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
++++ ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 14:45:41.000000000 +0100
+@@ -30,7 +30,7 @@
+ @COMMENCE@
+
+ usr_docs:
+- cp -fr $(srcdir)/VISU ./
++# cp -fr $(srcdir)/VISU ./
+ -find $(PWD) -name CVS -prune -exec rm -rf {} \;
+
+ docs: usr_docs
diff --git a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
new file mode 100644
index 000000000..4876c665c
--- /dev/null
+++ b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU Component"
+HOMEPAGE="http://www.salome-platform.org"
+SRC_URI="salome-3.2.6.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc opengl mpi debug"
+RESTRICT="fetch"
+
+RDEPEND="opengl? ( virtual/opengl )
+ mpi? ( sys-cluster/mpich2 )
+ debug? ( dev-util/cppunit )"
+
+DEPEND="${RDEPEND}
+ >=sci-misc/salome-kernel-3.2.6
+ >=sci-misc/salome-gui-3.2.6
+ >=sci-misc/salome-component-3.2.6
+ <=dev-python/omniorbpy-2.6
+ <=net-misc/omniORB-4.1"
+
+# Note that Corba is apparently not optional in this module
+
+MODULE_NAME="VISU"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+export OPENPBS="/usr"
+
+
+pkg_nofetch()
+{
+ einfo "You have to download manually the source code. You can download it from :"
+ einfo " http://www.salome-platform.org/download/dl326"
+ einfo ""
+ einfo "Put the archive in the \"/usr/portage/distfile\" directory and rename it \"salome-3.2.6.tar.gz\""
+}
+
+
+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"
+ fi
+
+ unpack ${A}
+ cd "${MY_S}"
+ epatch "${FILESDIR}"/${P}.patch
+ epatch "${FILESDIR}"/${P}_makefiles.patch
+}
+
+
+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
+
+ # 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"
+ append-flags -I/usr/include/vtk-5.0
+ else
+ einfo "vtk version 4 or prior detected"
+ 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"
+
+ 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 LICENCE
+ fi
+}
+
+
+pkg_postinst() {
+ elog "Run \`env-update && source /etc/profile\`"
+ elog "now to set up the correct paths."
+ elog ""
+}
+