Initial update. There is still some work to do but it starts to get shape! ;)

See bug #155974

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

8 files changed, 382 insertions, 0 deletions

diff --git a/sci-misc/salome-kernel/files/digest-salome-kernel-3.2.6 b/sci-misc/salome-kernel/files/digest-salome-kernel-3.2.6
new file mode 100644
index 000000000..5c66d3bbd
--- /dev/null
+++ b/sci-misc/salome-kernel/files/digest-salome-kernel-3.2.6
@@ -0,0 +1,3 @@
+MD5 8d5748872b84c4d8fc455c665ea3d1e0 salome-3.2.6.tar.gz 88763725
+RMD160 0a0b77aa538832265416605bf502df9e790b45b7 salome-3.2.6.tar.gz 88763725
+SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 salome-3.2.6.tar.gz 88763725
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
new file mode 100644
index 000000000..07c42dd44
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-Batch_Couple.patch
@@ -0,0 +1,13 @@
+--- 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-mpich2.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-mpich2.patch
new file mode 100644
index 000000000..038100034
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-mpich2.patch
@@ -0,0 +1,48 @@
+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-pyobject.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-pyobject.patch
new file mode 100644
index 000000000..aaf92e350
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-pyobject.patch
@@ -0,0 +1,156 @@
+diff -Naur src3.2.6.orig/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.orig/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp	2007-04-24 16:23:09.000000000 +0000
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp	2008-02-07 14:45:34.000000000 +0000
+@@ -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 --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6_omniorg.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6_omniorg.patch
new file mode 100644
index 000000000..d0bd5daf4
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6_omniorg.patch
@@ -0,0 +1,6 @@
+22,23c22,23
+< 	 corba?   ( dev-python/omniorbpy 
+< 	 	    net-misc/omniORB )"
+---
+> 	 corba?   ( <=dev-python/omniorbpy-2.6
+> 	 	    <=net-misc/omniORB-4.1 )"
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
new file mode 100644
index 000000000..6308df481
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6_openpbs.patch
@@ -0,0 +1,21 @@
+--- 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-gcc4.patch b/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
new file mode 100644
index 000000000..45b06c336
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
@@ -0,0 +1,135 @@
+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);
+ }
diff --git a/sci-misc/salome-kernel/files/salome-kernel.png b/sci-misc/salome-kernel/files/salome-kernel.png
new file mode 100644
index 000000000..485c12713
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel.png