diff options
6 files changed, 134 insertions, 31 deletions
diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog index dc8eb9d0a..4c11ae548 100644 --- a/sci-misc/salome-kernel/ChangeLog +++ b/sci-misc/salome-kernel/ChangeLog @@ -1,6 +1,12 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> + salome-kernel-3.2.6.ebuild, +files/salome-kernel-3.2.6-omniorb_4.1.patch, + files/salome-kernel-3.2.6-pyobject.patch, + -files/salome-kernel-3.2.6_omniorg.patch: + Reworked USE-flags, changed default behaviour, added omniorb_4.1.patch + 26 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-kernel-3.2.6.ebuild, -Changelog, +metadata.xml: Removed fetch restriction, added python-2.5 support, removed hardcode diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest index bf165813b..285116ede 100644 --- a/sci-misc/salome-kernel/Manifest +++ b/sci-misc/salome-kernel/Manifest @@ -1,12 +1,12 @@ 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-pyobject.patch 7085 RMD160 db7d5bcccc78f9f1a2a2a0148bd7eadcdcb89fc5 SHA1 d661823bac9249065a3e55055f4947876289c97f SHA256 88f19a09ce6f81e18f6f908a74c683cb2940e0fae413e5e6d8c8a499874b0a09 -AUX salome-kernel-3.2.6_omniorg.patch 159 RMD160 6071fe5caa4b2d38bc34e26dfeb5c2b56a501b1d SHA1 1e441ed3543def24cf3fd06fc569b62efa078c10 SHA256 b7effbbb105a57c0f342d55881733d125aff63435605fbf4c2036e556e2a71a0 +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.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 5418 RMD160 2e73db28e351b92ed371b3f026bd0d3250397443 SHA1 a646ace2b5e168e9100d44b520a6a3a5a5034a81 SHA256 bccd834f7c53ae26287435d05b206dd19beabab4e01159b65e84f736a87a5016 -MISC ChangeLog 1242 RMD160 9779e290074853e0ef3c32bf22618a741f7ea184 SHA1 43d3a28e3ccf23c0c7e975a74d061892a0d7bd59 SHA256 02b5423a880bb8aaab1972dc9c7beb2704e0833d635fbeb56ae6075813960769 +EBUILD salome-kernel-3.2.6.ebuild 5353 RMD160 702bbb6a52ab7d6a408881cf6bb6f14e3c88e1d8 SHA1 d29e420bcb5d8f8538dec97549fd18b5793e91d8 SHA256 766d66ff9abcde9e476c1f4eca5ea3f65dbc4f6b5eb70983227d301aaeb896bb +MISC ChangeLog 1534 RMD160 3fa6d9b0ad1cfec99fdbd30cbd8399f9d041914b SHA1 f7a6a4db61d83b3e902c589ee75c9c6475c672ab SHA256 51b9d7b025c8b56373a809d85fd807b7d3eaa3d630d1e59cb061ef4094ee9761 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 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 )" diff --git a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild index 5f1ff91e7..797731bbd 100644 --- a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild +++ b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild @@ -12,14 +12,16 @@ SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="doc corba opengl openpbs mpi debug X" +IUSE="debug doc mpi opengl openpbs" RDEPEND="opengl? ( virtual/opengl ) mpi? ( sys-cluster/mpich2 ) debug? ( dev-util/cppunit ) openpbs? ( sys-cluster/torque ) - corba? ( <=dev-python/omniorbpy-2.6 - <=net-misc/omniORB-4.1 )" + dev-python/omniorbpy + net-misc/omniORB" + +# Note that Corba is apparently not optional in this module DEPEND="${RDEPEND} app-doc/doxygen @@ -46,8 +48,7 @@ INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" export OPENPBS="/usr" -src_unpack() -{ +src_unpack() { python_version distutils_python_version ewarn "Python 2.4 is highly recommended for Salome..." @@ -65,6 +66,7 @@ src_unpack() 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 @@ -86,16 +88,11 @@ src_unpack() } -src_compile() -{ +src_compile() { cd "${MY_S}" local myconf="--with-tcl=/usr/$(get_libdir)/ --with-tk=/usr/$(get_libdir)/" - if use !X ; then - die "Salome functionnalities imply X support! Check your USE flags configuration." - fi - # Compiler and linker flags if use amd64 ; then append-flags -m64 @@ -126,12 +123,12 @@ src_compile() --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) \ - $(use_enable corba corba-gen) \ || die "configuration failed" # Compilation @@ -139,8 +136,7 @@ src_compile() } -src_install() -{ +src_install() { cd "${MY_S}" # Installation @@ -165,10 +161,8 @@ src_install() dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt fi - # If use omniORB as corba - if use corba ; then - sed -i 's@import CORBA@from omniORB import CORBA@' "${D}"/"${INSTALL_DIR}"/bin/salome/runSalome.py - 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 |