sci-misc/salome-kernel: Reworked USE-flags, changed default behaviour, added omniorb_4.1.patch

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

3 files changed, 112 insertions, 9 deletions

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
new file mode 100644
index 000000000..85545570b
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-omniorb_4.1.patch
@@ -0,0 +1,34 @@
+--- 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
index aaf92e350..0d36e199c 100644
--- 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
@@ -1,6 +1,6 @@
-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
+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)) {
@@ -154,3 +154,78 @@ diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/Batch_SWIG/swig_wrap.cpp src3.2.6/
          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_omniorg.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6_omniorg.patch
deleted file mode 100644
index d0bd5daf4..000000000
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6_omniorg.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-22,23c22,23
-< 	 corba?   ( dev-python/omniorbpy 
-< 	 	    net-misc/omniORB )"
----
-> 	 corba?   ( <=dev-python/omniorbpy-2.6
-> 	 	    <=net-misc/omniORB-4.1 )"