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

10 files changed, 47 insertions, 585 deletions

diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-Batch_Couple.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-Batch_Couple.patch
deleted file mode 100644
index 07c42dd44..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-Batch_Couple.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Couple.cxx.bak    2007-04-24
-17:34:17.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Couple.cxx        2008-03-12
-00:37:09.000000000 +0100
-@@ -26,7 +26,7 @@
-  * Projet : Salome 2
-  *
-  */
--
-+#include <iostream>
- #include "Batch_Couple.hxx"
- using namespace std;
-
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch
deleted file mode 100644
index b563cbf1c..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-06-27 00:34:52.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <cstdlib>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <linux/limits.h>
- #include <ctime>
- #include <unistd.h>
- #include <pthread.h>
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx	2008-06-27 00:44:06.000000000 +0200
-@@ -34,6 +34,7 @@
- #include <iostream>
- #include <fstream>
- #include <sstream>
-+#include <cstdlib>
- //#include "MEDMEM_STRING.hxx"
- #include "Batch_BatchManager_PBS.hxx"
- using namespace std;
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx	2008-06-27 00:36:07.000000000 +0200
-@@ -29,6 +29,8 @@
- 
- #include <cstdio>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- //#include "MEDMEM_STRING.hxx"
- #include "Batch_Parametre.hxx"
- #include "Batch_Environnement.hxx"
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx	2008-06-27 00:49:11.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <cstring>
- #include "Batch_Job_PBS.hxx"
- using namespace std;
- 
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-06-27 00:34:52.000000000 +0200
-@@ -12,7 +12,8 @@
- #define SALOME_Logger_Server_include
- 
- #ifndef WNT
--#include <fstream.h>
-+#include <fstream>
-+#include <iosfwd>
- #else
- #include <fstream>
- #include <iosfwd>
-@@ -41,7 +42,7 @@
-         bool m_putIntoFile;
- 	//ofstream class specialized for disk file output
- #ifndef WNT
--        ofstream m_outputFile; 
-+        std::ofstream m_outputFile; 
- #else
- 		std::ofstream m_outputFile; 
- #endif
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-06-27 00:34:52.000000000 +0200
-@@ -9,6 +9,7 @@
- //  Module : SALOME
- 
- #include <iostream>
-+#include <cstdlib>
- #include "SALOME_Logger_Server.hxx"
- #include <SALOMEconfig.h>
- #include <sys/types.h>
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-06-27 00:34:52.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <iostream>
- #include <limits.h>
- #include <cassert>
-+#include <cstring>
- 
- #ifndef WNT
- #include <dlfcn.h>
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-06-27 00:33:32.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-06-27 00:34:52.000000000 +0200
-@@ -41,8 +41,8 @@
- 
- #ifndef WNT
- #include <stdio.h>
--#include <iostream.h> 
--#include <fstream.h>
-+#include <iostream> 
-+#include <fstream>
- #include <sys/time.h>
- #else
- #endif
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-mpich2.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-mpich2.patch
deleted file mode 100644
index 038100034..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-mpich2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4 src3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4
---- src3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4	2007-04-24 16:34:20.000000000 +0100
-+++ src3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4	2008-05-07 02:36:00.000000000 +0100
-@@ -26,11 +26,12 @@
- 
- AC_ARG_WITH(mpich,
-   [AC_HELP_STRING([--with-mpich=DIR],[root directory path of MPICH installation])],
--  WITHMPICH="yes",WITHMPICH="no")
-+  MPICHREQUESTED="yes",MPICHREQUESTED="no")
- 
- MPI_INCLUDES=""
- MPI_LIBS=""
--if test "$WITHMPICH" = yes; then
-+WITHMPICH=no
-+if test x"$MPICHREQUESTED" = xyes; then
- 
-   MPIREQUESTED="yes"
-   echo
-@@ -38,9 +39,9 @@
-   echo testing mpich
-   echo ---------------------------------------------
-   echo
--  MPICH_HOME=$withval
- 
--  if test "$MPICH_HOME"; then
-+  if test "x$withval" != "xyes"; then
-+    MPICH_HOME=$withval
-     MPI_INCLUDES="-I$MPICH_HOME/include"
-     if test "x$MPICH_HOME" = "x/usr"
-     then
-@@ -67,10 +68,16 @@
-      WITHMPI="yes"
-      mpi_ok=yes
-      MPI_LIBS="$MPI_LIBS -lmpich"
-+dnl  We're doing this here because MPI_LIBS doesn't appear to be
-+dnl  being used within the Makefile structure
-+     LDFLAGS="$MPI_LIBS $LDFLAGS"
-   else
-      mpi_ok=no
-   fi
--
- fi
- 
-+AC_SUBST(WITHMPICH)
-+AC_SUBST(MPI_INCLUDES)
-+AC_SUBST(MPI_LIBS)
-+AC_SUBST(mpi_ok)
- ])dnl
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-omniorb_4.1.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-omniorb_4.1.patch
deleted file mode 100644
index 85545570b..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-omniorb_4.1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src3.2.6_orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc	2008-08-22 14:53:38.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc	2008-08-22 15:20:23.000000000 +0200
-@@ -42,7 +42,7 @@
- 	    "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
-   if(CORBA::is_nil(thePOA))
- #ifndef WNT
--    myPOA = PortableServer::RefCountServantBase::_default_POA();
-+    myPOA = PortableServer::ServantBase::_default_POA();
- #else
-     myPOA = RefCountServantBase::_default_POA();
- #endif
---- src3.2.6_orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx	2008-08-22 14:53:38.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx	2008-08-22 15:22:54.000000000 +0200
-@@ -93,14 +93,14 @@
-         };
- 
-         if (status) {
--            char*        Asender;
--            char*        Agraph;
--            char*        Atype;
-+            const char*        Asender;
-+            const char*        Agraph;
-+            const char*        Atype;
-             CORBA::ULong Acounter;
-             CORBA::ULong Astamp;
--            char*        Adate;
--            char*        Anode;
--            char*        Amessage;
-+            const char*        Adate;
-+            const char*        Anode;
-+            const char*        Amessage;
-             event->filterable_data[0].value >>= Asender;
-             event->filterable_data[1].value >>= Agraph;
-             event->filterable_data[2].value >>= Atype;
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-pyobject.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-pyobject.patch
deleted file mode 100644
index 0d36e199c..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-pyobject.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp src3.2.6/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp	2008-09-02 22:20:24.000000000 +0200
-@@ -1174,7 +1174,7 @@
-     obj = pyobj;
-     if (PyCFunction_Check(obj)) {
-       /* here we get the method pointer for callbacks */
--      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-+      const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-       c = doc ? strstr(doc, "swig_ptr: ") : 0;
-       if (c) {
- 	c = SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name);
-@@ -1474,7 +1474,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj0, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -1532,7 +1532,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj0, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -1584,7 +1584,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj0, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -1612,7 +1612,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj1, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -1809,7 +1809,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -1912,7 +1912,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj1, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -2359,7 +2359,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -2387,7 +2387,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj2, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -2439,7 +2439,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -2500,7 +2500,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj1, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -2656,7 +2656,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -2717,7 +2717,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj1, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -3445,7 +3445,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj2, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -3473,7 +3473,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj3, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-@@ -3535,7 +3535,7 @@
-             // on itere sur toutes les clefs du dictionnaire, et on passe par la classe PyVersatile
-             // qui convertit un Versatile en PyObject et vice versa
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj2, &pos, &key, &value)) {
-                 std::string mk = PyString_AsString(key);
-                 Batch::PyVersatile PyV = value;
-@@ -3606,7 +3606,7 @@
-         
-         // on itere sur toutes les clefs du dictionnaire
-         PyObject *key, *value;
--        int pos = 0;
-+        Py_ssize_t pos = 0;
-         while (PyDict_Next(obj2, &pos, &key, &value)) {
-             std::string mk  = PyString_AsString(key);
-             std::string val = PyString_AsString(value);
-diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp	2008-07-25 09:16:08.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp	2008-09-02 22:40:21.000000000 +0200
-@@ -3235,7 +3235,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -3365,7 +3365,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -3557,7 +3557,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -3687,7 +3687,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -3879,7 +3879,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -4009,7 +4009,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -4328,7 +4328,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-@@ -4462,7 +4462,7 @@
-             param->nb_node = 0;
-             param->isMPI = false;
-             PyObject *key, *value;
--            int pos = 0;
-+            Py_ssize_t pos = 0;
-             while (PyDict_Next(obj1, &pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6_openpbs.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6_openpbs.patch
deleted file mode 100644
index 6308df481..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6_openpbs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- salome_adm/unix/config_files/check_openpbs.m4_orig	2008-01-18 23:50:02.000000000 +0100
-+++ salome_adm/unix/config_files/check_openpbs.m4	2008-01-18 23:50:57.000000000 +0100
-@@ -32,15 +32,15 @@
-  
-    if test "x${OPENPBS}" = "x/usr"
-    then
--     OPENPBS_LIBDIR=""
-+     OPENPBS_LIBDIR="-L/usr/lib/pbs/lib"
-    else
-      OPENPBS_LIBDIR="-L${OPENPBS}/lib"
-    fi
--   OPENPBS_LIBS="-lpbs"
-+   OPENPBS_LIBS="-ltorque"
-    saved_LDFLAGS=${LDFLAGS}
-    saved_LIBS=${LIBS}
-    LDFLAGS="${LDFLAGS} ${OPENPBS_LIBDIR}"
--   AC_CHECK_LIB([pbs], [pbs_connect], [openpbs_lib_found=yes], [openpbs_lib_found=no], [])
-+   AC_CHECK_LIB([torque], [pbs_connect], [openpbs_lib_found=yes], [openpbs_lib_found=no], [])
-    test x${openpbs_lib_found} = xno && AC_MSG_WARN([OpenPBS library not found])
-    LIBS="${LIBS} ${OPENPBS_LIBS}"
-    LDFLAGS=${saved_LDFLAGS}
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch
new file mode 100644
index 000000000..afb5e4553
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch
@@ -0,0 +1,13 @@
+--- src5.1.3.old/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-10 19:08:57.000000000 +0200
++++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-26 19:47:05.000000000 +0200
+@@ -26,6 +26,10 @@
+ 
+   AC_CHECKING(for LIB_LOCATION_SUFFIX)
+   LIB_LOCATION_SUFFIX=""
++  case "$build_cpu" in
++  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
++  *)        LIB_LOCATION_SUFFIX="" ;;
++  esac
+   AC_SUBST(LIB_LOCATION_SUFFIX)
+   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
+ 
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch
new file mode 100644
index 000000000..660d1ae5e
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch
@@ -0,0 +1,21 @@
+--- src5.1.3.orig/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_mpi.m4	2008-12-10 10:14:34.000000000 +0100
++++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_mpi.m4	2009-09-29 10:14:56.821299268 +0200
+@@ -76,7 +76,7 @@
+ 
+   if test "$WITHMPI" = "yes";then
+     mpi_ok=yes
+-    MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC"
++    MPI_LIBS="$MPI_LIBS -lmpi -lmpi_cxx"
+   else
+     mpi_ok=no
+   fi
+--- src5.1.3.orig/KERNEL_SRC_5.1.3/src/Communication/SALOME_Comm_i.hxx	2008-12-10 10:14:33.000000000 +0100
++++ src5.1.3/KERNEL_SRC_5.1.3/src/Communication/SALOME_Comm_i.hxx	2009-09-29 11:10:13.227293648 +0200
+@@ -25,6 +25,7 @@
+ #include <SALOME_Communication.hxx>
+ 
+ #ifdef HAVE_MPI2
++#define OMPI_IGNORE_CXX_SEEK 1
+ #include "mpi.h"
+ #endif
+ #include <string>
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch
new file mode 100644
index 000000000..bac07b16b
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch
@@ -0,0 +1,13 @@
+Only in src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY: .import_hook.py.swp
+diff -ur src5.1.3.orig/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py
+--- src5.1.3.orig/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py	2010-03-07 17:35:38.450323100 +0100
++++ src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py	2010-03-07 17:37:18.940255407 +0100
+@@ -150,7 +150,7 @@
+             l.append((subname,submod))
+     return l
+ 
+-def import_hook(name, globals=None, locals=None, fromlist=None, *args):
++def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args):
+     """ Import replacement for sharing modules among multiple interpreters
+         Mostly update sys.modules before doing real import
+     """
diff --git a/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch b/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
deleted file mode 100644
index 45b06c336..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc src3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc
---- src3.2.6.orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc	2007-04-24 10:34:17.000000000 -0500
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc	2008-01-10 15:46:15.000000000 -0600
-@@ -42,9 +42,9 @@
- 	    "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
-   if(CORBA::is_nil(thePOA))
- #ifndef WNT
--    myPOA = PortableServer::RefCountServantBase::_default_POA();
-+    myPOA = PortableServer::ServantBase::_default_POA();
- #else
--    myPOA = RefCountServantBase::_default_POA();
-+    myPOA = ServantBase::_default_POA();
- #endif
-   else
-     myPOA = PortableServer::POA::_duplicate(thePOA);
-diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp
---- src3.2.6.orig/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp	2007-04-24 10:58:15.000000000 -0500
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp	2008-01-10 16:05:05.000000000 -0600
-@@ -3236,7 +3236,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -3366,7 +3366,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -3558,7 +3558,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -3688,7 +3688,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -3880,7 +3880,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -4010,7 +4010,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -4329,7 +4329,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-@@ -4463,7 +4463,7 @@
-             param->isMPI = false;
-             PyObject *key, *value;
-             int pos = 0;
--            while (PyDict_Next(obj1, &pos, &key, &value))
-+            while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
-             {
-                 char* keystr = PyString_AsString(key);
-                 printf("key: %s\n", keystr);
-diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx
---- src3.2.6.orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx	2007-04-24 10:34:17.000000000 -0500
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx	2008-01-10 15:52:35.000000000 -0600
-@@ -93,14 +93,14 @@
-         };
- 
-         if (status) {
--            char*        Asender;
--            char*        Agraph;
--            char*        Atype;
-+            const char*  Asender;
-+            const char*  Agraph;
-+            const char*  Atype;
-             CORBA::ULong Acounter;
-             CORBA::ULong Astamp;
--            char*        Adate;
--            char*        Anode;
--            char*        Amessage;
-+            const char*  Adate;
-+            const char*  Anode;
-+            const char*  Amessage;
-             event->filterable_data[0].value >>= Asender;
-             event->filterable_data[1].value >>= Agraph;
-             event->filterable_data[2].value >>= Atype;
-diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx src3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx
---- src3.2.6.orig/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx	2007-04-24 10:34:19.000000000 -0500
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx	2008-01-10 15:56:51.000000000 -0600
-@@ -44,7 +44,7 @@
-   MESSAGE("activate object");
-   _thisObj = this ;
-   _id = _poa->activate_object(_thisObj);
--  SCRUTE(pd_refCount);
-+  //SCRUTE(pd_refCount);
- }
- 
- Engines_TestComponent_i::Engines_TestComponent_i()
-@@ -60,7 +60,7 @@
- {
-   char s[100];
-   sprintf(s, "TestComponent_i : L = %ld", (long) L);
--  SCRUTE(pd_refCount);
-+  //SCRUTE(pd_refCount);
- 
-   return CORBA::string_dup(s);
- }