diff options
Diffstat (limited to 'sci-misc/salome-kernel')
15 files changed, 204 insertions, 781 deletions
diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog index 076fdb063..438b3093a 100644 --- a/sci-misc/salome-kernel/ChangeLog +++ b/sci-misc/salome-kernel/ChangeLog @@ -1,7 +1,23 @@ # ChangeLog for sci-misc/salome-kernel -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-kernel-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-kernel-3.2.6.ebuild, + -files/salome-kernel-3.2.6-Batch_Couple.patch, + -files/salome-kernel-3.2.6-gcc-4.3.patch, + -files/salome-kernel-3.2.6-mpich2.patch, + -files/salome-kernel-3.2.6-omniorb_4.1.patch, + -files/salome-kernel-3.2.6-pyobject.patch, + -files/salome-kernel-3.2.6_openpbs.patch, +salome-kernel-5.1.3.ebuild, + +files/salome-kernel-5.1.3-lib_location.patch, + +files/salome-kernel-5.1.3-openmpi.patch, + +files/salome-kernel-5.1.3-python-2.6.patch, + -files/salome-kernel-gcc4.patch, metadata.xml: + Version bump 5.1.3 + removed broken 3.2.6 + 02 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> -files/digest-salome-kernel-3.2.6: remove old digest diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest index f039b74ce..a0da7d026 100644 --- a/sci-misc/salome-kernel/Manifest +++ b/sci-misc/salome-kernel/Manifest @@ -1,12 +1,8 @@ -AUX salome-kernel-3.2.6-Batch_Couple.patch 324 RMD160 42284ee163672fc686f9ae3dc79b485058781de2 SHA1 8f9b1aba0e80dc41214290c59e233f000e93d8bc SHA256 fec452f836727542d86d126b17e4143c2a8cd2ecce890a159b9c6dd40964b605 -AUX salome-kernel-3.2.6-gcc-4.3.patch 4380 RMD160 f55a29d5562da3382ee315cbcd99420a9c0cd487 SHA1 6e92bd60f81582c2fcb73bddd25c11641bc5c84b SHA256 7f982e04fb492070c84126d08a9d2e7028c28cd1da8b2ea7234d8e5b04e3ac4c -AUX salome-kernel-3.2.6-mpich2.patch 1421 RMD160 be3b85bf0799e90e57c32541aaf76ab9a0492f98 SHA1 99871487a1276356a1ceba1dd575f5b95561eb20 SHA256 793a1b0536329733d0ad65819e97a6ea0a328b72661eebe49ea6828a34de08fa -AUX salome-kernel-3.2.6-omniorb_4.1.patch 1487 RMD160 4e0228f6724473369453b208681a79b25fe0f952 SHA1 a8398c46d13b75d86409ecf4bb1c3ac71abda73b SHA256 11c04d07ab697ab8798d22f8463bfc7feb228156b6c9a5bd73270c49b6bc814b -AUX salome-kernel-3.2.6-pyobject.patch 9956 RMD160 8a448339583d09a8c3e4b84aa87d2ff69177c7db SHA1 f01c1b8a6687c8d0caac529f332b01f82cde0c8c SHA256 1ce9fac614bfb059142c3851b812798b6e12ebe2fa290cb245bcd39e591edddc -AUX salome-kernel-3.2.6_openpbs.patch 847 RMD160 f41b3adde69f2958941643da10b7551de7b40257 SHA1 5e50bfbd38a9d71cd255c59e1b029871c612636c SHA256 5a1c31be402230260b1ce828a553619feeeb439cc7635eed695a68a70507aec6 -AUX salome-kernel-gcc4.patch 5928 RMD160 9fa81eeac2d5dbb64b3137e711553b4b76bc9e08 SHA1 59eeee6e19b3e5e6c5490b8fbf9e4b67e9ecd9db SHA256 6c5a19dac8893c054c03467a4e463aa582b88c22c37a7d2ce88ba75f918e06dc +AUX salome-kernel-5.1.3-lib_location.patch 532 RMD160 852dd572d00008217256fe980a55d761d7192cea SHA1 fee095613301325cef6bf66b9f6a0f5da4c5ae06 SHA256 5f4e16f9c9c5f11233cd69b0723017543f46c1697c18f22ea650a104feba7998 +AUX salome-kernel-5.1.3-openmpi.patch 771 RMD160 28c2b4f26c450e23117726cabe299836f88e3192 SHA1 a114862c6320ce0828145a171f5fc55437d486b3 SHA256 720a235568eacde244ca68e18b9eae64b54bba65ece15247ff7363252d38d81d +AUX salome-kernel-5.1.3-python-2.6.patch 765 RMD160 3ed18d32155d35bdee4ff7bb27b706cb854d602b SHA1 8bdd812c3a1333a2467f0340db573d895f17deb8 SHA256 2d88ded3a1e2bf04e2874803cf7ee8f125032af2996afb9992e3743509ae39bd AUX salome-kernel.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-kernel-3.2.6.ebuild 5347 RMD160 d8b266079dd79d77517ca52071859388bc509c13 SHA1 8ffcea27af64d1a80685055e3b5b32dae4483e36 SHA256 06b94f7a59e66873c50d4e3213f6c70ff6a0a38ef53d02eb7ac1a8b3e48b805c -MISC ChangeLog 2407 RMD160 d37b375249a135311c7d39ccacfa02b50caf10d4 SHA1 793e8c34eb3233cadb5693a8d4bf4e855c88d925 SHA256 5df3911a6384d64c512260364eeacc0e2e2a2fa7ac1239f8f08e09a066b7be08 -MISC metadata.xml 251 RMD160 eef01ec04622ef90a25b1bf2ba4a716b0ff0c70b SHA1 aff4c2037afcc36714bbdbca60ab49e0f0e49c21 SHA256 e9487884fb1dc92a38d9e5ff21abb4ab6984c0bbc90296cbc546124d58fe8fb8 +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-kernel-5.1.3.ebuild 3703 RMD160 50765953890011245b1a52b3fd69f514974de062 SHA1 29054c965310d415045dcc00ea03d4b680e8d71c SHA256 f9e1f9cbf0dd5dd30448c903d7fc042ecc406d7bfb97f63e50fb023e5790548d +MISC ChangeLog 3071 RMD160 977ae29db2f569014bdb10e9c4358d687d33a46f SHA1 22b630f893a46964242feeb7f2fc3bb698cc8e06 SHA256 e390b8f51593c20b61cad13cfddba2f69e6a548ac4c03841697b8faa13f6e38b +MISC metadata.xml 247 RMD160 e1c681233bddd30ebb6140396aa6b8531cad2654 SHA1 aaf4d3d22ca073fc6b2858d3775ef9458f98c283 SHA256 0da057781b1ed4721163e092cab86b9ee862a15d6bc20c8c6877000daca4c394 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); - } diff --git a/sci-misc/salome-kernel/metadata.xml b/sci-misc/salome-kernel/metadata.xml index e2b812a5b..217d71c41 100644 --- a/sci-misc/salome-kernel/metadata.xml +++ b/sci-misc/salome-kernel/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <herd>sci</herd> <use> - <flag name='openpbs'>Enable support for <pkg>sys-cluster/torque</pkg></flag> + <flag name='numpy'>Enable support for <pkg>dev-python/numpy</pkg></flag> </use> </pkgmetadata> diff --git a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild deleted file mode 100644 index 21d2d4ba8..000000000 --- a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="1" -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. KERNEL Component" -HOMEPAGE="http://www.salome-platform.org" -SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="debug doc mpi opengl openpbs" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit ) - openpbs? ( sys-cluster/torque ) - dev-python/omniorbpy - >=net-misc/omniORB-4.1.2 - x11-libs/qwt:0 - >=sci-libs/vtk-5.0.0 - >=sci-libs/opencascade-6.2" - -# Note that Corba is apparently not optional in this module - -DEPEND="${RDEPEND} - app-doc/doxygen - media-gfx/graphviz - dev-libs/boost - >=dev-python/PyQt-3.13 - >=dev-python/sip-4.1.3 - dev-python/numeric - dev-python/docutils - dev-lang/swig - >=x11-libs/qt-3.3.3 - dev-lang/tk - dev-lang/tcl - sci-libs/hdf5" - -MODULE_NAME="KERNEL" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" -export OPENPBS="/usr" - -src_unpack() { - python_version - distutils_python_version - ewarn "Python 2.4 is highly recommended for Salome..." - - #Warn about mpi use flag for hdf5 - if built_with_use sci-libs/hdf5 mpi ; then - ewarn "mpi use flag enabled for sci-libs/hdf5, this may cause the build to fail for salome-kernel" - fi - - 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}_openpbs.patch - epatch "${FILESDIR}"/${P}-Batch_Couple.patch - epatch "${FILESDIR}"/${P}-omniorb_4.1.patch - - # If Python 2.5 is planned to be used, the following patch must be applied. This, however, - # needs to be thoroughly tested! - if version_is_at_least "2.5" "${PYVER}"; then - epatch "${FILESDIR}"/${P}-pyobject.patch - fi - - # Fix for mpich2 detection, this is also used by salome-component at least - epatch "${FILESDIR}"/${P}-mpich2.patch - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi - - # Correct the Salome version number - sed -i "s:3.2.5:${PV}:g" configure.ac - - ./clean_configure - ./build_configure -} - - -src_compile() { - cd "${MY_S}" - - local myconf="--with-tcl=/usr/$(get_libdir)/ --with-tk=/usr/$(get_libdir)/" - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-kernel with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # Specifying --without-<flag> for mpi / mpich / openpbs - # 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 - if use openpbs ; then - myconf="${myconf} --with-openpbs" - fi - - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --docdir=${INSTALL_DIR}/share/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --datadir=${INSTALL_DIR}/share/salome \ - --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 \ - --enable-corba-gen \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - emake || die "compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/share/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 "KERNEL_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} - if use doc ; then - dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt - fi - - # Fix an import python module problem - sed -i 's@import CORBA@from omniORB import CORBA@' "${D}"/"${INSTALL_DIR}"/bin/salome/runSalome.py - - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/${PN}.png - make_desktop_entry runSalome Salome ${PN}.png "Science;Engineering" -} - -pkg_postinst() { - - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" - - ewarn "note a small change to /etc/hosts may be required" - ewarn "salome doesn't seem to recognise localhost within the hosts file" - ewarn "a line such as" - ewarn "127.0.0.1 name.domain name" - ewarn "may be required within /etc/hosts" - ewarn "" -} diff --git a/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild b/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild new file mode 100644 index 000000000..57f762fbe --- /dev/null +++ b/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +PYTHON_DEPEND="2:2.4" + +inherit distutils eutils + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. KERNEL Component" +HOMEPAGE="http://www.salome-platform.org" +SRC_URI="http://www.stasyan.com/devel/distfiles/src${PV}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug doc mpi numpy" + +RDEPEND="mpi? ( || ( sys-cluster/openmpi[cxx] + sys-cluster/mpich2[cxx] ) ) + debug? ( dev-util/cppunit ) + numpy? ( dev-python/numpy ) + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=dev-libs/boost-1.40.0 + sci-libs/hdf5" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + dev-python/docutils + dev-lang/swig + dev-libs/libxml2 + >=dev-python/docutils-0.4" + +MODULE_NAME="KERNEL" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" +export OPENPBS="/usr" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + + #Warn about mpi use flag for hdf5 + has_version "sci-libs/hdf5[mpi]" && + ewarn "mpi use flag enabled for sci-libs/hdf5, this may cause the build to fail for salome-kernel" +} + +src_prepare() { + cd "${MY_S}" + + use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch + [[ ${PYVER} == 2.6 ]] && \ + epatch "${FILESDIR}"/${P}-python-2.6.patch + + has_version "sys-cluster/openmpi" && \ + epatch "${FILESDIR}"/${P}-openmpi.patch + + ./clean_configure + ./build_configure +} + +src_configure() { + cd "${MY_S}" + + local myconf="" + +# --without-mpi does not disable mpi support, just omit it to disable + if use mpi; then + if has_version ">=sys-cluster/openmpi-1.2.9"; then + myconf="${myconf} --with-mpi --with-openmpi" + elif has_version ">=sys-cluster/mpich2-1.0.8"; then + myconf="${myconf} --with-mpi --with-mpich" + fi + fi + + econf --prefix=${INSTALL_DIR} \ + --docdir=${INSTALL_DIR}/share/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --datadir=${INSTALL_DIR}/share/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 \ + --enable-corba-gen \ + ${myconf} \ + $(use_enable mpi parallel_extension ) \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + $(use_with debug cppunit /usr ) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "KERNEL_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} + use doc && dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt + + # Install icon and .desktop for menu entry + doicon "${FILESDIR}"/${PN}.png + make_desktop_entry runSalome Salome ${PN} "Science;Engineering" +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" + + ewarn "note a small change to /etc/hosts may be required" + ewarn "salome doesn't seem to recognise localhost within the hosts file" + ewarn "a line such as" + ewarn "127.0.0.1 name.domain name" + ewarn "may be required within /etc/hosts" + ewarn "" +} |