diff options
98 files changed, 1602 insertions, 4439 deletions
diff --git a/sci-misc/salome-component/ChangeLog b/sci-misc/salome-component/ChangeLog index 68d17b7c9..8909ce515 100644 --- a/sci-misc/salome-component/ChangeLog +++ b/sci-misc/salome-component/ChangeLog @@ -1,6 +1,15 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-component-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-component-3.2.6.ebuild, + -files/salome-component-3.2.6-gcc-4.3.patch, + -files/salome-component-3.2.6.patch, +salome-component-5.1.3.ebuild, + +files/salome-component-5.1.3-mpi.patch, metadata.xml: + Version bump 5.1.3 + removed broken 3.2.6 + 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-component-3.2.6.ebuild: removed omniorb* and med dependencies, as they are already in salome-kernel diff --git a/sci-misc/salome-component/Manifest b/sci-misc/salome-component/Manifest index 7ba6a0782..a468ead9a 100644 --- a/sci-misc/salome-component/Manifest +++ b/sci-misc/salome-component/Manifest @@ -1,6 +1,5 @@ -AUX salome-component-3.2.6-gcc-4.3.patch 560 RMD160 f3f40ff2750a3dcc5189f5e70567a28f931cfeaf SHA1 7998d668a0c0eabbba0ed996195a570db1cfcb62 SHA256 141b30503eaefe3b08f80d2fb59d294c8212760a9c712db87708a7e66e969844 -AUX salome-component-3.2.6.patch 962 RMD160 6faa88abe04da39c973179c587703f16c4ef17ae SHA1 c4fc6b63e10895f5c59095b810e4aa3b6862377f SHA256 55cec4ae7912a51a27cc2597a4be523823f950499c2caf6deeeda4411cf7ab0d -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-component-3.2.6.ebuild 4218 RMD160 d55f0519024cfbc6a710991d0d00ce444df6d57d SHA1 bd134820dd59171fa1d403c00d063394a334047f SHA256 7b5ef699a315f3b194b74aa8b899cc738d66b66ca0903a5d21060bfd767daf52 -MISC ChangeLog 1098 RMD160 47632b763ceaa7d5939c5b029f120d69db8a8e3e SHA1 8c808fe6489e0e707b267a0ae82d00afcd87d8cf SHA256 58df96aed0f982985b51ffeff55a5032b65560b4221071a90c07124cce451025 -MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 +AUX salome-component-5.1.3-mpi.patch 718 RMD160 4cfed4cf318686774a49fb037c31dc1ff24be94c SHA1 bd2d3ce92ccb57a81033f8639e8624874b529614 SHA256 9b9b85eaf19409927055fa31899aedd765ea1da05bfe5e8d58a8c8fde792345a +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-component-5.1.3.ebuild 3095 RMD160 1ad82041a016352caedf57457576451c365c6df8 SHA1 b1084c4614d77ef54c16d0e8d39b9ed7f46c484f SHA256 bea18a8b65350640f42c77beee6d1849b414164fd662fb3b5b1a545daf78f175 +MISC ChangeLog 1452 RMD160 6da8265d00db25d2de4ecfe365258ed55a912af4 SHA1 9352db644331b5dd2b8b47710249470180939150 SHA256 0f2a83dc38202d28cd6135647090dfe2c9a7c27c353fc01bd9c112778488072f +MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch b/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch deleted file mode 100644 index 51c3c0d37..000000000 --- a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx ---- src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-25 19:32:48.000000000 +0200 -+++ src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-26 02:08:55.000000000 +0200 -@@ -30,6 +30,7 @@ - #include <fstream> - #include <strstream> - #include <string> -+#include <cstring> - #include <math.h> - - using namespace std; diff --git a/sci-misc/salome-component/files/salome-component-3.2.6.patch b/sci-misc/salome-component/files/salome-component-3.2.6.patch deleted file mode 100644 index 466118455..000000000 --- a/sci-misc/salome-component/files/salome-component-3.2.6.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./COMPONENT_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200 -+++ ./COMPONENT_SRC_3.2.6/build_configure 2008-02-21 09:57:25.000000000 +0100 -@@ -144,7 +144,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 ---- ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200 -+++ ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in 2008-02-21 09:58:54.000000000 +0100 -@@ -26,12 +26,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - diff --git a/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch new file mode 100644 index 000000000..e9e920c8e --- /dev/null +++ b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch @@ -0,0 +1,11 @@ +--- src5.1.3.orig/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:08:31.371569651 +0100 ++++ src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:09:05.060321118 +0100 +@@ -571,7 +571,7 @@ + done + AddComponent_CheckOfUndefined$(EXEEXT): $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_DEPENDENCIES) + @rm -f AddComponent_CheckOfUndefined$(EXEEXT) +- $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS) ++ $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS) $(MPI_LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/sci-misc/salome-component/metadata.xml b/sci-misc/salome-component/metadata.xml index b229aec85..d369d068f 100644 --- a/sci-misc/salome-component/metadata.xml +++ b/sci-misc/salome-component/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> + <herd>sci</herd> </pkgmetadata> diff --git a/sci-misc/salome-component/salome-component-3.2.6.ebuild b/sci-misc/salome-component/salome-component-3.2.6.ebuild deleted file mode 100644 index 9aa85524b..000000000 --- a/sci-misc/salome-component/salome-component-3.2.6.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. COMPONENT 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 ) - openpbs? ( sys-cluster/torque ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - >=sci-misc/salome-med-${PV}" - -MODULE_NAME="COMPONENT" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -COMPONENT_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..." - - 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}.patch - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-component with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - 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 - - # Get rid of mpich2 SEEK_SET errors - # This happens if mpich2 is compiled with the cxx use flag - append-flags -DMPICH_IGNORE_CXX_SEEK - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-component/salome-component-5.1.3.ebuild b/sci-misc/salome-component/salome-component-5.1.3.ebuild new file mode 100644 index 000000000..7672fcc1c --- /dev/null +++ b/sci-misc/salome-component/salome-component-5.1.3.ebuild @@ -0,0 +1,119 @@ +# 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 flag-o-matic + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. COMPONENT 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" + +RDEPEND="mpi? ( || ( sys-cluster/openmpi[cxx] + sys-cluster/mpich2[cxx] ) ) + debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-gui-${PV} + >=sci-misc/salome-med-${PV} + >=x11-libs/qt-core-4.4.3 + >=x11-libs/qt-gui-4.4.3 + >=x11-libs/qt-opengl-4.4.3 + >=x11-libs/qwt-5.2 + >=dev-python/PyQt4-4.4.3 + >=sci-libs/opencascade-6.3" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4 + >=dev-python/sip-4.7.7 + dev-lang/swig + dev-libs/libxml2" + +MODULE_NAME="COMPONENT" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +COMPONENT_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..." +} + +src_prepare() { + cd "${MY_S}" + + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + local myconf="" + + cd "${MY_S}" + +# --without-mpi does not disable mpi support, just omit it to disable + if use mpi; then + append-ldflags -lmpi -lmpi_cxx + 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" + append-flags -DMPICH_IGNORE_CXX_SEEK + fi + fi + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + ${myconf} \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install \ + || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-geom/ChangeLog b/sci-misc/salome-geom/ChangeLog index cfceee87c..4f6fb95ad 100644 --- a/sci-misc/salome-geom/ChangeLog +++ b/sci-misc/salome-geom/ChangeLog @@ -1,6 +1,14 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-geom-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-geom-3.2.6.ebuild, -files/salome-geom-3.2.6-vtk-5.2.patch, + -files/salome-geom-3.2.6.patch, +salome-geom-5.1.3.ebuild, + +files/salome-geom-5.1.3-qt4-path.patch: + Version bump 5.1.3 + removed broken 3.2.6 + 20 Oct May 2008; Daniel Tourde <daniel.tourde@caelae.se> +salome-geom-3.2.6-vtk-5.2.patch Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de> diff --git a/sci-misc/salome-geom/Manifest b/sci-misc/salome-geom/Manifest index 78caef8bf..fc223c121 100644 --- a/sci-misc/salome-geom/Manifest +++ b/sci-misc/salome-geom/Manifest @@ -1,6 +1,5 @@ -AUX salome-geom-3.2.6-vtk-5.2.patch 2251 RMD160 f0d8bbbde9efe9baee35f78999dd434b158970e2 SHA1 6ead93912508c24c5408a7c5e2e89d4dee98dfe5 SHA256 32c7430375f80034d15a4e20e4ea6eefe02f16f7a1c09af940b8687e43626a6d -AUX salome-geom-3.2.6.patch 1283 RMD160 04d75a8882a853f38aec7f9b26b0d9f64eb15154 SHA1 8db9ecd670cdf64921574f4b632b43daad5d602a SHA256 5e162b7c1ac10d4510b474beed0b502e700cc99d1ed5d11f107aaaea3b1cbf43 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-geom-3.2.6.ebuild 3945 RMD160 a528faf12c742983a2b4b936de3f5bd1f3345d6b SHA1 0234133b9f500062510b1a75551d8d0a0f1b67b8 SHA256 51a64e320fd757272e68183082284e8c0b372caf89ba08838ed21454c5226deb -MISC ChangeLog 808 RMD160 4ea7e9e8e8d95d41c3a8b289eea99c5c3d81fc72 SHA1 afd84e1f7e831ca03cf8d374393dcff5a61797a8 SHA256 7030b1d17095efaeb8a897f56e31863af06436bcc62569a340174063b8bb3787 +AUX salome-geom-5.1.3-qt4-path.patch 468 RMD160 6c964af8ff04e5677b15f8ead0750bb33ea1ea3d SHA1 05db7015702089319933e0e78b276c60fd1f2d07 SHA256 7c880879bb040dcbb11d34123ab5283e31ed998abff6e0f11b7c75377e52495e +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-geom-5.1.3.ebuild 3117 RMD160 3851d7a53d0bea5a78d8df1d3350957e167137c3 SHA1 e0d6ab2894f1c13a9b08f5da361ef56ab2022d02 SHA256 43e54f280bae94c600063fb4cc0542a530860f8986bb2216fd5a0654ff0a3e7f +MISC ChangeLog 1121 RMD160 a8e3fe3c32a0d92c9e054182161e0f4c70888999 SHA1 749190f4c3ddc1dde5fe01453e5a4dc38e1fe150 SHA256 3d7fb0d29e64d239f92ba0a0793650b341778bd94ab0a909fcf64dcf984fa87b MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch deleted file mode 100644 index e0b4e8778..000000000 --- a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -aur src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx ---- src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-07-25 09:16:09.000000000 +0200 -+++ src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-10-16 22:11:49.000000000 +0200 -@@ -88,7 +88,7 @@ - static Standard_Real HatcherConfusion2d = 1.e-8 ; - static Standard_Real HatcherConfusion3d = 1.e-8 ; - --static Standard_Integer lastVTKpoint = 0; -+static vtkIdType lastVTKpoint = 0; - static Standard_Integer PlotCount = 0; - static Standard_Real IsoRatio = 1.001; - static Standard_Integer MaxPlotCount = 5; -@@ -483,9 +483,9 @@ - { - float coord[3]; - coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z(); -- Standard_Integer NewVTKpoint = Pts->InsertNextPoint(coord); -+ vtkIdType NewVTKpoint = Pts->InsertNextPoint(coord); - -- int pts[2]; -+ vtkIdType pts[2]; - pts[0] = lastVTKpoint; - pts[1] = NewVTKpoint; - -@@ -751,7 +751,7 @@ - aP2 = theNodesP(nbnodes); - - float coord[3]; -- int pts[2]; -+ vtkIdType pts[2]; - - for(int j=1;j<nbnodes;j++) { - gp_Pnt pt1 = theNodesP(j); -@@ -783,7 +783,7 @@ - aP2 = theNodesPoly(nbnodes); - - float coord[3]; -- int pts[2]; -+ vtkIdType pts[2]; - - for(int j=1;j<nbnodes;j++) { - Standard_Integer id1 = Nodesidx(j); -@@ -854,12 +854,12 @@ - float coord[3]; - coord[0] = xo; coord[1] = yo; coord[2] = zo; - -- int ptLoc = Pts->InsertNextPoint(coord); -- int ptFirst = 0; -- int ptPrev = 0; -- int ptCur = 0; -+ vtkIdType ptLoc = Pts->InsertNextPoint(coord); -+ vtkIdType ptFirst = 0; -+ vtkIdType ptPrev = 0; -+ vtkIdType ptCur = 0; - -- int pts[2]; -+ vtkIdType pts[2]; - - int NbPoints = 15; - for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur) -@@ -947,7 +947,7 @@ - - gp_Pnt P = BRep_Tool::Pnt( aVertex ); - float delta = 1, coord[3]; -- int pts[2]; -+ vtkIdType pts[2]; - // insert pt - ZERO_COORD; coord[0] = +delta; - pts[0] = Pts->InsertNextPoint(coord); -@@ -1026,7 +1026,7 @@ - Standard_Integer N1,N2,N3; - Triangles(i).Get(N1,N2,N3); - -- int pts[3]; -+ vtkIdType pts[3]; - pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1; - Cells->InsertNextCell(3,pts); - diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6.patch deleted file mode 100644 index f537d9e37..000000000 --- a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./GEOM_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200 -+++ ./GEOM_SRC_3.2.6/build_configure 2008-01-07 10:28:14.000000000 +0100 -@@ -116,7 +116,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 ---- ./GEOM_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200 -+++ ./GEOM_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 11:34:23.000000000 +0100 -@@ -27,12 +27,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - ---- ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200 -+++ ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 12:00:47.000000000 +0100 -@@ -29,7 +29,7 @@ - @COMMENCE@ - - usr_docs: -- cp -fr $(srcdir)/GEOM ./ -+# cp -fr $(srcdir)/GEOM ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - - docs: usr_docs diff --git a/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch new file mode 100644 index 000000000..0f4168613 --- /dev/null +++ b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch @@ -0,0 +1,11 @@ +--- src5.1.3.orig/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100 ++++ src5.1.3/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100 +@@ -333,7 +333,7 @@ + + LIBS_old=$LIBS + if test "x$QTDIR" = "x/usr" ; then +- QT_LIB_DIR="" ++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4" + elif test -d ${QTDIR}/lib; then + QT_LIB_DIR="-L$QTDIR/lib" + elif test -d ${QTDIR}/lib64; then diff --git a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild b/sci-misc/salome-geom/salome-geom-3.2.6.ebuild deleted file mode 100644 index 34f9d4745..000000000 --- a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. GEOM 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" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV}" - -MODULE_NAME="GEOM" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" -export OPENPBS="/usr" - -src_unpack() { - python_version - distutils_python_version - - 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}.patch - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" && has_version "<sci-libs/vtk-5.2" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - fi - # If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk - if has_version ">=sci-libs/vtk-5.2" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.2 - epatch "${FILESDIR}"/${P}-vtk-5.2.patch - fi - -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-geom with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without-<flag> for mpich - # 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-mpich" - fi - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild new file mode 100644 index 000000000..7bd21db3c --- /dev/null +++ b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild @@ -0,0 +1,117 @@ +# 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. GEOM 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 opengl" + +RDEPEND="opengl? ( virtual/opengl ) + mpi? ( || ( sys-cluster/openmpi[cxx] + sys-cluster/mpich2[cxx] ) ) + debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-gui-${PV} + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=sci-libs/opencascade-6.3 + >=dev-libs/boost-1.40.0 + >=sci-libs/vtk-5.0[python] + >=sci-libs/hdf5-1.6.4" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4 + dev-lang/swig" + +MODULE_NAME="GEOM" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-qt4-path.patch + + cd "${MY_S}" + rm -r -f autom4te.cache + ./clean_configure + ./build_configure +} + +src_configure() { + local vtk_suffix="" + + has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" + has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2" + has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4" + + cd "${MY_S}" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + --with-vtk=${VTKHOME} \ + --with-vtk-version=${vtk_suffix} \ + --with-qt='/usr' \ + $(use_enable debug ) \ + $(use_enable debug debug ) \ + $(use_enable !debug production ) \ + $(use_with opengl opengl /usr) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + MAKEOPTS="-j1" emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog index a3c8f02ff..a36b6e7f2 100644 --- a/sci-misc/salome-gui/ChangeLog +++ b/sci-misc/salome-gui/ChangeLog @@ -1,5 +1,19 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + +*salome-gui-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-gui-3.2.6.ebuild, -files/salome-gui-3.2.6-gcc-4.3.patch, + -files/salome-gui-3.2.6-vtk-5.2.patch, + -files/salome-gui-3.2.6_configure_in_base.patch, + -files/salome-gui-3.2.6_pyobject.patch, + -files/salome-gui-3.2.6_qwt-4.patch, + -files/salome-gui-3.2.6_sip-4.1.7.patch, -files/salome-gui-3.2.6.patch, + -files/salome-gui-vtk-5.0.patch, +salome-gui-5.1.3.ebuild, + +files/salome-gui-5.1.3-qt4-path.patch: + Version bump 5.1.3 + removed broken 3.2.6 + 20 Oct 2008; Daniel Tourde <daniel.tourde@caelae.se> +salome-gui-3.2.6-vtk-5.2.patch Added support to vtk 5.2 and QT-3.3.8b. Patch provided by Bert Karwatzki <spasswolf@web.de> diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest index 4af530d64..6c2623fee 100644 --- a/sci-misc/salome-gui/Manifest +++ b/sci-misc/salome-gui/Manifest @@ -1,12 +1,5 @@ -AUX salome-gui-3.2.6-gcc-4.3.patch 2808 RMD160 18acd8191f87846712fe1a49a9cf0ede36c8d1e9 SHA1 aa0a2de9c868daee034f286d43074770313f3589 SHA256 363e9c3c194a7124a091ff6ddc8afc3a448de203a2a5cfbb26eb61ba815a97e8 -AUX salome-gui-3.2.6-vtk-5.2.patch 8949 RMD160 6a969ca06714858735cc04c3e8e62312227b8054 SHA1 73681781173b54e998ff36a11d5b0163d4879f8e SHA256 b9f0ccfa4b55dfdeb78b10ea7c6133634e18a3684cccba441d44a5f7040aad26 -AUX salome-gui-3.2.6.patch 3127 RMD160 2440a51dd74e2d7abda68b33f907de036c1653de SHA1 9e689187cc6b89f53c0f8e89c2cb86cc059df19a SHA256 9a9466186799c2f30b5ab9996537128681495d1be18a2dbb060f855f2936d6d7 -AUX salome-gui-3.2.6_configure_in_base.patch 4588 RMD160 feab6b36319891f65665280d8f6e3e50078ec2f9 SHA1 abf258e19af6601f64215b9d0cc1fadc942f8025 SHA256 2ce9d880a0d7a4be6fca4ac5c1d2b927bd80c25aae41c4ee56eef2007dfe42d4 -AUX salome-gui-3.2.6_pyobject.patch 535 RMD160 fa4f7002be33a33ee6a4b3ff3e6ca09f982c0b92 SHA1 27174db2f84912b77cb117fd1bf7216e67a1088a SHA256 8d7589b22717ee3305917d6696ecbd899b1c67c1e71b83f7771924f8b7c3df43 -AUX salome-gui-3.2.6_qwt-4.patch 1853 RMD160 921d470a2aa3be47113c6c0f1cf6d913d08ae47f SHA1 7a35b01bcda7d63b357fd67bd48be16cbf4438fb SHA256 c7fc34c220f4d19896783f43e444de245eae5d8464315fa55d0093adfc0e2b97 -AUX salome-gui-3.2.6_sip-4.1.7.patch 785 RMD160 0531e5ab612a973359ed96ce6afdbe09c0894678 SHA1 35207f32922b48782b08b17e85dcae596cfb2123 SHA256 daf7c76dfead2da15a4857849d119843ae5702f163c5d4a45404cdd8fd706185 -AUX salome-gui-vtk-5.0.patch 8618 RMD160 e529f86abaad3991ba9e4d9664bf0b55dd9a6bbc SHA1 02cfa2dea47e8d3b8eff50ab90fb6acf2e15befd SHA256 15489b2ee67611077a7e988fcafdab20dab59335a34519baef6797ac4b4e2c30 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-gui-3.2.6.ebuild 4806 RMD160 c18e6387c3b105db11071e8b6fee5f55f8779548 SHA1 949318d00bf911b00ba5c84e63d880312bd223a5 SHA256 0bc3601a61966009e078ec680159a531bcc515475e6051a57fc0a4e3bda16b8c -MISC ChangeLog 1516 RMD160 fd35856ebe9b6dc9732457ec0065e7a894c31ef4 SHA1 96c11ffd809648fd8b1e62507bca9b06edc36e42 SHA256 23f0eae8944f4bd31a5f25ac92855f7ffbd16d330b8cf865b09450d4f1322cb5 +AUX salome-gui-5.1.3-qt4-path.patch 466 RMD160 eccedc638d748a4cfa0e394ebe04cc748bacbc5e SHA1 539a3105d97c38a4d30fd8e8620af63fe4278568 SHA256 051e0e2c75328e4a9b301d33ba77944befbc2603c656c096a05db8cb64f70fc0 +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-gui-5.1.3.ebuild 3194 RMD160 09db3f07fba1f7e90c374b0d8a1d3eeb307cd8b4 SHA1 d79e87f15ad3dd7ec251414d199129cf12ceddb4 SHA256 2377bd6e7eb606cdc017204ffcfbcac68e9cc1f71d3ef1c04a1a3976113de06a +MISC ChangeLog 2073 RMD160 a54c5af7f69746202dacd9f76aa5f1751b37593b SHA1 b9e6151d569ab4fd580e499d59ef015446bdb368 SHA256 75f51c8cfc00245e7c1028ab8718e1036b967a3f3a848648c96a690d7ddbfd16 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch deleted file mode 100644 index 63eab18b9..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-26 00:04:12.000000000 +0200 -@@ -27,7 +27,9 @@ - - #include <GL/gl.h> - --#include <iostream.h> -+#include <iostream> -+ -+using std::cout; - - /*! - Constructor -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-26 00:38:10.000000000 +0200 -@@ -47,6 +47,7 @@ - #include <qstringlist.h> - #include <qapplication.h> - #include <iostream> -+#include <cstdlib> - - /*! - \return the SALOME version number -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-26 00:28:19.000000000 +0200 -@@ -36,7 +36,7 @@ - #include <qdict.h> - - #include "utilities.h" --#include <iostream.h> -+#include <iostream> - #include <string> - #include <vector> - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 23:41:44.000000000 +0200 -@@ -22,6 +22,7 @@ - #include <qdir.h> - #include <qapplication.h> - #include <qregexp.h> -+#include <cstdlib> - - /*! - Constructor -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-26 00:19:17.000000000 +0200 -@@ -67,7 +67,7 @@ - //VRV: porting on Qt 3.0.5 - #include <algorithm> - --#include <iostream.h> -+#include <iostream> - - using namespace std; - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-25 19:32:46.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-26 00:12:09.000000000 +0200 -@@ -31,6 +31,7 @@ - - #include <set> - #include <map> -+#include <algorithm> - - #include <vtkUnstructuredGrid.h> - #include <vtkGeometryFilter.h> diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch deleted file mode 100644 index 0f7efaf90..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff -aur src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 ---- src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-10-16 23:05:29.000000000 +0200 -@@ -76,7 +76,7 @@ - if test -z $VTKHOME - then - AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled) -- if test -f /usr/include/vtk/vtkPlane.h ; then -+ if test -f /usr/include/vtk-5.2/vtkPlane.h ; then - AC_MSG_RESULT(trying /usr) - VTKHOME="/usr" - fi -@@ -84,9 +84,9 @@ - - if test ! -z $VTKHOME - then -- LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" -- LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS" -- TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS" -+ LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.2 $LOCAL_INCLUDES" -+ LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS" -+ TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS" - fi - - dnl vtk headers -@@ -142,4 +142,4 @@ - # Save cache - AC_CACHE_SAVE - --])dnl -\ Kein Zeilenumbruch am Dateiende. -+])dnl -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2008-10-16 23:05:29.000000000 +0200 -@@ -13,7 +13,7 @@ - - class SALOME_Selection : QObject - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -@@ -75,7 +75,7 @@ - - class SalomePyQt - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -46,8 +46,8 @@ - #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h" - #endif - --#include <sipqtQWidget.h> --#include <sipqtQPopupMenu.h> -+//#include <sipqtQWidget.h> -+//#include <sipqtQPopupMenu.h> - - #include <CORBA.h> - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx 2008-10-16 23:12:43.000000000 +0200 -@@ -143,7 +143,7 @@ - if(int aNbOfParts = theMapIndex.Extent()){ - vtkPoints *aPoints = vtkPoints::New(); - aPoints->SetNumberOfPoints(aNbOfParts); -- for(int i = 0; i < aNbOfParts; i++){ -+ for(vtkIdType i = 0; i < aNbOfParts; i++){ - int aPartId = theMapIndex( i+1 ); - if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){ - aPoints->SetPoint(i,aCoord); -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -119,8 +119,8 @@ - vtkIdType aPntStartId = 0; - vtkIdType aCellStartId = 0; - -- for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){ -- vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]); -+ for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){ -+ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId)); - // Do mapping of the nodes - if(!GetSharedPointsDataSet()){ - vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); -@@ -265,11 +265,11 @@ - - numCells = 0; - -- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs); -+ vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems()); - int firstCD=1; - -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) { - continue; //no input, just skip -@@ -308,8 +308,8 @@ - output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData()); - - // 2.cells -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - numCells = ds->GetNumberOfCells(); - cd = ds->GetCellData(); -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -240,7 +240,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -@@ -329,7 +329,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -80,7 +80,7 @@ - VTKViewer_GeometryFilter - ::Execute() - { -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkIdType numCells=input->GetNumberOfCells(); - - if (numCells == 0) -@@ -134,7 +134,8 @@ - vtkIdType newCellId; - int faceId, *faceVerts, numFacePts; - vtkFloatingPointType *x; -- int PixelConvert[4], aNewPts[VTK_CELL_SIZE]; -+ int PixelConvert[4]; -+ vtkIdType aNewPts[VTK_CELL_SIZE]; - // ghost cell stuff - unsigned char updateLevel = (unsigned char)(output->GetUpdateGhostLevel()); - unsigned char *cellGhostLevels = 0; -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -58,7 +58,7 @@ - vtkFloatingPointType center[3], *p, pt[3]; - vtkPointData *pd, *outPD;; - vtkIdList *ptIds, *newPtIds; -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkUnstructuredGrid *output = this->GetOutput(); - vtkIdType tenth; - vtkFloatingPointType decimal; -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -43,8 +43,8 @@ - vtkPoints *inPts; - vtkPoints *newPts; - int numPts, numCells; -- vtkPointSet *input = this->GetInput(); -- vtkPointSet *output = this->GetOutput(); -+ vtkPointSet *input = (vtkPointSet*) this->GetInput(); -+ vtkPointSet *output = (vtkPointSet*) this->GetOutput(); - vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData(); - vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData(); - output->CopyStructure( input ); diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch deleted file mode 100644 index c5a9988ab..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-03 12:51:11.000000000 +0100 -@@ -28,7 +28,7 @@ - @COMMENCE@ - - usr_docs: -- cp -fr $(srcdir)/GUI ./ -+# cp -fr $(srcdir)/GUI ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - - docs: usr_docs ---- ./GUI_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200 -@@ -26,12 +26,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - ---- ./GUI_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./GUI_SRC_3.2.6/build_configure 2007-05-26 12:29:53.000000000 +0200 -@@ -109,7 +109,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 -diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 ---- ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4.org 2007-11-25 19:13:29.000000000 +0100 -+++ ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 2007-11-25 19:15:45.000000000 +0100 -@@ -50,6 +50,10 @@ - SIP_VERS=v4_new ;; - 4.5*) - SIP_VERS=v4_new ;; -+ 4.6*) -+ SIP_VERS=v4_new ;; -+ 4.7*) -+ SIP_VERS=v4_new ;; - *) - AC_MSG_RESULT(sip version $version not supported) - SIP_VERS=unsupported ;; -diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in ---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100 -+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2007-11-25 19:14:50.000000000 +0100 -@@ -41,6 +41,12 @@ - ifeq ($(QT_VERS),Qt_3_3_7) - QT_VERS = Qt_3_3_0 - endif -+ifeq ($(QT_VERS),Qt_3_3_8) -+QT_VERS = Qt_3_3_0 -+endif -+ifeq ($(QT_VERS),Qt_3_3_8b) -+QT_VERS = Qt_3_3_6 -+endif - - # Sip flags - SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) -diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in ---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100 -+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2007-11-25 19:14:21.000000000 +0100 -@@ -44,6 +44,14 @@ - QT_VERS = Qt_3_3_0 - endif - -+ifeq ($(QT_VERS),Qt_3_3_8) -+QT_VERS = Qt_3_3_0 -+endif -+ -+ifeq ($(QT_VERS),Qt_3_3_8b) -+QT_VERS = Qt_3_3_6 -+endif -+ - # Sip flags - SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) - diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch deleted file mode 100644 index 71044edad..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch +++ /dev/null @@ -1,118 +0,0 @@ -Seulement dans src3.2.6/GUI_SRC_3.2.6: #configure.in.base# -diff -abur src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base src3.2.6/GUI_SRC_3.2.6/configure.in.base ---- src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/configure.in.base 2008-03-24 16:41:34.000000000 +0100 -@@ -35,37 +35,82 @@ - ######################################################################## - # Check --disable-corba-gen and other --disable-* options - --GUI_DISABLE_CORBA="no" --DISABLE_PYCONSOLE="no" --DISABLE_GLVIEWER="no" --DISABLE_PLOT2DVIEWER="no" --DISABLE_SUPERVGRAPHVIEWER="no" --DISABLE_OCCVIEWER="no" --DISABLE_VTKVIEWER="no" --DISABLE_SALOMEOBJECT="no" -- --for option --do -- case $option in -- -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen) -- GUI_DISABLE_CORBA="yes";; -- -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole) -- DISABLE_PYCONSOLE="yes";; -- -disable-glViewer=yes | --disable-glViewer=yes | -disable-glViewer | --disable-glViewer) -- DISABLE_GLVIEWER="yes";; -- -disable-plot2dViewer=yes | --disable-plot2dViewer=yes | -disable-plot2dViewer | --disable-plot2dViewer) -- DISABLE_PLOT2DVIEWER="yes";; -- -disable-supervGraphViewer=yes | --disable-supervGraphViewer=yes | \ -- -disable-supervGraphViewer | --disable-supervGraphViewer) -- DISABLE_SUPERVGRAPHVIEWER="yes";; -- -disable-occViewer=yes | --disable-occViewer=yes | -disable-occViewer | --disable-occViewer) -- DISABLE_OCCVIEWER="yes";; -- -disable-vtkViewer=yes | --disable-vtkViewer=yes | -disable-vtkViewer | --disable-vtkViewer) -- DISABLE_VTKVIEWER="yes";; -- -disable-salomeObject=yes | --disable-salomeObject=yes | -disable-salomeObject | --disable-salomeObject) -- DISABLE_SALOMEOBJECT="yes";; -- esac --done -+AC_ARG_ENABLE([corba-gen], -+ [--enable-corba-gen], -+ [if test x$enableval = "xyes"; then -+ GUI_DISABLE_CORBA="no"; -+ elif test x$enableval = "xno"; then -+ GUI_DISABLE_CORBA="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([pyConsole], -+ [--enable-pyConsole], -+ [if test x$enableval = "xyes"; then -+ DISABLE_PYCONSOLE="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_PYCONSOLE="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([glViewer], -+ [--enable-glViewer], -+ [if test x$enableval = "xyes"; then -+ DISABLE_GLVIEWER="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_GLVIEWER="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([plot2dViewer], -+ [--enable-plot2dViewer], -+ [if test x$enableval = "xyes"; then -+ DISABLE_PLOT2DVIEWER="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_PLOT2DVIEWER="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([supervGraphViewer], -+ [--enable-supervGraphViewer], -+ [if test x$enableval = "xyes"; then -+ DISABLE_SUPERVGRAPHVIEWER="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_SUPERVGRAPHVIEWER="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([occViewer], -+ [--enable-occViewer], -+ [if test x$enableval = "xyes"; then -+ DISABLE_OCCVIEWER="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_OCCVIEWER="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) -+ -+AC_ARG_ENABLE([salomeObject], -+ [--enable-salomeObject], -+ [if test x$enableval = "xyes"; then -+ DISABLE_SALOMEOBJECT="no"; -+ elif test x$enableval = "xno"; then -+ DISABLE_SALOMEOBJECT="yes"; -+ else -+ echo "Error : unknown value : $enableval" -+ exit 1 -+ fi]) - - dnl - dnl Initialize source and build root directories diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch deleted file mode 100644 index 0607ae387..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-09-04 10:20:58.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-09-04 10:21:43.000000000 +0200 -@@ -764,7 +764,7 @@ - if ( PyDict_Check( res1 ) ) { - PyObject* key; - PyObject* value; -- int pos = 0; -+ Py_ssize_t pos = 0; - while ( PyDict_Next( res1, &pos, &key, &value ) ) { - // parse the return value - // it should be a map: {integer:integer} diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch deleted file mode 100644 index c4c703cd9..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4.org 2008-02-19 14:43:03.000000000 +0100 -+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-02-19 14:46:31.000000000 +0100 -@@ -27,17 +27,17 @@ - exits_ok=no - if test "x$exits_ok" = "xno"; then - for d in /usr/local /usr ; do -- AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exits_ok=yes,exits_ok=no) -+ AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no) - if test "x$exits_ok" = "xyes"; then - QWTHOME=$d -- AC_MSG_RESULT(libqwt.so detected in $d/lib) -+ AC_MSG_RESULT(libqwt.so.4 detected in $d/lib) - fi - done - fi - if test "x$exits_ok" = "xno"; then - for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do -- if test -f $d/libqwt.so ; then -- AC_MSG_RESULT(libqwt.so detected in $d) -+ if test -f $d/libqwt.so.4 ; then -+ AC_MSG_RESULT(libqwt.so.4 detected in $d) - QWTHOME=$d - QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - exits_ok=yes ---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4_orig 2008-01-06 12:46:14.000000000 +0100 -+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-01-06 13:16:14.000000000 +0100 -@@ -96,9 +96,9 @@ - fi - if test "x$QWTHOME" = "x/usr" - then -- LIBS="$LIBS -lqwt" -+ LIBS="$LIBS -l:libqwt.so.4" - else -- LIBS="$LIBS -L$QWTHOME/lib -lqwt" -+ LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4" - fi - - CXXFLAGS_old=$CXXFLAGS -@@ -126,9 +126,9 @@ - QWT_INCLUDES="-I$QWT_INCLUDES" - if test "x$QWTHOME" = "x/usr" - then -- QWT_LIBS=" -lqwt" -+ QWT_LIBS=" -l:libqwt.so.4" - else -- QWT_LIBS="-L$QWTHOME/lib -lqwt" -+ QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4" - fi - - AC_SUBST(QWT_INCLUDES) diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch deleted file mode 100644 index f389a65a4..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:04:12.000000000 +0100 -+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:05:26.000000000 +0100 -@@ -63,6 +63,43 @@ - PT_User - }; - -+%ModuleCode -+ -+enum MenuName { -+ File = 1, -+ View = 2, -+ Edit = 3, -+ Preferences = 4, -+ Tools = 5, -+ Window = 6, -+ Help = 7 -+}; -+ -+enum WindowType { -+ WT_ObjectBrowser, -+ WT_PyConsole, -+ WT_LogWindow, -+ WT_User -+}; -+ -+enum PrefType { -+ PT_Space, -+ PT_Bool, -+ PT_Color, -+ PT_String, -+ PT_Selector, -+ PT_DblSpin, -+ PT_IntSpin, -+ PT_Double, -+ PT_Integer, -+ PT_GroupBox, -+ PT_Font, -+ PT_DirList, -+ PT_File, -+ PT_User -+}; -+%End -+ - class QtxAction : QAction - { - %TypeHeaderCode diff --git a/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch new file mode 100644 index 000000000..da9c6d089 --- /dev/null +++ b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch @@ -0,0 +1,11 @@ +--- src5.1.3.orig/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100 ++++ src5.1.3/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100 +@@ -333,7 +333,7 @@ + + LIBS_old=$LIBS + if test "x$QTDIR" = "x/usr" ; then +- QT_LIB_DIR="" ++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4" + elif test -d ${QTDIR}/lib; then + QT_LIB_DIR="-L$QTDIR/lib" + elif test -d ${QTDIR}/lib64; then diff --git a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch b/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch deleted file mode 100644 index 032ed937f..000000000 --- a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2007-05-26 12:32:50.000000000 +0200 -@@ -76,7 +76,7 @@ - if test -z $VTKHOME - then - AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled) -- if test -f /usr/include/vtk/vtkPlane.h ; then -+ if test -f /usr/include/vtk-5.0/vtkPlane.h ; then - AC_MSG_RESULT(trying /usr) - VTKHOME="/usr" - fi -@@ -84,9 +84,9 @@ - - if test ! -z $VTKHOME - then -- LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" -- LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS" -- TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS" -+ LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.0 $LOCAL_INCLUDES" -+ LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS" -+ TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS" - fi - - dnl vtk headers -@@ -142,4 +142,4 @@ - # Save cache - AC_CACHE_SAVE - --])dnl -\ No newline at end of file -+])dnl -Seulement dans ./src3.2.6/GUI_SRC_3.2.6: autom4te.cache -Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure -Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure.in -Seulement dans ./src3.2.6/GUI_SRC_3.2.6: salome_adm -diff -abur /home/francois/Desktop/salome/src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ---- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-11-26 00:18:40.000000000 +0100 -@@ -13,7 +13,7 @@ - - class SALOME_Selection : QObject - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -@@ -75,7 +75,7 @@ - - class SalomePyQt - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt: SalomePyQt.sip~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-11-25 23:34:31.000000000 +0100 -@@ -46,8 +46,8 @@ - #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h" - #endif - --#include <sipqtQWidget.h> --#include <sipqtQPopupMenu.h> -+//#include <sipqtQWidget.h> -+//#include <sipqtQPopupMenu.h> - - #include <CORBA.h> - -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI: SALOME_PYQT_Module.cxx~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-11-25 21:39:54.000000000 +0100 -@@ -119,8 +119,8 @@ - vtkIdType aPntStartId = 0; - vtkIdType aCellStartId = 0; - -- for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){ -- vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]); -+ for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){ -+ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId)); - // Do mapping of the nodes - if(!GetSharedPointsDataSet()){ - vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); -@@ -265,11 +265,11 @@ - - numCells = 0; - -- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs); -+ vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems()); - int firstCD=1; - -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) { - continue; //no input, just skip -@@ -308,8 +308,8 @@ - output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData()); - - // 2.cells -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - numCells = ds->GetNumberOfCells(); - cd = ds->GetCellData(); -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_AppendFilter.cxx~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-11-25 20:53:53.000000000 +0100 -@@ -240,7 +240,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -@@ -329,7 +329,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ExtractUnstructuredGrid.cxx~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-11-25 20:55:38.000000000 +0100 -@@ -80,7 +80,7 @@ - VTKViewer_GeometryFilter - ::Execute() - { -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkIdType numCells=input->GetNumberOfCells(); - - if (numCells == 0) -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_GeometryFilter.cxx~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-11-25 21:40:41.000000000 +0100 -@@ -58,7 +58,7 @@ - vtkFloatingPointType center[3], *p, pt[3]; - vtkPointData *pd, *outPD;; - vtkIdList *ptIds, *newPtIds; -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkUnstructuredGrid *output = this->GetOutput(); - vtkIdType tenth; - vtkFloatingPointType decimal; -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ShrinkFilter.cxx~ -diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ---- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-11-25 21:41:40.000000000 +0100 -@@ -43,8 +43,8 @@ - vtkPoints *inPts; - vtkPoints *newPts; - int numPts, numCells; -- vtkPointSet *input = this->GetInput(); -- vtkPointSet *output = this->GetOutput(); -+ vtkPointSet *input = (vtkPointSet*) this->GetInput(); -+ vtkPointSet *output = (vtkPointSet*) this->GetOutput(); - vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData(); - vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData(); - output->CopyStructure( input ); -Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_TransformFilter.cxx~ diff --git a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild deleted file mode 100644 index 928691cd3..000000000 --- a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. GUI 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 vtkviewer" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV}" - -MODULE_NAME="GUI" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -GUI_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" -export OPENPBS="/usr" - - -src_unpack() { - python_version - distutils_python_version - - if ! built_with_use sci-libs/vtk python ; then - die "You must rebuild sci-libs/vtk with python USE flag" - fi - - unpack ${A} - cd "${WORKDIR}/src${PV}" - epatch "${FILESDIR}"/${P}.patch - epatch "${FILESDIR}"/${P}_sip-4.1.7.patch - epatch "${FILESDIR}"/${P}_qwt-4.patch - epatch "${FILESDIR}"/${P}_configure_in_base.patch - - # Python 2.5 support - if version_is_at_least "2.5" "${PYVER}"; then - epatch "${FILESDIR}"/${P}_pyobject.patch - fi - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" && has_version "<sci-libs/vtk-5.2" ; then - append-flags -I/usr/include/vtk-5.0 - epatch "${FILESDIR}"/${P}-vtk-5.0.patch - fi - # If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk - if has_version ">=sci-libs/vtk-5.2" ; then - append-flags -I/usr/include/vtk-5.2 - epatch "${FILESDIR}"/${P}-vtk-5.2.patch - fi - - cd "${MY_S}" - - rm -r -f autom4te.cache - ./build_configure -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-gui with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Quick hack to fix the patch to vtkLibs - append-flags -L/usr/$(get_libdir)/python${PYVER}/site-packages/vtk - - # Fix a bug concerning a missing header - append-flags -I${MY_S}/../KERNEL_SRC_${PV}/src/Basics/Test - - # Specifying --without-<flag> for mpich - # 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-mpich" - fi - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - --enable-pyConsole \ - --enable-glViewer \ - --enable-plot2dViewer \ - --enable-supervGraphViewer \ - --enable-occViewer \ - --enable-salomeObject \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - $(use_enable vtkviewer vtkViewer) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc AUTHORS INSTALL NEWS README README.FIRST.txt - fi - -} - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-gui/salome-gui-5.1.3.ebuild b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild new file mode 100644 index 000000000..93334abb4 --- /dev/null +++ b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild @@ -0,0 +1,121 @@ +# 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 flag-o-matic + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. GUI 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 opengl" + +RDEPEND="opengl? ( virtual/opengl ) + debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=net-misc/omniORB-4.1.4 + >=dev-python/omniorbpy-3.4 + >=sci-libs/hdf5-1.6.4 + >=dev-libs/boost-1.40.0 + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=x11-libs/qwt-5.2 + >=dev-python/PyQt4-4.5.4 + >=sci-libs/vtk-5.0[python] + >=sci-libs/opencascade-6.3 + app-text/dgs" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/sip-4.8.2 + dev-lang/swig + dev-libs/libxml2" + +MODULE_NAME="GUI" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +GUI_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." +} + +src_prepare() { + cd "${MY_S}" + + epatch "${FILESDIR}"/${P}-qt4-path.patch + + rm -r -f autom4te.cache + ./clean_configure + ./build_configure +} + +src_configure() { + cd "${MY_S}" + + local vtk_suffix="" + + has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" + has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2" + has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + --with-qt=/usr \ + --with-qwt=/usr \ + --with-qwt_inc=/usr/include/qwt5 \ + --with-vtk=${VTKHOME} \ + --with-vtk-version=${vtk_suffix} \ + ${myconf} \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + $(use_with debug cppunit /usr ) \ + $(use_with opengl opengl /usr) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + MAKEOPTS="-j1" emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + use doc && dodoc AUTHORS INSTALL NEWS README +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} 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 "" +} diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog index 163d3a1ad..9ecb0e368 100644 --- a/sci-misc/salome-med/ChangeLog +++ b/sci-misc/salome-med/ChangeLog @@ -1,7 +1,22 @@ # ChangeLog for sci-misc/salome-med -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-med-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-med-3.2.6.ebuild, -files/salome-med-3.2.6-gcc-4.3.patch, + -files/salome-med-3.2.6-hdf5-1.6.7.patch, + -files/salome-med-3.2.6_boost-1.35.patch, + -files/salome-med-3.2.6_environ.patch, -files/salome-med-3.2.6_gcc4.patch, + -files/salome-med-3.2.6.patch, +salome-med-5.1.3.ebuild, + +files/salome-med-5.1.3-check_metis.patch, + +files/salome-med-5.1.3-check_scotch.patch, + +files/salome-med-5.1.3-gcc.patch, +files/salome-med-5.1.3-mpi.patch, + +files/salome-med-5.1.3-qt4-path.patch, + +files/salome-med-5.1.3-scotch.patch, metadata.xml: + Version bump 5.1.3 + removed broken 3.2.6 + 03 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-med-3.2.6.ebuild, metadata.xml: Reordered dependencies diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest index 065910ea7..97fea3036 100644 --- a/sci-misc/salome-med/Manifest +++ b/sci-misc/salome-med/Manifest @@ -1,10 +1,10 @@ -AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e8147b7b SHA1 3cac370c4f6fed86ec70587b3abe72149c6c07c3 SHA256 1a3ace4ce4b6423d34c934dd2768d8169ac8f3895f95b01b488f0da26ca811cf -AUX salome-med-3.2.6-hdf5-1.6.7.patch 13390 RMD160 5e7b4f18bc5d4aba21a37dbe56aa165f4d48a70b SHA1 67c9203deaf9709eee70bbc38db1bf775bfa4500 SHA256 24ef7737f766135812584e94c0fe13a3b375d7f14dd2582866935cbbc8072bf8 -AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b -AUX salome-med-3.2.6_boost-1.35.patch 774 RMD160 db99f619e4cd989e3de772863f14bb2185e8bce3 SHA1 1fd5d3b49c8d804eefdc7fb7f2cd64c0b0ea74a6 SHA256 a896371677425ddcb6bd5902d83f1a65cceddd7a77e1f5f40b1d9fd0c9267cd2 -AUX salome-med-3.2.6_environ.patch 829 RMD160 b2d457296e389d0f26344d1667cbd39f95bced69 SHA1 e3b584cef8a149c2bc92e98892714617383b8271 SHA256 718ce88901ec43210dcf67e7b36cae6cd1bde6f7e334f316da73bf8368304556 -AUX salome-med-3.2.6_gcc4.patch 947 RMD160 c2af9d3fa5b8dd87baae7dab13798f71d61dd4f9 SHA1 16b58dbc90eb61835547f7c4987426fb295f242b SHA256 02f59ca69ee92a0a7378f0fa9662f00078fbcd8c4fa24f8c097ef5046787ed07 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-med-3.2.6.ebuild 3997 RMD160 a21789bb50593cd813e744b098bd3e26859ddab8 SHA1 5b1edb5a8af084072e67906c455a5921be2f3550 SHA256 7b87d167860c8420a7a647679e6d440e110f28108f253558748bc410fa2d0e59 -MISC ChangeLog 1580 RMD160 cb2b3a176a8394d2004e2cd71de6bbe00ce28b6e SHA1 15bf503c36c67c0904725b4f5b235fd317a5ee94 SHA256 0146cd8fd2716ecc5658e389ae09e21a671202641161c3c0b15332a6b1ef4d58 -MISC metadata.xml 251 RMD160 eef01ec04622ef90a25b1bf2ba4a716b0ff0c70b SHA1 aff4c2037afcc36714bbdbca60ab49e0f0e49c21 SHA256 e9487884fb1dc92a38d9e5ff21abb4ab6984c0bbc90296cbc546124d58fe8fb8 +AUX salome-med-5.1.3-check_metis.patch 1573 RMD160 fdcc8a1fcba4d16f4c3a8e8636820c49876476b7 SHA1 28b0021cabc939a7f45df84e36953ea4cf1622f5 SHA256 471f36d3ecb15c5ebf6e4664237958c6f6b01f84d9fb4a184c5d5cf988721aac +AUX salome-med-5.1.3-check_scotch.patch 2538 RMD160 b501d483cdf6accd0f562676179d1be9ecfa038a SHA1 0ad2ef4901f02396c812b26e6e0264c3ae3321d4 SHA256 6802967adc584ba37317c85a8a100cef4734ce12515732b271e9057d788d14ff +AUX salome-med-5.1.3-gcc.patch 1641 RMD160 09962970219edb007984413cd1a010044ec19cef SHA1 233f51828285c4b9fe0dc5a473fa76f7dc8fb2aa SHA256 a6c70ba8dc12f6c2a11565c9551801dc8d3eee63435f2c6977bd2e4d5e545241 +AUX salome-med-5.1.3-mpi.patch 780 RMD160 cc39b630de3f2576fea941b01aa1543b25547dee SHA1 c6afde49f3315e41ad034083290d449a57d3b82b SHA256 8ffd65e56b57ffa3351cc5451562ded665bd3ccba2ccd53865868b763c2bc616 +AUX salome-med-5.1.3-qt4-path.patch 466 RMD160 1be9c383e3db380bc1d9a91792d89fa65071685f SHA1 4c4bcde03173ee5f911a925bd7190215761bdab3 SHA256 94b4730b80bfd6abd71d203309467cb4a0fc027d8dbc634633b1f0f4f8e3a08d +AUX salome-med-5.1.3-scotch.patch 411 RMD160 9ecd63a9cd71e6f6a4767c30baa135b6f3e3dadc SHA1 44eb2455570716883643b9c08160924a40c9ef0c SHA256 717c995a718f52ef889c4f204457d22614d85696bb0cca3df96756906791464a +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-med-5.1.3.ebuild 3815 RMD160 21e8d281958e4cae2dfc254551109228a282da09 SHA1 13fd83f79be0488b5fd75b154b3df096bf5d9c45 SHA256 3d2d72d01e3f0360707b93b0a2ed9591f8e56249ec6d9b0625687d98bfd5d5c5 +MISC ChangeLog 2269 RMD160 fe98e6f0fdc379ac4af6798c41056bc1d830c7e5 SHA1 7305757b576069db861de45161fa8b80665de527 SHA256 5d6ce488d4ef2c00402baa06e75a735ebdc14ffc105daff85fe046894d29db75 +MISC metadata.xml 274 RMD160 81f0dbbb32fd2de80832c9872616b0a48b2d4c04 SHA1 72f2c4ce931ef27e7f913218049757f318f0415d SHA256 49d1680ffc0598f56db8198488dc66263eef05571d59bb3875e0a8858f54f5e4 diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch b/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch deleted file mode 100644 index a82924f1d..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx 2008-05-25 19:32:53.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx 2008-05-26 01:21:12.000000000 +0200 -@@ -20,7 +20,7 @@ - #include "stdio.h" - #include "stdlib.h" - --#include <iostream.h> -+#include <iostream> - - #include "MEDMEM_InterpolationHighLevelObjects.hxx" - -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx 2008-05-25 19:32:53.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx 2008-05-26 01:33:32.000000000 +0200 -@@ -20,7 +20,7 @@ - #include "stdio.h" - #include "stdlib.h" - --#include <iostream.h> -+#include <iostream> - - #include "MEDMEM_InterpolationHighLevelObjects.hxx" - -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx 2008-05-25 19:32:53.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx 2008-05-26 01:41:07.000000000 +0200 -@@ -20,7 +20,7 @@ - #include "stdio.h" - #include "stdlib.h" - --#include <iostream.h> -+#include <iostream> - - #include "MEDMEM_InterpolationHighLevelObjects.hxx" - -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx ---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx 2008-05-25 19:32:53.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx 2008-05-26 00:59:23.000000000 +0200 -@@ -34,7 +34,7 @@ - #include <iomanip> - #include <stdlib.h> - #include <string.h> --#include <fstream.h> -+#include <fstream> - - #define PRECISION_IN_ASCII_FILE 10 - #define PRECISION_IN_COMPARE 1e-10 -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx 2008-05-25 19:32:53.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx 2008-05-26 01:55:21.000000000 +0200 -@@ -18,6 +18,7 @@ - // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - // - #include "MEDMEM_Grid.hxx" -+#include <memory> - - using namespace MEDMEM; - using namespace MED_EN; diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch b/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch deleted file mode 100644 index 7342af130..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-07-25 09:16:10.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-10-15 12:03:32.000000000 +0200 -@@ -258,12 +258,22 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -@@ -291,13 +301,23 @@ - } - } - --#ifdef HDF_NEW_API -+#ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -@@ -378,9 +398,16 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) - return -1; - #endif -@@ -418,11 +445,21 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) -- return -1; -+ return -1; -+#else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ - #else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-07-25 09:16:10.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-10-15 12:03:08.000000000 +0200 -@@ -205,27 +205,37 @@ - { /* switch pflmod pout FULL_INTERLACE*/ - case MED_GLOBALE : - -- /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ -- if ( (memspace = H5Screate_simple (1, size, NULL)) <0) -- return -1; -+ /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */ -+ if ( (memspace = H5Screate_simple (1, size, NULL)) <0) -+ return -1; -+ -+ for (dim=firstdim; dim < lastdim; dim++) { -+ -+ for (i=0; i < psize; i++) /* i balaye les élements du profil */ -+ for (j=0; j < ngauss; j++) { -+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); -+ pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; -+ pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; -+ } -+ } -+ -+ #ifdef HDF_NEW_API - -- for (dim=firstdim; dim < lastdim; dim++) { -- -- for (i=0; i < psize; i++) /* i balaye les élements du profil */ -- for (j=0; j < ngauss; j++) { -- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); -- pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim; -- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; -- } -- } -- --#ifdef HDF_NEW_API -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -@@ -255,12 +265,22 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -@@ -326,39 +346,46 @@ - pfldsk = (med_size *) malloc(sizeof(med_size)*pcount[0]); - #else - pfldsk = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]); --#endif -+ #endif - -- switch(pflmod) -- { /*switch plfmod pour NO_INTERLACE */ -- case MED_GLOBALE : -- -- for (dim=firstdim; dim < lastdim; dim++) { -- -- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ -- for (j=0; j < ngauss; j++) { -- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); -- pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; -- } -- } -- -+ switch(pflmod) -+ { /*switch plfmod pour NO_INTERLACE */ -+ case MED_GLOBALE : -+ -+ for (dim=firstdim; dim < lastdim; dim++) { -+ -+ for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ -+ for (j=0; j < ngauss; j++) { -+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); -+ pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j; -+ } -+ } -+ - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) - return -1; - #endif -- -+ - if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0) - return -1; -- -+ - break; -- -+ - case MED_COMPACT : -- -- /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ -- /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ -- /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ -+ -+ /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */ -+ /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */ -+ /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */ - - if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0) - return -1; -@@ -368,26 +395,36 @@ - #else - pflmem = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]); - #endif -- -+ - /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/ -- -+ - for (dim=firstdim; dim < lastdim; dim++) { -- -+ - for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */ - for (j=0; j < ngauss; j++) { - index = i*ngauss+j + (dim-firstdim)*(psize*ngauss); -- pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; -+ pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j; - pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j; - } - } -- -+ - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx ---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-07-25 09:16:10.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-10-15 12:01:30.000000000 +0200 -@@ -204,12 +204,22 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; - -@@ -239,11 +249,21 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0) -+ return -1; -+#else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) - return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ - #else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; -@@ -325,9 +345,16 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) - return -1; - #else -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ -+#else - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0) - return -1; - #endif -@@ -369,11 +396,21 @@ - } - - #ifdef HDF_NEW_API -+ -+#if H5_VERS_RELEASE < 7 - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0) - return -1; - - if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0) -- return -1; -+ return -1; -+#else -+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0) -+ return -1; -+ -+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0) -+ return -1; -+#endif -+ - #else - if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0) - return -1; diff --git a/sci-misc/salome-med/files/salome-med-3.2.6.patch b/sci-misc/salome-med/files/salome-med-3.2.6.patch deleted file mode 100644 index 7ffd0ac23..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./MED_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:51.000000000 +0200 -+++ ./MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-04 15:51:44.000000000 +0100 -@@ -26,12 +26,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - ---- ./MED_SRC_3.2.6/build_configure.org 2007-04-24 18:40:51.000000000 +0200 -+++ ./MED_SRC_3.2.6/build_configure 2008-01-04 15:14:30.000000000 +0100 -@@ -174,7 +174,7 @@ - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 - echo 'if test ${MED_WITH_KERNEL} = yes; then' >> configure.in_tmp1 --echo ' ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo ' cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - echo 'else' >> configure.in_tmp1 - echo ' ln -fsn ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 - echo 'fi' >> configure.in_tmp1 diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch b/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch deleted file mode 100644 index 7425b13e9..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src3.2.6_orig/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:10:27.000000000 +0200 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:14:06.000000000 +0200 -@@ -23,7 +23,7 @@ - ::TLockProxy(TWrapper* theWrapper): - myWrapper(theWrapper) - { -- boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex); -+ myWrapper->myMutex.lock(); - INITMSG(MYDEBUG,"TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl); - } - -@@ -31,7 +31,7 @@ - ::~TLockProxy() - { - INITMSG(MYDEBUG,"~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl); -- boost::detail::thread::lock_ops<TWrapper::TMutex>::unlock(myWrapper->myMutex); -+ myWrapper->myMutex.unlock(); - } - - TWrapper* diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch deleted file mode 100644 index 8af83ea5a..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/MedClient/test/environ/Makefile.in_orig 2008-01-04 17:11:06.000000000 +0100 -+++ src/MedClient/test/environ/Makefile.in 2008-01-04 17:12:08.000000000 +0100 -@@ -29,6 +29,7 @@ - top_builddir=../../../.. - srcdir=@srcdir@ - VPATH=.:@srcdir@ -+prefix=@prefix@ - - BIN= runEnvironTests - -@@ -53,11 +54,11 @@ - chmod +x csh/* - - install: -- mkdir -p @prefix@/Tests/environ -- cp -rf ${BIN} csh @prefix@/Tests/environ -- cd @prefix@/Tests/environ ; chmod u+x ${BIN} -- cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin -- chmod +x @prefix@/bin/runTestMedCorba -+ mkdir -p ${prefix}/Tests/environ -+ cp -rf ${BIN} csh ${prefix}/Tests/environ -+ cd ${prefix}/Tests/environ ; chmod u+x ${BIN} -+ cp -f ${top_builddir}/bin/runTestMedCorba ${prefix}/bin -+ chmod +x ${prefix}/bin/runTestMedCorba - - ./%: @srcdir@/%.in - cd $(top_builddir) ; \ diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch deleted file mode 100644 index 7ec5dac34..000000000 --- a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:27:29.000000000 +0100 -+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:28:23.000000000 +0100 -@@ -222,7 +222,7 @@ - case MED_FLOAT64 : - if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_FLOAT64, - interlace,ncomp,numco, -- psize,pflmod,pfltab,ngauss,val)< 0) -+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0) - goto ERROR; - break; - -@@ -230,12 +230,12 @@ - #if defined(F77INT64) - if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT64, - interlace,ncomp,numco, -- psize,pflmod,pfltab,ngauss,val)< 0) -+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0) - goto ERROR; - #else - if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT32, - interlace,ncomp,numco, -- psize,pflmod,pfltab,ngauss,val)< 0) -+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0) - goto ERROR; - #endif - break; diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch new file mode 100644 index 000000000..c133b7f37 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch @@ -0,0 +1,48 @@ +--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200 ++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4 2009-09-27 22:41:46.471297649 +0200 +@@ -28,6 +28,10 @@ + + METIS_CPPFLAGS="" + METIS_LIBSUFFIX="" ++case "$build_cpu" in ++x86_64*) METIS_LIBSUFFIX="64" ;; ++*) METIS_LIBSUFFIX="" ;; ++esac + METIS_LIBS="" + ENABLE_METIS="no" + +@@ -43,8 +47,8 @@ + LIBS_old=$LIBS + + if test "x${METISDIR}" != "x" ; then +- METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib" +- METIS_LIBS="-L${METISDIR} -lmetis" ++ METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis" ++ METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis" + fi + + metis_ok=no +@@ -57,7 +61,7 @@ + + metis_include_dir_ok=yes + if test "x${METISDIR}" != "x" ; then +- AC_CHECK_FILE(${METISDIR}/Lib/metis.h, ++ AC_CHECK_FILE(${METISDIR}/include/metis/metis.h, + metis_include_dir_ok=yes, + metis_include_dir_ok=no) + fi +@@ -81,12 +85,12 @@ + AC_CHECKING(for METIS binaries) + metis_lib_dir_ok=yes + if test "x${METISDIR}" != "x" ; then +- AC_CHECK_FILE(${METISDIR}/libmetis.a, ++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a, + metis_lib_dir_ok=yes, + metis_lib_dir_ok=no) + if test "x${metis_lib_dir_ok}" = "xno" ; then + METIS_LIBSUFFIX="" +- AC_CHECK_FILE(${METISDIR}/libmetis.a, ++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a, + metis_lib_dir_ok=yes, + metis_lib_dir_ok=no) + fi diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch new file mode 100644 index 000000000..64c8bb2d8 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch @@ -0,0 +1,74 @@ +--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200 ++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4 2009-09-27 23:11:02.080868671 +0200 +@@ -28,6 +28,10 @@ + + SCOTCH_CPPFLAGS="" + SCOTCH_LIBSUFFIX="" ++case "$build_cpu" in ++x86_64*) SCOTCH_LIBSUFFIX="64" ;; ++*) SCOTCH_LIBSUFFIX="" ;; ++esac + SCOTCH_LIBS="" + ENABLE_SCOTCH="no" + +@@ -43,8 +47,8 @@ + LIBS_old=$LIBS + + if test "x${SCOTCHDIR}" != "x" ; then +- SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}" +- SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr" ++ SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch" ++ SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr" + fi + + scotch_ok=no +@@ -57,14 +61,14 @@ + + scotch_include_dir_ok=yes + if test "x${SCOTCHDIR}" != "x" ; then +- AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h, ++ AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h, + scotch_include_dir_ok=yes, + scotch_include_dir_ok=no) + fi + + if test "x${scotch_include_dir_ok}" = "xyes" ; then + AC_TRY_COMPILE([#include <stdio.h> +- #include <bin/scotch.h>], ++ #include <scotch.h>], + [SCOTCH_Graph* graph; + SCOTCH_graphInit(graph)], + scotch_headers_ok=yes, +@@ -83,12 +87,12 @@ + AC_CHECKING(for SCOTCH binaries) + scotch_lib_dir_ok=yes + if test "x${SCOTCHDIR}" != "x" ; then +- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a, ++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a, + scotch_lib_dir_ok=yes, + scotch_lib_dir_ok=no) + if test "x${scotch_lib_dir_ok}" = "xno" ; then + SCOTCH_LIBSUFFIX="" +- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a, ++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a, + scotch_lib_dir_ok=yes, + scotch_lib_dir_ok=no) + fi +@@ -96,7 +100,7 @@ + if test "x${scotch_lib_dir_ok}" = "xyes" ; then + LIBS="${LIBS_old} ${SCOTCH_LIBS}" + AC_TRY_LINK([#include <stdio.h> +- #include <bin/scotch.h>], ++ #include <scotch.h>], + [SCOTCH_Graph* graph; + SCOTCH_graphInit(graph)], + scotch_binaries_ok=yes, +@@ -105,7 +109,7 @@ + SCOTCH_LIBSUFFIX="" + LIBS="${LIBS_old} ${SCOTCH_LIBS} " + AC_TRY_LINK([#include <stdio.h> +- #include <bin/scotch.h>], ++ #include <scotch.h>], + [SCOTCH_Graph* graph; + SCOTCH_graphInit(graph)], + scotch_binaries_ok=yes, diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch new file mode 100644 index 000000000..15e349204 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch @@ -0,0 +1,43 @@ +--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:18:07.064072621 +0100 ++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:19:44.920271906 +0100 +@@ -23,6 +23,7 @@ + #include <cmath> + #include <list> + #include <stdexcept> ++#include <cstdlib> + + //================================================================================ + /*! +--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:18:07.102331566 +0100 ++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:24:44.300321009 +0100 +@@ -21,7 +21,7 @@ + #include <map> + #include <iostream> + #include <mpi.h> +-#include <time.h> ++#include <ctime> + + #include "MPIAccessDECTest.hxx" + #include <cppunit/TestAssert.h> +--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:18:07.084009650 +0100 ++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:25:22.930322599 +0100 +@@ -22,7 +22,7 @@ + #include <map> + #include <iostream> + #include <mpi.h> +-#include <time.h> ++#include <ctime> + + #include "MPIAccessDECTest.hxx" + #include <cppunit/TestAssert.h> +--- ./src5.1.3.orig/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100 ++++ ./src5.1.3/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:15:35.420479255 +0100 +@@ -21,7 +21,7 @@ + // + #include <med.h> + #include <string.h> +- ++#include <stdlib.h> + + /*****************************************************************************************************/ + diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch new file mode 100644 index 000000000..a4dc19909 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch @@ -0,0 +1,13 @@ +--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:42:49.442822826 +0100 ++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:43:38.710252330 +0100 +@@ -39,8 +39,8 @@ + void addElementFromSource(int distant_proc, int distant_elem); + void prepareSendRecv(); + void sendRecv(MEDCouplingFieldDouble& field); +- void sendRecv(double* field, MEDCouplingFieldDouble& field) const ; +- void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ; ++ void sendRecv(double* sendfield, MEDCouplingFieldDouble& field) const ; ++ void reverseSendRecv(double* recvfield, MEDCouplingFieldDouble& field) const ; + + // + const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; } diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch new file mode 100644 index 000000000..0737e67bf --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch @@ -0,0 +1,11 @@ +--- src5.1.3.orig/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100 ++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100 +@@ -333,7 +333,7 @@ + + LIBS_old=$LIBS + if test "x$QTDIR" = "x/usr" ; then +- QT_LIB_DIR="" ++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4" + elif test -d ${QTDIR}/lib; then + QT_LIB_DIR="-L$QTDIR/lib" + elif test -d ${QTDIR}/lib64; then diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch new file mode 100644 index 000000000..0cfcaf708 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch @@ -0,0 +1,11 @@ +--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100 ++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2009-09-27 23:26:59.010112791 +0200 +@@ -19,7 +19,7 @@ + #include <cstdio> + extern "C" { + #define restrict +-#include "bin/scotch.h" ++#include "scotch.h" + } + #include "MEDSPLITTER_Graph.hxx" + #include "MEDSPLITTER_SCOTCHGraph.hxx" diff --git a/sci-misc/salome-med/metadata.xml b/sci-misc/salome-med/metadata.xml index e2b812a5b..e67b4dd31 100644 --- a/sci-misc/salome-med/metadata.xml +++ b/sci-misc/salome-med/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>sci</herd> <use> - <flag name='openpbs'>Enable support for <pkg>sys-cluster/torque</pkg></flag> + <flag name='metis'>Add support for metis</flag> + <flag name='scotch'>Add support for scotch</flag> </use> </pkgmetadata> diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild deleted file mode 100644 index 350eaa798..000000000 --- a/sci-misc/salome-med/salome-med-3.2.6.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED 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 ) - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - sci-libs/med" - -DEPEND="${RDEPEND}" - -MODULE_NAME="MED" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" -export OPENPBS="/usr" - -src_unpack() { - python_version - distutils_python_version - - 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}_gcc4.patch - epatch "${FILESDIR}"/${P}.patch - epatch "${FILESDIR}"/${P}_environ.patch - epatch "${FILESDIR}"/${P}-hdf5-1.6.7.patch - - # boost 1.35.0 support - if has_version ">=dev-libs/boost-1.35.0" ; then - epatch "${FILESDIR}"/${P}_boost-1.35.patch - fi - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-med with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - 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} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc; then - dodoc INSTALL README - fi -} - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} - diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild new file mode 100644 index 000000000..a754e9158 --- /dev/null +++ b/sci-misc/salome-med/salome-med-5.1.3.ebuild @@ -0,0 +1,138 @@ +# 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 flag-o-matic + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED 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 metis opengl scotch" + +RDEPEND="opengl? ( virtual/opengl ) + mpi? ( || ( sys-cluster/openmpi[cxx] + sys-cluster/mpich2[cxx] ) ) + debug? ( dev-util/cppunit ) + metis? ( >=sci-libs/metis-4.0 ) + scotch? ( >=sci-libs/scotch-4.0 ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-gui-${PV} + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=dev-libs/boost-1.40.0 + >=sci-libs/opencascade-6.3 + >=sci-libs/med-2.3.5 + >=sci-libs/vtk-5.0[python]" + +DEPEND="${RDEPEND} + dev-lang/swig + dev-libs/libxml2" + +MODULE_NAME="MED" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +MED_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..." +} + +src_prepare() { + cd "${MY_S}" + + epatch "${FILESDIR}"/${P}-qt4-path.patch + epatch "${FILESDIR}"/${P}-gcc.patch + use mpi && epatch "${FILESDIR}"/${P}-mpi.patch + use metis && epatch "${FILESDIR}"/${P}-check_metis.patch + if use scotch; then + epatch "${FILESDIR}"/${P}-check_scotch.patch + epatch "${FILESDIR}"/${P}-scotch.patch + fi + + rm -r -f autom4te.cache + ./clean_configure + ./build_configure +} + +src_configure() { + cd "${MY_S}" + local myconf="" + local vtk_suffix="" + + has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" + has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2" + has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4" + +# --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 + + cd "${MY_S}" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + --with-qt=/usr \ + --with-vtk=${VTKHOME} \ + --with-vtk-version=${vtk_suffix} \ + ${myconf} \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + $(use_with debug cppunit_inc /usr/include/cppunit) \ + $(use_with opengl opengl /usr) \ + $(use_with metis metis /usr) \ + $(use_with scotch scotch /usr) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL README +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-meta/ChangeLog b/sci-misc/salome-meta/ChangeLog index f5061f9b7..227fbed76 100644 --- a/sci-misc/salome-meta/ChangeLog +++ b/sci-misc/salome-meta/ChangeLog @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ 21 May 2008; Daniel Tourde <daniel.tourde@caelae.se> Initial import. @@ -6,6 +6,12 @@ A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! See bug #155974 for more info +*salome-meta-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-meta-3.2.6.ebuild, +salome-meta-5.1.3.ebuild: + Version bump 5.1.3 + removed broken 3.2.6 + 27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-meta-3.2.6.ebuild, -Changelog, +metadata.xml: Fixed repoman errors, removed hardcode diff --git a/sci-misc/salome-meta/Manifest b/sci-misc/salome-meta/Manifest index 7fd427c91..51e0e21cb 100644 --- a/sci-misc/salome-meta/Manifest +++ b/sci-misc/salome-meta/Manifest @@ -1,3 +1,3 @@ -EBUILD salome-meta-3.2.6.ebuild 772 RMD160 b555593078edc6973fa8757d1f38c941e87ef49d SHA1 4d11039d0835bc47b8e21a4fd12216854e0cdad4 SHA256 4ab5c388a58b07e37227b7c32f172e2b8d2d7ca849f6b5819ee2325508abb410 -MISC ChangeLog 691 RMD160 50386a8799847e4ce21de3e39a2fdbf8e9c2479a SHA1 2106d81a32d3e18173aa319dd03942a96b089a34 SHA256 dd97bcf4038de1f4a0b4e2717f9d2bd9807fa41c88c0c6614962de5886d3739c +EBUILD salome-meta-5.1.3.ebuild 919 RMD160 3c171a5b4a1f0c042cb9b017a430256ac7217fb2 SHA1 2e19f2c88c75a7fa87644a15740b1de0ec35ed3c SHA256 d833520e7ca3bf01ede826fae274921ed90671850d338fb4b3bfa24664fd91b7 +MISC ChangeLog 887 RMD160 d1a33b9f86db2a225a3c8da7583cbdee72e29945 SHA1 ca9c7994b2d708e7e6a2d3eeab43b3f7ac9b7b12 SHA256 e07e5bb57b7189471de5a80bd60c5038c34f7dc0e23d00e653d0fb2236e82458 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-meta/salome-meta-3.2.6.ebuild b/sci-misc/salome-meta/salome-meta-3.2.6.ebuild deleted file mode 100644 index 7ed6212b8..000000000 --- a/sci-misc/salome-meta/salome-meta-3.2.6.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation" -HOMEPAGE="http://www.salome-platform.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="=sci-misc/salome-kernel-${PV}* - =sci-misc/salome-gui-${PV}* - =sci-misc/salome-med-${PV}* - =sci-misc/salome-geom-${PV}* - =sci-misc/salome-smesh-${PV}* - =sci-misc/salome-visu-${PV}* - =sci-misc/salome-superv-${PV}* - =sci-misc/salome-component-${PV}* - =sci-misc/salome-pycalculator-${PV}*" - -pkg_postinst() { - einfo "Salome ebuild needs further development. Please inform any problems or improvements in http://bugs.gentoo.org/show_bug.cgi?id=155974" -} - diff --git a/sci-misc/salome-meta/salome-meta-5.1.3.ebuild b/sci-misc/salome-meta/salome-meta-5.1.3.ebuild new file mode 100644 index 000000000..6c582b408 --- /dev/null +++ b/sci-misc/salome-meta/salome-meta-5.1.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation" +HOMEPAGE="http://www.salome-platform.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug mpi" +KEYWORDS="~amd64 ~x86" + +RDEPEND="=sci-misc/salome-kernel-5.1.3*[debug?,mpi?] + =sci-misc/salome-gui-5.1.3*[debug?] + =sci-misc/salome-med-5.1.3*[debug?,mpi?] + =sci-misc/salome-geom-5.1.3*[debug?] + =sci-misc/salome-smesh-5.1.3*[debug?] + =sci-misc/salome-visu-5.1.3*[debug?] + =sci-misc/salome-component-5.1.3*[debug?,mpi?] + =sci-misc/salome-yacs-5.1.3*[debug?] + =sci-misc/salome-pycalculator-5.1.3*[debug?]" + +DEPEND="${RDEPEND}" + +pkg_postinst() { + einfo "Salome ebuild needs further development. Please inform any problems or improvements in http://bugs.gentoo.org/show_bug.cgi?id=155974" +} diff --git a/sci-misc/salome-pycalculator/ChangeLog b/sci-misc/salome-pycalculator/ChangeLog index 0f442b918..405799559 100644 --- a/sci-misc/salome-pycalculator/ChangeLog +++ b/sci-misc/salome-pycalculator/ChangeLog @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ 21 May 2008; Daniel Tourde <daniel.tourde@caelae.se> Initial import. @@ -6,6 +6,13 @@ A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! See bug #155974 for more info +*salome-pycalculator-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-pycalculator-3.2.6.ebuild, -files/salome-pycalculator-3.2.6.patch, + +salome-pycalculator-5.1.3.ebuild: + Version bump 5.1.3 + removed broken 3.2.6 + 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-pycalculator-3.2.6.ebuild: removed omniorb* dependencies, as they are already in salome-kernel diff --git a/sci-misc/salome-pycalculator/Manifest b/sci-misc/salome-pycalculator/Manifest index 36e08e87e..cb6db0dec 100644 --- a/sci-misc/salome-pycalculator/Manifest +++ b/sci-misc/salome-pycalculator/Manifest @@ -1,5 +1,4 @@ -AUX salome-pycalculator-3.2.6.patch 535 RMD160 5cf0de1ecd17f58e84115efd2178118565f71e36 SHA1 f66595c14bdf6a73b0e91479e267b73a64a2101a SHA256 6e8f10d9db73baa0a4939b8b3403e66dba397949f38f0495ab62600a7bc9c12a -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-pycalculator-3.2.6.ebuild 3913 RMD160 fce27abe14043298ee67eee11afaffb7d34b9466 SHA1 ed41ded88aa11b89415f7b67dd916c2882e68280 SHA256 4e86c7f359752382616b54f85895154401cec381ac20b7c534917ce6826c8398 -MISC ChangeLog 907 RMD160 afbac61b682fde2c78b866472bd5ab0744b59389 SHA1 1c2f109c0d240d50ed1ab317733b0fbfc0f09830 SHA256 0f6ecd4013ffb246807913bab1992adadf4d075c3e971027736e0c8ee1cefb55 +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-pycalculator-5.1.3.ebuild 2459 RMD160 135357735c2fd36a905ca95cc1a2ea7ad0a7eff2 SHA1 8f1fe3759766070f9cf90bf0a17e6c4dd123890b SHA256 342207452b03e635b9b830da45b011d74295330caea388382e73f7a5c98c23cc +MISC ChangeLog 1169 RMD160 9a394bc004f22dd4d31a01f8be33b3041cb7284c SHA1 d4eae863981bcb1691d6c00b2866d3293e145ef1 SHA256 6369d3284068312de225a4a718aa7e82d8374f78c3b397edb19f8683e94342ee MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch b/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch deleted file mode 100644 index 9897907f4..000000000 --- a/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./PYCALCULATOR_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./PYCALCULATOR_SRC_3.2.6/build_configure 2008-02-21 10:20:34.000000000 +0100 -@@ -109,7 +109,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild deleted file mode 100644 index 959e491dd..000000000 --- a/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. PYCALCULATOR 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" - -RDEPEND="mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-med-${PV} - >=sci-misc/salome-component-${PV}" - -MODULE_NAME="PYCALCULATOR" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -PYCALCULATOR_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..." - - 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}.patch -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-pycalculator with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without-<flag> for mpi / mpich - # 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 - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/doc/salome" \ - infodir="${D}/${INSTALL_DIR}/share/info" \ - datadir="${D}/${INSTALL_DIR}/share/salome" \ - libdir="${D}/${INSTALL_DIR}/$(get_libdir)/salome" \ - PYTHON_SITE_INSTALL="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" \ - sharedpydir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome/shared_modules" install \ - || die "emake install failed" - - if use amd64 ; then - dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib - fi - - echo "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild new file mode 100644 index 000000000..db478f235 --- /dev/null +++ b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild @@ -0,0 +1,96 @@ +# 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. PYCALCULATOR 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" + +RDEPEND="debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-med-${PV} + >=sci-misc/salome-component-${PV} + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=sci-libs/med-2.3.5" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4" + +MODULE_NAME="PYCALCULATOR" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +PYCALCULATOR_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..." +} + +src_prepare() { + cd "${MY_S}" + + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + cd "${MY_S}" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P} + echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}a + echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P} + echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P} + doenvd 90${P} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-smesh/ChangeLog b/sci-misc/salome-smesh/ChangeLog index 1248ab8c8..5ca1e9844 100644 --- a/sci-misc/salome-smesh/ChangeLog +++ b/sci-misc/salome-smesh/ChangeLog @@ -1,5 +1,17 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + +*salome-smesh-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-smesh-3.2.6.ebuild, + -files/salome-smesh-3.2.6-amd64-relocation-error.patch, + -files/salome-smesh-3.2.6-gcc-4.3.patch, + -files/salome-smesh-3.2.6-vtk-5.2.patch, + -files/salome-smesh-3.2.6_makefiles.patch, + -files/salome-smesh-3.2.6.patch, +salome-smesh-5.1.3.ebuild: + Version bump 5.1.3 + removed broken 3.2.6 + 20 Oct 2008; Daniel Tourde <daniel.tourde@caelae.se> +salome-smesh-3.2.6-vtk-5.2.patch Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de> diff --git a/sci-misc/salome-smesh/Manifest b/sci-misc/salome-smesh/Manifest index 08f71a7b1..19b1bd1b4 100644 --- a/sci-misc/salome-smesh/Manifest +++ b/sci-misc/salome-smesh/Manifest @@ -1,9 +1,4 @@ -AUX salome-smesh-3.2.6-amd64-relocation-error.patch 795 RMD160 b75c24f4441888695a0488309f1799d317411db3 SHA1 26cdcf653e3b8b76fa67e7084bf4c7b64326a08e SHA256 cd09fb04bbcdcd6386a52dcd280c7739f2e7fe5e9352b7982527b6fb9c2c28f0 -AUX salome-smesh-3.2.6-gcc-4.3.patch 1819 RMD160 64f383736be1357d90fdcaaa2bcd28e61d3ecb5f SHA1 5e8682ec4917dcb9e1473efb9db8d29c1c978315 SHA256 316a48bde730ce3c5b67fc4a16d6b3e6698c413d921875b21aae2ed8c9b679f2 -AUX salome-smesh-3.2.6-vtk-5.2.patch 1193 RMD160 ee5b3b96d9a65793d6d5e883f8e28525308aec09 SHA1 17fe6508d1aaeb22038f6e9400fe2554170bcbab SHA256 da21d3790d48ae540beaf6d8b78a878537ffdf72e29f4adf42b16b64b32fdf2d -AUX salome-smesh-3.2.6.patch 10793 RMD160 fa4f8e8db86d6d7d2ecc6b535467c6bd16ac9fe5 SHA1 79cb4dd4370a94f309b4f55da5333584362f5c2f SHA256 0e599d64bf2f22b033cb4fcfb59a06c1e4f7ea41a859518a6ab8d691bec104b2 -AUX salome-smesh-3.2.6_makefiles.patch 1289 RMD160 acb8f3382726b42e149a6c33b561772ea0d91ca6 SHA1 8452437b52bec4879de5a1e245547df919bf1301 SHA256 68a416ec2279ce13e7879a7ec8dcf8e5881efbef45e0433aac4201c539297ab7 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-smesh-3.2.6.ebuild 4202 RMD160 d50f7ea595d2a029fa238a8f9788feda94594653 SHA1 5d042fac70ff3115e26048552b64ad2c2c0b3a6e SHA256 33e46d5ebd47d9787f7aa5ae0ecb43d83362af9e4f0778916d963a8197dfd91f -MISC ChangeLog 1385 RMD160 9b5ac4dc3fb510d2209bb69f57305d569bbaa1c7 SHA1 c97929994d8df9242b911ec82d44b34fbcca70da SHA256 9f1a7aa650c5be18353e677fb5328d8a6bcf98578f7c500efc94d550d0ebbf9c +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-smesh-5.1.3.ebuild 3140 RMD160 06151a8d7fb9ca539cb0d4e6e39021dd210c6a34 SHA1 ecfd4c65b449ebfab4d7f1bab295168d7faab1ea SHA256 06e0deb2571e2c5dea79865f836047a815bdd5e760c726c576fa1ce62054fbd5 +MISC ChangeLog 1809 RMD160 71a8f42402f3696440dd8893d09bc6e2db1adcf7 SHA1 99545b54f700ec192ceaaa1c1b2ec0e3a50810f5 SHA256 f48e6c1f57f39caee9c41f36f0b67731e530b35ca03a314de19bc69e260d336c MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch deleted file mode 100644 index e7df92bc1..000000000 --- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx ---- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx 2008-07-25 09:16:09.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx 2008-07-25 13:09:01.000000000 +0200 -@@ -92,7 +92,7 @@ - /*! - * \brief Return an edge from which hypotheses are propagated from - */ --TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh, -+inline TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh, - const TopoDS_Shape& theEdge) - { - return PropagationMgr::GetSource(theMesh.GetSubMeshContaining( theEdge )); diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch deleted file mode 100644 index b015022e6..000000000 --- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx ---- src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx 2008-05-25 19:32:52.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx 2008-05-26 03:23:15.000000000 +0200 -@@ -26,6 +26,7 @@ - #include <string> - #include <stdexcept> - #include <cassert> -+#include <cstdlib> - - namespace UNV{ - using namespace std; -diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h ---- src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h 2008-05-25 19:32:52.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h 2008-05-26 03:38:58.000000000 +0200 -@@ -31,8 +31,8 @@ - #include <limits.h> // limites min max int long real ... - #include <unistd.h> // gethostname, ... - #include <stdio.h> --#include <iostream.h> // pour cout cin ... --#include <iomanip.h> // pour le format des io setw, stx, setfill, ... -+#include <iostream> // pour cout cin ... -+#include <iomanip> // pour le format des io setw, stx, setfill, ... - #include <string.h> // pour les fonctions sur les chaines de caracteres - #include <ctype.h> - #include <stdlib.h> -diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx ---- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx 2008-05-25 19:32:52.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx 2008-05-26 03:47:51.000000000 +0200 -@@ -37,8 +37,8 @@ - #include "SMESH_MesherHelper.hxx" - #include "SMESH_Comment.hxx" - --#include <vector.h> --#include <map.h> -+#include <vector> -+#include <map> - - #include <Adaptor3d_Curve.hxx> - #include <Adaptor3d_Surface.hxx> diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch deleted file mode 100644 index cbb59099d..000000000 --- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx ---- src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx 2008-07-25 09:16:09.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx 2008-10-16 01:33:46.000000000 +0200 -@@ -86,7 +86,7 @@ - - namespace SMESH { - -- void ReverseConnectivity( vector<int> & ids, int type ) -+ void ReverseConnectivity( vector<vtkIdType> & ids, int type ) - { - // for reverse connectivity of other types keeping the first id, see - // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900 -@@ -134,7 +134,7 @@ - reverse( ids.begin(), ids.end() ); - } - else { -- vector<int> aRevIds( ids.size() ); -+ vector<vtkIdType> aRevIds( ids.size() ); - for ( int i = 0; i < ids.size(); i++) - aRevIds[ i ] = ids[ conn[ i ]]; - ids = aRevIds; -@@ -597,7 +597,7 @@ - if (IsValid() && !mySMESHGUI->isActiveStudyLocked()) { - myBusy = true; - -- vector<int> anIds; -+ vector<vtkIdType> anIds; - - switch (myType) { - case QUAD_EDGE: diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch deleted file mode 100644 index 14e245be2..000000000 --- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6.patch +++ /dev/null @@ -1,196 +0,0 @@ -Seulement dans src3.2.6: build -Seulement dans src3.2.6/SMESH_SRC_3.2.6: aclocal.m4 -Seulement dans src3.2.6/SMESH_SRC_3.2.6: autom4te.cache -Seulement dans src3.2.6/SMESH_SRC_3.2.6: configure -Seulement dans src3.2.6/SMESH_SRC_3.2.6: configure.in -Seulement dans src3.2.6/SMESH_SRC_3.2.6: salome_adm -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx 2007-11-27 23:55:25.000000000 +0100 -@@ -409,10 +409,10 @@ - myPtsLabeledDataMapper->RemoveAllInputs(); - myPtsLabeledDataMapper->Delete(); - -- myPtsSelectVisiblePoints->UnRegisterAllOutputs(); -+ //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); - myPtsSelectVisiblePoints->Delete(); - -- myPtsMaskPoints->UnRegisterAllOutputs(); -+ //myPtsMaskPoints->UnRegisterAllOutputs(); - myPtsMaskPoints->Delete(); - - myPointLabels->Delete(); -@@ -425,13 +425,13 @@ - myClsLabeledDataMapper->RemoveAllInputs(); - myClsLabeledDataMapper->Delete(); - -- myClsSelectVisiblePoints->UnRegisterAllOutputs(); -+ //myClsSelectVisiblePoints->UnRegisterAllOutputs(); - myClsSelectVisiblePoints->Delete(); - -- myClsMaskPoints->UnRegisterAllOutputs(); -+ //myClsMaskPoints->UnRegisterAllOutputs(); - myClsMaskPoints->Delete(); - -- myCellCenters->UnRegisterAllOutputs(); -+ //myCellCenters->UnRegisterAllOutputs(); - myCellCenters->Delete(); - - myCellsLabels->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_Actor.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx 2007-11-27 23:55:25.000000000 +0100 -@@ -374,7 +374,7 @@ - for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) - aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) ); - -- aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity ); -+ aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity ); - SetUnstructuredGrid(aDataSet); - - aDataSet->GetCellData()->SetScalars(aScalars); -@@ -434,7 +434,7 @@ - for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) - aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) ); - -- aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity ); -+ aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity ); - SetUnstructuredGrid(aDataSet); - - aDataSet->GetCellData()->SetScalars(aScalars); -@@ -516,7 +516,7 @@ - for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) - aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) ); - -- aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity ); -+ aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity ); - - SetUnstructuredGrid(aDataSet); - aDataSet->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_DeviceActor.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx 2007-11-27 23:55:25.000000000 +0100 -@@ -84,7 +84,7 @@ - vtkFloatingPointType multiplier; - vtkPoints *newPts; - vtkIdList *newCellPts; -- vtkDataSet *input = this->GetInput(); -+ vtkDataSet *input = (vtkDataSet*) this->GetInput(); - vtkPointData *pd = input->GetPointData(); - vtkCellData *cd = input->GetCellData(); - vtkUnstructuredGrid *output = this->GetOutput(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_ExtractGeometry.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx 2007-11-27 23:55:25.000000000 +0100 -@@ -436,7 +436,7 @@ - for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) - aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) ); - -- myGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity ); -+ myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity ); - - aCellLocationsArray->Delete(); - aCellTypesArray->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/OBJECT: SMESH_Object.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -182,7 +182,7 @@ - myMapper->RemoveAllInputs(); - myMapper->Delete(); - -- myPlaneSource->UnRegisterAllOutputs(); -+ //myPlaneSource->UnRegisterAllOutputs(); - myPlaneSource->Delete(); - }; - -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_ClippingDlg.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -261,10 +261,10 @@ - myPtsLabeledDataMapper->RemoveAllInputs(); - myPtsLabeledDataMapper->Delete(); - -- myPtsSelectVisiblePoints->UnRegisterAllOutputs(); -+ //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); - myPtsSelectVisiblePoints->Delete(); - -- myPtsMaskPoints->UnRegisterAllOutputs(); -+ //myPtsMaskPoints->UnRegisterAllOutputs(); - myPtsMaskPoints->Delete(); - - myPointLabels->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_EditMeshDlg.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -210,7 +210,7 @@ - for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) - aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) ); - -- myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity ); -+ myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aConnectivity ); - - myPreviewActor->GetMapper()->Update(); - -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MeshEditPreview.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -1242,7 +1242,7 @@ - aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts)); - - aGrid->SetPoints(aPoints); -- aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity); -+ aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - - aConnectivity->Delete(); - aPoints->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MeshPatternDlg.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -564,7 +564,7 @@ - aGrid->SetPoints(aPoints); - aPoints->Delete(); - -- aGrid->SetCells(aCellTypesArray,aCellLocationsArray,aCells); -+ aGrid->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aCells); - aCellLocationsArray->Delete(); - aCellTypesArray->Delete(); - aCells->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MoveNodesDlg.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -1346,7 +1346,7 @@ - aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts)); - - aGrid->SetPoints(aPoints); -- aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity); -+ aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - - // Create and display actor - vtkDataSetMapper* aMapper = vtkDataSetMapper::New(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_MultiEditDlg.cxx~ -diff -abur src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx ---- src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx 2007-04-24 18:41:03.000000000 +0200 -+++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx 2007-11-27 23:55:26.000000000 +0100 -@@ -158,10 +158,10 @@ - vtkIdType npts; - aCellLocationsArray->SetValue(0, aCells->GetTraversalLocation(npts)); - -- aGrid->SetCells(aCellTypesArray, aCellLocationsArray, aCells); -+ aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aCells); - - aGrid->SetPoints(myPoints); -- aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aCells); -+ aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aCells); - aCellLocationsArray->Delete(); - aCellTypesArray->Delete(); - aCells->Delete(); -Seulement dans src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI: SMESHGUI_NodesDlg.cxx~ diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch deleted file mode 100644 index 078fd5a4f..000000000 --- a/sci-misc/salome-smesh/files/salome-smesh-3.2.6_makefiles.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./SMESH_SRC_3.2.6/build_configure.org 2007-04-24 18:41:03.000000000 +0200 -+++ ./SMESH_SRC_3.2.6/build_configure 2008-01-08 14:51:09.000000000 +0100 -@@ -135,7 +135,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 ---- ./SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:03.000000000 +0200 -+++ ./SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-08 14:52:25.000000000 +0100 -@@ -30,7 +30,7 @@ - @COMMENCE@ - - usr_docs: -- cp -fr $(srcdir)/SMESH ./ -+# cp -fr $(srcdir)/SMESH ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - - docs: usr_docs ---- ./SMESH_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:03.000000000 +0200 -+++ ./SMESH_SRC_3.2.6/adm_local/Makefile.in 2008-01-08 14:53:50.000000000 +0100 -@@ -27,12 +27,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - diff --git a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild deleted file mode 100644 index c9b04ce21..000000000 --- a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. SMESH 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" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-med-${PV} - >=sci-misc/salome-geom-${PV}" - -MODULE_NAME="SMESH" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" -export OPENPBS="/usr" - -src_unpack() { - python_version - distutils_python_version - - 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}.patch - epatch "${FILESDIR}"/${P}_makefiles.patch - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" && has_version "<=sci-libs/vtk-5.2" ; then - append-flags -I/usr/include/vtk-5.0 - fi - # If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk - if has_version ">=sci-libs/vtk-5.2" ; then - append-flags -I/usr/include/vtk-5.2 - epatch "${FILESDIR}"/${P}-vtk-5.2.patch - fi - - # fix relocation error - if use amd64 ; then - epatch "${FILESDIR}"/${P}-amd64-relocation-error.patch - fi -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-visu with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without-<flag> for mpi / mpich - # 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 - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild new file mode 100644 index 000000000..7ab67a9e1 --- /dev/null +++ b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild @@ -0,0 +1,119 @@ +# 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. SMESH 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 opengl" + +RDEPEND="opengl? ( virtual/opengl ) + mpi? ( || ( sys-cluster/openmpi[cxx] + sys-cluster/mpich2[cxx] ) ) + debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-med-${PV} + >=sci-misc/salome-geom-${PV} + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=x11-libs/qwt-5.2 + >=dev-libs/boost-1.40.0 + >=sci-libs/opencascade-6.3 + >=sci-libs/hdf5-1.6.4 + >=sci-libs/med-2.3.5 + >=sci-libs/vtk-5.0[python]" + +DEPEND="${RDEPEND} + dev-lang/swig + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4" + +MODULE_NAME="SMESH" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." +} + +src_prepare() { + cd "${MY_S}" + + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + cd "${MY_S}" + + local vtk_suffix="" + + has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" + has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2" + has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4" + + # Configuration + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + --with-vtk=${VTKHOME} \ + --with-vtk-version=${vtk_suffix} \ + --with-qt='/usr' \ + --with-qwt_inc='/usr/include/qwt5' \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + $(use_with opengl opengl /usr) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-superv/ChangeLog b/sci-misc/salome-superv/ChangeLog deleted file mode 100644 index ae908623b..000000000 --- a/sci-misc/salome-superv/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-superv-3.2.6.ebuild: - Fixed typo in patch file - - 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-superv-3.2.6.ebuild, +files/salome-superv-3.2.6_omniorb_4.1.patch: - removed omniorb* dependencies, as they are already in salome-kernel; added - omniorb_4.1.patch - - 27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-superv-3.2.6.ebuild, -Changelog, +metadata.xml: - Removed fetch restriction, removed hardcode - - 29 May 2008; Daniel Tourde <daniel.tourde@caelae.se> - +salome-superv-3.2.6-gcc-4.3.patch - Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de> - - 21 May 2008; Daniel Tourde <daniel.tourde@caelae.se> - Initial import. - +salome-superv-3.2.6.ebuild, +salome-superv-3.2.6.patch - A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! - See bug #155974 for more info
\ No newline at end of file diff --git a/sci-misc/salome-superv/Manifest b/sci-misc/salome-superv/Manifest deleted file mode 100644 index b6f242a79..000000000 --- a/sci-misc/salome-superv/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX salome-superv-3.2.6-gcc-4.3.patch 596 RMD160 c084efcad2eb701621b7e1046b7d11a3ad3f8ee0 SHA1 1090189552c5d1f1abca346543147c31a090852e SHA256 e6576218a728aacae94d6794da0a1947eaf823ff62696c71f7439d4bdd73e710 -AUX salome-superv-3.2.6.patch 1299 RMD160 5a29f236b189d186332f196a5e53864346dd290e SHA1 d4ed9e21b878dd29464154a6e8f03ef6000e9931 SHA256 92b528d1736a8301597c5712686f6a616f45afc8c944e4a7f28112746d1a062f -AUX salome-superv-3.2.6_omniorb_4.1.patch 7798 RMD160 d3858b70d9a5a75a664270b29503fc245f6038c2 SHA1 74405f7e4f3055ac868c75ce2402d7aa8069f289 SHA256 ea086ac19fcbf7c8d576f70db0def676e5074c8ca29b75b4966fd77447cabc8d -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-superv-3.2.6.ebuild 3985 RMD160 8fdd794abf86f444a0d5627cb928393a981c231f SHA1 52fd350aa45ef7472485e9d1670b3383c158a6ab SHA256 6f3922b536485d576d3af3ab61530312e17ff0bbb75d26c84102bb2af5c78f62 -MISC ChangeLog 1242 RMD160 4648dffef6118d8474644a613c9e484393eb4e0a SHA1 657a969b2437e279a61e36f639a4663a16c22082 SHA256 3d3cca21e185b20bb7b141131f4d3f5134dd54becd0919aa7f4f637e73390bf9 -MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-superv/files/salome-superv-3.2.6-gcc-4.3.patch b/sci-misc/salome-superv/files/salome-superv-3.2.6-gcc-4.3.patch deleted file mode 100644 index e0c71e6a2..000000000 --- a/sci-misc/salome-superv/files/salome-superv-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur src3.2.6.old/SUPERV_SRC_3.2.6/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx src3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx ---- src3.2.6.old/SUPERV_SRC_3.2.6/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx 2008-05-25 19:32:49.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx 2008-05-26 02:57:42.000000000 +0200 -@@ -35,7 +35,7 @@ - #include <qtooltip.h> - #define TEXT_MARGIN 5 - --#include <iostream.h> //for debug only -+#include <iostream> //for debug only - - #define ADDNODES(NodesName,LevelHasDiffNT) \ - ncols = nodes->NodesName.length(); \ diff --git a/sci-misc/salome-superv/files/salome-superv-3.2.6.patch b/sci-misc/salome-superv/files/salome-superv-3.2.6.patch deleted file mode 100644 index 7e12b919d..000000000 --- a/sci-misc/salome-superv/files/salome-superv-3.2.6.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./SUPERV_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./SUPERV_SRC_3.2.6/build_configure 2008-01-07 12:46:59.000000000 +0100 -@@ -118,7 +118,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 ---- ./SUPERV_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./SUPERV_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 13:12:33.000000000 +0100 -@@ -27,12 +27,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - ---- ./SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 13:20:04.000000000 +0100 -@@ -29,7 +29,7 @@ - @COMMENCE@ - - usr_docs: -- cp -fr $(srcdir)/SUPERV ./ -+# cp -fr $(srcdir)/SUPERV ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - - docs: usr_docs diff --git a/sci-misc/salome-superv/files/salome-superv-3.2.6_omniorb_4.1.patch b/sci-misc/salome-superv/files/salome-superv-3.2.6_omniorb_4.1.patch deleted file mode 100644 index 4998fc6d4..000000000 --- a/sci-misc/salome-superv/files/salome-superv-3.2.6_omniorb_4.1.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx 2008-08-22 19:57:13.000000000 +0200 -@@ -74,7 +74,7 @@ - ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) { - switch (anAny.type()->kind()) { - case CORBA::tk_string: { -- char * t; -+ const char * t; - anAny >>= t; - *_fdebug << " " << t << " (tk_string)" << endl ; - break; -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx 2008-08-22 21:55:22.000000000 +0200 -@@ -151,7 +151,7 @@ - #endif - switch (aDataValue->type()->kind()) { // Input Value - case CORBA::tk_string: { // Input string Value -- char * t; -+ const char * t; - *aDataValue >>= t; - #if ValueTrace - cdebug << t << " (string)" ; -@@ -242,7 +242,7 @@ - char t[40] ; - sprintf( t , "%ld" , ll ) ; - *theValue <<= t ; -- char *tt ; -+ const char *tt ; - *theValue >>= tt ; - #if ValueTrace - cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; -@@ -311,7 +311,7 @@ - char t[40] ; - sprintf( t , "%lf" , d ) ; - *theValue <<= t ; -- char *tt ; -+ const char *tt ; - *theValue >>= tt ; - #if ValueTrace - cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; -@@ -473,7 +473,7 @@ - //JR 30.03.2005 switch ( theValue->type()->kind() ) { - switch ( theValue.type()->kind() ) { - case CORBA::tk_string: { -- char * t; -+ const char * t; - //JR 30.03.2005 *theValue >>= t; - theValue >>= t; - // cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ; -@@ -583,7 +583,7 @@ - const CORBA::Any * theValue = *_Value ; - switch (theValue->type()->kind()) { - case CORBA::tk_string: -- char * t; -+ const char * t; - *theValue >>= t; - f << t << " (string)" ; - break; -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx 2008-08-22 22:29:22.000000000 +0200 -@@ -1598,7 +1598,7 @@ - bool isUnknown = false; - switch (aValue.type()->kind()) { - case CORBA::tk_string: -- char * t; -+ const char * t; - aValue >>= t; - cdebug << t << " (string) " ; - if ( !strcmp( t, "Unknown CORBA::Any Type" ) ) -@@ -1688,7 +1688,7 @@ - << ToServiceParameterName << "' , Any " ; - switch (aValue.type()->kind()) { - case CORBA::tk_string: -- char * t; -+ const char * t; - aValue >>= t; - cdebug << t << " (string) " ; - break; -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx 2008-08-22 22:00:15.000000000 +0200 -@@ -718,7 +718,7 @@ - case CORBA::tk_string: { - //Mandrake 10.1/Salome 3 aLink.aLinkValue <<= (char *) NULL ; - aLink.aLinkValue <<= (char *) "" ; -- char * t; -+ const char * t; - aLink.aLinkValue >>= t; - #if TRACE - MESSAGE( t << " (string)" ); -@@ -778,7 +778,7 @@ - switch ( aLink.aLinkValue.type()->kind() ) { - case CORBA::tk_string: { - aLink.aLinkValue <<= fieldvalue[depth].c_str() ; -- char * t; -+ const char * t; - aLink.aLinkValue >>= t; - #if TRACE - MESSAGE( t << " (string)" ); -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx 2008-08-22 22:44:27.000000000 +0200 -@@ -1200,7 +1200,7 @@ - valuetype.appendChild( aField ) ; - switch (aLink.aLinkValue.type()->kind()) { - case CORBA::tk_string: { -- char* retstr ; -+ const char* retstr ; - aLink.aLinkValue >>= retstr; - // f << Tabs << " <value>" << retstr << "</value>" << endl ; - QDomElement value = Graph.createElement( "value" ) ; -@@ -1345,7 +1345,7 @@ - << ".Input( " ; - switch (aLink.aLinkValue.type()->kind()) { - case CORBA::tk_string: { -- char* retstr ; -+ const char* retstr ; - aLink.aLinkValue >>= retstr; - f << "'" << retstr << "'" ; - break ; -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx 2008-08-22 22:59:18.000000000 +0200 -@@ -3277,7 +3277,7 @@ - const char * Type = anInPort->GetServicesParameter().Parametertype ; - switch ( D.Value.type()->kind() ) { // { string , long , double , objref } - case CORBA::tk_string: -- char * t; -+ const char * t; - D.Value >>= t; - #if InParametersSetTrace - cdebug << t << " (string)" ; -@@ -3675,7 +3675,7 @@ - #if InParametersSetTrace - switch (D.Value.type()->kind()) { // { string , long , double , objref } - case CORBA::tk_string: -- char * t; -+ const char * t; - D.Value >>= t; - cdebug << ThreadNo() << " " << t << "(string)" << endl ; - break; -@@ -3764,7 +3764,7 @@ - ServicesAnyData D = OutParametersList[i] ; - switch (D.Value.type()->kind()) { // { string , long , double , objref } - case CORBA::tk_string: { -- char * t; -+ const char * t; - D.Value >>= t; - #if OutParametersSetTrace - cdebug << ThreadNo() << " " << t << "(string)" << endl ; -@@ -3999,7 +3999,7 @@ - #if OutParametersSetTrace - switch ( anOutPort->Value().type()->kind() ) { - case CORBA::tk_string: -- char * t; -+ const char * t; - (anOutPort->Value()) >>= t; - cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ; - break; -diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx ---- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx 2008-08-22 19:55:15.000000000 +0200 -+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx 2008-08-22 22:48:17.000000000 +0200 -@@ -320,7 +320,7 @@ - sname = InParametersList[i].Name.c_str() ; - switch ( data.type()->kind() ) { - case CORBA::tk_string : { -- char * t ; -+ const char * t ; - data >>= t ; - PyObject * ArgValue = Py_BuildValue( "s" , t ) ; - PyTuple_SetItem( ArgsList , i , ArgValue ) ; diff --git a/sci-misc/salome-superv/salome-superv-3.2.6.ebuild b/sci-misc/salome-superv/salome-superv-3.2.6.ebuild deleted file mode 100644 index d173c5720..000000000 --- a/sci-misc/salome-superv/salome-superv-3.2.6.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. SUPERV 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" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - >=sci-misc/salome-component-${PV}" - -MODULE_NAME="SUPERV" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -SUPERV_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..." - - 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}.patch - epatch "${FILESDIR}"/${P}_omniorb_4.1.patch - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-superv with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without-<flag> for mpich - # 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-mpich" - fi - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-visu/ChangeLog b/sci-misc/salome-visu/ChangeLog index 1efde0376..1340a1a62 100644 --- a/sci-misc/salome-visu/ChangeLog +++ b/sci-misc/salome-visu/ChangeLog @@ -1,6 +1,14 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-visu-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + -salome-visu-3.2.6.ebuild, -files/salome-visu-3.2.6-gcc-4.3.patch, + -files/salome-visu-3.2.6_makefiles.patch, -files/salome-visu-3.2.6.patch, + +salome-visu-5.1.3.ebuild: + Version bump 5.1.3 + removed broken 3.2.6 + 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> salome-visu-3.2.6.ebuild: removed omniorb* dependencies, as they are already in salome-kernel diff --git a/sci-misc/salome-visu/Manifest b/sci-misc/salome-visu/Manifest index bfbec3eba..71712f897 100644 --- a/sci-misc/salome-visu/Manifest +++ b/sci-misc/salome-visu/Manifest @@ -1,7 +1,4 @@ -AUX salome-visu-3.2.6-gcc-4.3.patch 1465 RMD160 6bbc4eed2e1ea8b3c8b1de24ca3cd4440e84f35d SHA1 4b703d99c8f5b45995d5c81d3a4ef6c6c234204c SHA256 5fb40f5eeb56677a1ac6909802cf126ab6e164b21c0214b81ba7c111a14bf9c6 -AUX salome-visu-3.2.6.patch 16848 RMD160 34b4460e7b01c8f5200cfdd46570c0517afd3201 SHA1 cd787bfbb330c6abe859990225a14e1ecdf319b6 SHA256 1d48148857b7958872b7c0e4ab64ae774a156aef59aa46d6239d35e53955e644 -AUX salome-visu-3.2.6_makefiles.patch 1283 RMD160 fd663c12446b91ffdba4bba689ed16da64455763 SHA1 0b9ca2d2e9e44f43387f5428fba0111dd5cd6e52 SHA256 20b7130d7b3172dd6f357ae329f4d2bdcb73d39ff5686d400d9796f254bf7795 -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-visu-3.2.6.ebuild 3981 RMD160 16a98b1aadf618e9c332983769097f11ae1abe95 SHA1 d37bca44c77ca63e9cb2d135115478e428ebf9f1 SHA256 8184b5d3b91961272e89a41cc152f5c3028bffebf1250f1df3a7a9080d3cbee1 -MISC ChangeLog 1084 RMD160 b9612ec8512b3c2af304fea9c0b26dc9f3fd5d9e SHA1 b079197fe8e268396263a233e19e440e866fd48a SHA256 b1df248269e465d78cda90dace12c13ae3aabcfea7b127f5f08a4ff3e5097f8c +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-visu-5.1.3.ebuild 2989 RMD160 13ac0e8e2e66ea38677c116dce1618a7aced2234 SHA1 d1338d5e7e2f29ed155c064fe949bdf329b11ece SHA256 fe699ae1e4ac3f6f7ed4d6a05c3e12d8582925087f5a95276c5f3f7fb49cd141 +MISC ChangeLog 1398 RMD160 ddaab42fdeec660a9fbdb2f50dd433e32896c872 SHA1 4a30fe3d7a6e493b2344ba98747a0a1dbb41893c SHA256 17e072efd42f3746bc980b77ce8b423aa4cb4096047a5fc29dacf248bb33c8c2 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch deleted file mode 100644 index 963530a84..000000000 --- a/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx ---- src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx 2008-05-25 19:32:55.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx 2008-05-26 04:24:56.000000000 +0200 -@@ -32,6 +32,7 @@ - #include "SALOME_ExtractGeometry.h" - - #include <float.h> -+#include <climits> - - #include <vtkObjectFactory.h> - #include <vtkDataSetMapper.h> -diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx ---- src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2008-05-25 19:32:55.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2008-05-26 04:35:35.000000000 +0200 -@@ -30,7 +30,7 @@ - #include "VISU_UsedPointsFilter.hxx" - #include "VTKViewer_GeometryFilter.h" - --#include <algo.h> -+#include <algorithm> - - #include <vtkCell.h> - #include <vtkPointSet.h> -diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx src3.2.6/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx ---- src3.2.6.old/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx 2008-05-25 19:32:55.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx 2008-05-26 04:39:50.000000000 +0200 -@@ -43,7 +43,7 @@ - #include <qpushbutton.h> - #include <qfiledialog.h> - --#include <iostream.h> -+#include <iostream> - - using namespace std; - diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6.patch deleted file mode 100644 index 139415712..000000000 --- a/sci-misc/salome-visu/files/salome-visu-3.2.6.patch +++ /dev/null @@ -1,348 +0,0 @@ -Seulement dans src3.2.6: build -Seulement dans src3.2.6/VISU_SRC_3.2.6: aclocal.m4 -Seulement dans src3.2.6/VISU_SRC_3.2.6: autom4te.cache -Seulement dans src3.2.6/VISU_SRC_3.2.6: configure -Seulement dans src3.2.6/VISU_SRC_3.2.6: configure.in -Seulement dans src3.2.6/VISU_SRC_3.2.6: salome_adm -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-11-28 17:30:04.000000000 +0100 -@@ -235,8 +235,8 @@ - { - VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute"); - vtkUnstructuredGrid *anOutput = this->GetOutput(); -- if(this->NumberOfInputs == 1){ -- anOutput->ShallowCopy(this->Inputs[0]); -+ if(this->InputList->GetNumberOfItems() == 1){ -+ anOutput->ShallowCopy(this->GetInput(0)); - return; - } - -@@ -247,8 +247,8 @@ - return; - - if(IsMergingInputs()){ -- TCellIdMerger aFunctor(this->NumberOfInputs); -- ForEachInput<TCellIdMerger>(this->Inputs, this->NumberOfInputs, aFunctor); -+ TCellIdMerger aFunctor(this->InputList->GetNumberOfItems()); -+ ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor); - - vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; - TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap; -@@ -275,7 +275,7 @@ - //TObjectId anObjectId = anIter->first; - const TInputCellId& anInputCellId = anIter->second; - TInputId anInputId = anInputCellId.first; -- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ -+ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){ - TCellId aCellId = anInputCellId.second; - aDataSet->GetCellPoints(aCellId, anIdList); - -@@ -288,8 +288,8 @@ - } - anIdList->Delete(); - }else{ -- TCellCounter aFunctor(this->NumberOfInputs); -- ForEachInput<TCellCounter>(this->Inputs, this->NumberOfInputs, aFunctor); -+ TCellCounter aFunctor(this->InputList->GetNumberOfItems()); -+ ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor); - - vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; - vtkIdType aNbCells = aFunctor.GetNbCells(); -@@ -309,8 +309,8 @@ - // 2.cells - vtkIdList *anIdList = vtkIdList::New(); - anIdList->Allocate(VTK_CELL_SIZE); -- for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) { -- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ -+ for(vtkIdType anInputId = 0; anInputId < this->InputList->GetNumberOfItems(); anInputId++) { -+ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){ - vtkIdType aNbCells = aDataSet->GetNumberOfCells(); - vtkCellData *aCellData = aDataSet->GetCellData(); - // copy cell and cell data -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_AppendFilter.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-11-28 17:30:04.000000000 +0100 -@@ -1307,7 +1307,7 @@ - aConnectivity->InitTraversal(); - for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); -- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - - if(MYVTKDEBUG) aConnectivity->DebugOn(); - -@@ -1397,7 +1397,7 @@ - aConnectivity->InitTraversal(); - for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); -- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - - if(MYVTKDEBUG) aConnectivity->DebugOn(); - -@@ -1561,7 +1561,7 @@ - aConnectivity->InitTraversal(); - for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); -- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - - { - int aNbTuples = aNbCells; -@@ -1829,7 +1829,7 @@ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - - const TVTKSource& aSource = theGaussSubMesh->GetSource(); -- aSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - aSource->SetPoints(aPoints.GetPointer()); - - aCellLocationsArray->Delete(); -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_Convertor_impl.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-11-28 17:30:04.000000000 +0100 -@@ -51,7 +51,7 @@ - vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New(); - //aWriter->SetFileType(VTK_BINARY); - aWriter->SetFileName(theFileName.c_str()); -- aWriter->SetInput(theDataSet); -+ aWriter->SetInput((vtkDataObject*)theDataSet); - aWriter->Write(); - aWriter->Delete(); - } -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_ConvertorUtils.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-11-28 17:30:01.000000000 +0100 -@@ -104,7 +104,7 @@ - $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) - - LDFLAGS+= \ -- $(VTK_LIBS) -lVTKViewer -lVisuConvertor \ -+ $(VTK_LIBS) -lVTKViewer -lVisuConvertor -lvtkWidgets \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(GUI_LDFLAGS) \ - $(MED_LDFLAGS) -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-11-28 17:30:02.000000000 +0100 -@@ -202,7 +202,7 @@ - vtkFloatingPointType multiplier; - vtkPoints *newPts; - vtkIdList *newCellPts; -- vtkDataSet *input = this->GetInput(); -+ vtkDataSet *input = (vtkDataSet*)(this->GetInput()); - vtkPointData *pd = input->GetPointData(); - vtkCellData *cd = input->GetCellData(); - vtkUnstructuredGrid *output = this->GetOutput(); -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: SALOME_ExtractGeometry.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-11-28 17:30:01.000000000 +0100 -@@ -127,7 +127,8 @@ - VISU_CutPlanesPL - ::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData) - { -- int iEnd = theAppendPolyData->GetNumberOfInputs(); -+ //int iEnd = theAppendPolyData->GetNumberOfInputs(); -+ int iEnd = theAppendPolyData->GetUserManagedInputs(); - for(int i = iEnd-1; i >= 0; i--) - theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i)); - } -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_CutPlanesPL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100 -@@ -43,10 +43,10 @@ - VISU_DeformedShapePL - ::~VISU_DeformedShapePL() - { -- myWarpVector->UnRegisterAllOutputs(); -+ //myWarpVector->UnRegisterAllOutputs(); - myWarpVector->Delete(); - -- myCellDataToPointData->UnRegisterAllOutputs(); -+ //myCellDataToPointData->UnRegisterAllOutputs(); - myCellDataToPointData->Delete(); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_DeformedShapePL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-11-28 17:30:02.000000000 +0100 -@@ -311,7 +311,7 @@ - ::GetNodeCoord(int theObjID) - { - vtkIdType anID = GetNodeVTKID(theObjID); -- vtkDataSet* aDataSet = myGeomFilter->GetInput(); -+ vtkDataSet* aDataSet = (vtkDataSet*)(myGeomFilter->GetInput()); - return aDataSet->GetPoint(anID); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_GaussPointsPL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-11-28 17:30:02.000000000 +0100 -@@ -44,10 +44,10 @@ - VISU_IsoSurfacesPL - ::~VISU_IsoSurfacesPL() - { -- myContourFilter->UnRegisterAllOutputs(); -+ //myContourFilter->UnRegisterAllOutputs(); - myContourFilter->Delete(); - -- myCellDataToPointData->UnRegisterAllOutputs(); -+ //myCellDataToPointData->UnRegisterAllOutputs(); - myCellDataToPointData->Delete(); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_IsoSurfacesPL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-11-28 17:30:01.000000000 +0100 -@@ -34,7 +34,7 @@ - #include <vtkLookupTable.h> - #include <vtkTextProperty.h> - #include <vtkScalarBarActor.h> --#include <vtkIdType.h> -+//#include <vtkIdType.h> - - #include <string.h> - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarBarCtrl.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100 -@@ -66,7 +66,7 @@ - VISU_ScalarMapOnDeformedShapePL - ::~VISU_ScalarMapOnDeformedShapePL() - { -- myDeformVectors->UnRegisterAllOutputs(); -+ // myDeformVectors->UnRegisterAllOutputs(); - myDeformVectors->Delete(); - - myMergeFilter->UnRegisterAllOutputs(); -@@ -75,7 +75,7 @@ - myExtractorScalars->UnRegisterAllOutputs(); - myExtractorScalars->Delete(); - -- myCellDataToPointData->UnRegisterAllOutputs(); -+ //myCellDataToPointData->UnRegisterAllOutputs(); - myCellDataToPointData->Delete(); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarMapOnDeformedShapePL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-11-28 17:30:01.000000000 +0100 -@@ -61,16 +61,16 @@ - } - - VISU_StreamLinesPL::~VISU_StreamLinesPL(){ -- myPointsFilter->UnRegisterAllOutputs(); -+ //myPointsFilter->UnRegisterAllOutputs(); - myPointsFilter->Delete(); - -- myCenters->UnRegisterAllOutputs(); -+ //myCenters->UnRegisterAllOutputs(); - myCenters->Delete(); - -- myGeomFilter->UnRegisterAllOutputs(); -+ //myGeomFilter->UnRegisterAllOutputs(); - myGeomFilter->Delete(); - -- myStream->UnRegisterAllOutputs(); -+ //myStream->UnRegisterAllOutputs(); - myStream->Delete(); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_StreamLinesPL.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-11-28 17:30:04.000000000 +0100 -@@ -218,7 +218,7 @@ - myMapper->RemoveAllInputs(); - myMapper->Delete(); - -- myPlaneSource->UnRegisterAllOutputs(); -+ //myPlaneSource->UnRegisterAllOutputs(); - myPlaneSource->Delete(); - } - -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_ClippingDlg.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx ---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-11-28 17:30:04.000000000 +0100 -@@ -119,7 +119,7 @@ - ~TPlane() { - myMapper->RemoveAllInputs(); - myMapper->Delete(); -- myPlaneSource->UnRegisterAllOutputs(); -+ // myPlaneSource->UnRegisterAllOutputs(); - myPlaneSource->Delete(); - }; - // Not implemented. -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_Plot3DDlg.cxx~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in ---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-11-28 17:30:03.000000000 +0100 -@@ -122,7 +122,7 @@ - LDFLAGS += \ - $(PYTHON_LIBS) \ - $(QT_MT_LIBS) \ -- $(VTK_LIBS) \ -+ $(VTK_LIBS) -lvtkWidgets \ - $(QWT_LIBS) \ - $(BOOST_LIBS) \ - $(KERNEL_LDFLAGS) \ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc ---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-11-28 17:30:04.000000000 +0100 -@@ -409,7 +409,8 @@ - aTitle = aTitle.simplifyWhiteSpace(); - aTableOfReal->SetTitle(aTitle.latin1()); - -- int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs(); -+ // int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs(); -+ int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetUserManagedInputs(); - if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd); - TXCont aXCont; - TXYMapCont aXYMapCont; -@@ -461,7 +462,7 @@ - aXYMap[aDist] = aScalars->GetTuple1(i); - } - if(aFilter){ -- aFilter->UnRegisterAllOutputs(); -+ // aFilter->UnRegisterAllOutputs(); - aFilter->Delete(); - } - } -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_CutLines_i.cc~ -diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc ---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-04-24 18:41:04.000000000 +0200 -+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-11-28 17:30:04.000000000 +0100 -@@ -161,7 +161,7 @@ - - VISU::StreamLines_i::~StreamLines_i(){ - if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()"); -- myAppendFilter->UnRegisterAllOutputs(); -+ //myAppendFilter->UnRegisterAllOutputs(); - myAppendFilter->Delete(); - } - -@@ -178,8 +178,9 @@ - vtkPointSet* aSource = NULL; - if(!thePrs3d->_is_nil()) - if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){ -- for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--) -- myAppendFilter->RemoveInput(myAppendFilter->GetInput(i)); -+ // for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--) -+ // myAppendFilter->RemoveInput(myAppendFilter->GetInput(i)); -+ myAppendFilter->RemoveAllInputs(); - myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput()); - aSource = myAppendFilter->GetOutput(); - } -Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_StreamLines_i.cc~ diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch deleted file mode 100644 index a54090945..000000000 --- a/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./VISU_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./VISU_SRC_3.2.6/build_configure 2008-01-07 14:43:19.000000000 +0100 -@@ -127,7 +127,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 ---- ./VISU_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./VISU_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 14:44:21.000000000 +0100 -@@ -27,12 +27,12 @@ - all: resources - - install: -- cp -rf @top_srcdir@/adm_local @prefix@ -+# cp -rf @top_srcdir@/adm_local @prefix@ - - bin: - - resources : -- cp -rf @top_srcdir@/adm_local $(top_builddir) -+# cp -rf @top_srcdir@/adm_local $(top_builddir) - - inc: - ---- ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 14:45:41.000000000 +0100 -@@ -30,7 +30,7 @@ - @COMMENCE@ - - usr_docs: -- cp -fr $(srcdir)/VISU ./ -+# cp -fr $(srcdir)/VISU ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - - docs: usr_docs diff --git a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild deleted file mode 100644 index cd451dc42..000000000 --- a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib - -DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU 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" - -RDEPEND="opengl? ( virtual/opengl ) - mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - >=sci-misc/salome-component-${PV}" - -MODULE_NAME="VISU" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" -INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" -VISU_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..." - - 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}.patch - epatch "${FILESDIR}"/${P}_makefiles.patch - - # Gcc 4.3 support - if version_is_at_least "4.3" $(gcc-version) ; then - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - fi -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-visu with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without-<flag> for mpi / mpich - # 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 - - # Configuration - econf --prefix=${INSTALL_DIR} \ - --datadir=${INSTALL_DIR}/share/salome \ - --docdir=${INSTALL_DIR}/doc/salome \ - --infodir=${INSTALL_DIR}/share/info \ - --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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - $(use_with opengl opengl /usr) \ - || die "configuration failed" - - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/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 "${MODULE_NAME}_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} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} - diff --git a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild new file mode 100644 index 000000000..e01e36ab8 --- /dev/null +++ b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild @@ -0,0 +1,114 @@ +# 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. VISU 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 opengl" + +RDEPEND="opengl? ( virtual/opengl ) + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-gui-${PV} + >=sci-misc/salome-component-${PV} + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=dev-libs/boost-1.40.0 + >=sci-libs/opencascade-6.3 + >=sci-libs/hdf5-1.6.4 + >=sci-libs/med-2.3.5 + >=sci-libs/vtk-5.0[python]" + +DEPEND="${RDEPEND} + dev-lang/swig + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4" + +MODULE_NAME="VISU" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." +} + +src_prepare() { + cd "${MY_S}" + + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + local vtk_suffix="" + + has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" + has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2" + has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4" + + cd "${MY_S}" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --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 \ + --with-vtk=${VTKHOME} \ + --with-vtk-version=${vtk_suffix} \ + --with-qt="/usr" \ + --with-qwt_inc="/usr/include/qwt5" \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + $(use_with opengl opengl /usr) \ + || die "econf failed" +} + +src_compile() { + cd "${MY_S}" + + emake || die "emake failed" +} + +src_install() { + cd "${MY_S}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} diff --git a/sci-misc/salome-yacs/ChangeLog b/sci-misc/salome-yacs/ChangeLog new file mode 100644 index 000000000..d1470415b --- /dev/null +++ b/sci-misc/salome-yacs/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for sci-misc/salome-yacs +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*salome-yacs-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + +salome-yacs-5.1.3.ebuild, +files/salome-yacs-5.1.3-ac_python_devel.patch, + +files/salome-yacs-5.1.3-lib_location.patch, + +files/salome-yacs-5.1.3-libdir.patch, +metadata.xml: + New entry as a component of salome-5.1.3 + diff --git a/sci-misc/salome-yacs/Manifest b/sci-misc/salome-yacs/Manifest new file mode 100644 index 000000000..ccd5000fa --- /dev/null +++ b/sci-misc/salome-yacs/Manifest @@ -0,0 +1,7 @@ +AUX salome-yacs-5.1.3-ac_python_devel.patch 1284 RMD160 e595a81ae436cdb03d86acad61a0ab8087712836 SHA1 c8eb83c06ed7c185645aaa256fe6324ab75bf5d7 SHA256 26b49bb12a41174851f4179b9cba4341c7b5d52bda446c0b17eed527cbb2a52b +AUX salome-yacs-5.1.3-lib_location.patch 663 RMD160 6e02098839ad76c09adb995bd71567b7dbe9a770 SHA1 54a16203762e03ad1d96bd4f67cc33c7d66dfd71 SHA256 a21deface225771ce0210506e190b82d69a486e41a417743d82794988188d5d4 +AUX salome-yacs-5.1.3-libdir.patch 988 RMD160 db03b310f8ab1a45586fc3a0d597147e359258fe SHA1 0073bba897ff0b59f5d768504432788fc7b5ab59 SHA256 080e5d8b945f275927db499d199b7bd7f3c5fcce28a4878b9f840e26dc745bba +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-yacs-5.1.3.ebuild 2866 RMD160 6f0749afd78fa84d2150a83dc106d53dfaf29955 SHA1 0c377fd5c24387a4b5c075bee63c323f12b3afb5 SHA256 bd618f5c79344ee804c930344d2677d27cc9b227e8af76441515179cf3bf6336 +MISC ChangeLog 440 RMD160 25bfd70c64d7166dbfb077b8f8aedebfd4ddc272 SHA1 3319b1130823de86b0327366f527dee29e6b9416 SHA256 18f099554946fd7a79880752820d808f97bd4f658be37b8936c9515adf170bd1 +MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch new file mode 100644 index 000000000..6c83be8e7 --- /dev/null +++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch @@ -0,0 +1,13 @@ +Files src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp and src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp differ +diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 +--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 2010-03-08 20:51:25.810829226 +0100 ++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 2010-03-08 20:53:41.330413913 +0100 +@@ -48,7 +48,7 @@ + # Check for Python library path + AC_MSG_CHECKING([for Python library path]) + python_path=`echo $PYTHON | sed "s,/bin.*$,,"` +- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do ++ for i in "$python_path/lib$LIB_LOCATION_SUFFIX" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/" "$python_path/" ; do + python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` + if test -n "$python_path" ; then + break diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch new file mode 100644 index 000000000..9eb803582 --- /dev/null +++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch @@ -0,0 +1,14 @@ +diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 +--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 2010-03-08 20:39:54.160326435 +0100 ++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 2010-03-08 20:40:58.590323448 +0100 +@@ -23,6 +23,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-yacs/files/salome-yacs-5.1.3-libdir.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch new file mode 100644 index 000000000..b4a2a50c8 --- /dev/null +++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch @@ -0,0 +1,22 @@ +--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/make_begin.am 2010-03-10 15:45:32.281101526 +0100 ++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am 2010-03-10 15:46:58.440251953 +0100 +@@ -22,7 +22,7 @@ + + # Standard directory for installation + salomeincludedir = $(includedir)/salome +-libdir = $(prefix)/lib/salome ++libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome + bindir = $(prefix)/bin/salome + salomescriptdir = $(bindir) + salomepythondir = $(pythondir)/salome +--- src5.1.3.orig/YACS_SRC_5.1.3/src/genericgui/Makefile.am 2010-03-10 16:26:05.424066867 +0100 ++++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am 2010-03-10 16:26:41.450302694 +0100 +@@ -16,7 +16,7 @@ + # + # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + # +-libdir = $(prefix)/lib/salome ++libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome + bindir = $(prefix)/bin/salome + + lib_LTLIBRARIES = libGenericGui.la diff --git a/sci-misc/salome-superv/metadata.xml b/sci-misc/salome-yacs/metadata.xml index b229aec85..d369d068f 100644 --- a/sci-misc/salome-superv/metadata.xml +++ b/sci-misc/salome-yacs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> + <herd>sci</herd> </pkgmetadata> diff --git a/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild new file mode 100644 index 000000000..51b20d1e2 --- /dev/null +++ b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild @@ -0,0 +1,117 @@ +# 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. YACS 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 opengl" + +RDEPEND="opengl? ( virtual/opengl ) + debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-gui-${PV} + >=dev-python/omniorbpy-3.4 + >=sci-libs/hdf5-1.6.4 + >=dev-libs/boost-1.40.0 + >=x11-libs/qt-core-4.5.2 + >=x11-libs/qt-gui-4.5.2 + >=x11-libs/qt-opengl-4.5.2 + >=dev-python/PyQt4-4.5.4 + >=x11-libs/qscintilla-2.4 + >=net-misc/omniORB-4.1.3 + dev-libs/expat" + +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx ) + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4 + dev-lang/swig + dev-libs/libxml2 + >=dev-python/celementtree-1.0.5 + >=dev-python/elementtree-1.2.6" + +MODULE_NAME="YACS" +MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_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..." +} + +src_prepare() { + cd "${MY_S}" + + epatch "${FILESDIR}"/"${P}"-ac_python_devel.patch + if use amd64; then + epatch "${FILESDIR}"/"${P}"-lib_location.patch + epatch "${FILESDIR}"/"${P}"-libdir.patch + fi + + rm -r -f autom4te.cache + ./clean_configure + ./build_configure +} + +src_configure() { + cd "${MY_S}" + + econf --prefix=${INSTALL_DIR} \ + --datadir=${INSTALL_DIR}/share/salome \ + --docdir=${INSTALL_DIR}/doc/salome \ + --libdir=${INSTALL_DIR}/$(get_libdir)/salome \ + --infodir=${INSTALL_DIR}/share/info \ + --with-qt4=/usr \ + --with-qt4-libraries=/usr/$(get_libdir)/qt4 \ + --with-qsci4-includes=/usr/include/Qsci \ + $(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}" + + emake DESTDIR="${D}" install || die "emake install failed" + + use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib + + echo "${MODULE_NAME}_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} + rm adm/Makefile + insinto "${INSTALL_DIR}" + doins -r adm + + use doc && dodoc AUTHORS INSTALL NEWS README +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} |