diff -uNr portage.orig/sci-misc/salome-component/ChangeLog portage/sci-misc/salome-component/ChangeLog --- portage.orig/sci-misc/salome-component/ChangeLog 2010-08-12 21:46:00.906551175 +0200 +++ portage/sci-misc/salome-component/ChangeLog 2010-08-17 23:09:38.900524634 +0200 @@ -1,5 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + +*salome-component-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-component-5.1.4.ebuild: + Version bump to 5.1.4. Disabled as-needed flag. 29 Jun 2010; Justin Lecher salome-component-5.1.3.ebuild: diff -uNr portage.orig/sci-misc/salome-component/salome-component-5.1.4.ebuild portage/sci-misc/salome-component/salome-component-5.1.4.ebuild --- portage.orig/sci-misc/salome-component/salome-component-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-component/salome-component-5.1.4.ebuild 2010-08-17 23:04:04.156521804 +0200 @@ -0,0 +1,106 @@ +# 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 eutils flag-o-matic python + +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/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +COMPONENT_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + local myconf="" + +# --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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \ + ${myconf} \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + || die "econf failed" +} + +src_install() { + 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$(python_get_version)/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 -uNr portage.orig/sci-misc/salome-geom/ChangeLog portage/sci-misc/salome-geom/ChangeLog --- portage.orig/sci-misc/salome-geom/ChangeLog 2010-08-12 21:46:00.906551175 +0200 +++ portage/sci-misc/salome-geom/ChangeLog 2010-08-17 15:07:26.508521521 +0200 @@ -1,6 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-geom-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-geom-5.1.4.ebuild, + -salome-geom-5.1.3-qt4-path.patch: + Version bump to 5.1.4. Added support for vtk 5.6. Disabled as-needed flag. + 29 Jun 2010; Justin Lecher salome-geom-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-geom/salome-geom-5.1.4.ebuild portage/sci-misc/salome-geom/salome-geom-5.1.4.ebuild --- portage.orig/sci-misc/salome-geom/salome-geom-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-geom/salome-geom-5.1.4.ebuild 2010-08-15 16:13:04.127513796 +0200 @@ -0,0 +1,112 @@ +# 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 eutils flag-o-matic python + +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/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/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + #epatch "${FILESDIR}"/${P}-qt4-path.patch + + 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" + has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6" + + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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() { + MAKEOPTS="-j1" emake || die "emake failed" +} + +src_install() { + 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$(python_get_version)/site-packages/salome" >> ./90${P} + doenvd 90${P} + rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/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 -uNr portage.orig/sci-misc/salome-gui/ChangeLog portage/sci-misc/salome-gui/ChangeLog --- portage.orig/sci-misc/salome-gui/ChangeLog 2010-08-12 21:46:00.916563607 +0200 +++ portage/sci-misc/salome-gui/ChangeLog 2010-08-17 15:05:47.213521838 +0200 @@ -1,6 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-gui-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-gui-5.1.4.ebuild, + +salome-gui-5.1.4-qt4-path.patch: + Version bump to 5.1.4. Added support for vtk 5.6. Disabled as-needed flag. + 29 Jun 2010; Justin Lecher salome-gui-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch portage/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch --- portage.orig/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch 2010-08-14 02:32:08.095551736 +0200 @@ -0,0 +1,11 @@ +--- src5.1.4.orig/GUI_SRC_5.1.4/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100 ++++ src5.1.4/GUI_SRC_5.1.4/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 -uNr portage.orig/sci-misc/salome-gui/salome-gui-5.1.4.ebuild portage/sci-misc/salome-gui/salome-gui-5.1.4.ebuild --- portage.orig/sci-misc/salome-gui/salome-gui-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-gui/salome-gui-5.1.4.ebuild 2010-08-14 03:26:13.533551469 +0200 @@ -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 eutils flag-o-matic python + +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/Salome${PV}/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,mpi] + >=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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +GUI_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-qt4-path.patch + + 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" + has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6" + + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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() { + MAKEOPTS="-j1" emake || die "emake failed" +} + +src_install() { + 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$(python_get_version)/site-packages/salome" >> ./90${P} + doenvd 90${P} + rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile \ + adm_local/unix/config_files/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 -uNr portage.orig/sci-misc/salome-kernel/ChangeLog portage/sci-misc/salome-kernel/ChangeLog --- portage.orig/sci-misc/salome-kernel/ChangeLog 2010-08-12 21:46:00.919551588 +0200 +++ portage/sci-misc/salome-kernel/ChangeLog 2010-08-17 15:09:48.766521823 +0200 @@ -2,6 +2,14 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-kernel-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-kernel-5.1.4.ebuild, + +salome-kernel-5.1.4-openmpi.patch, + +salome-kernel-5.1.4-python-2.6.patch: + Version bump to 5.1.4 + 29 Jun 2010; Justin Lecher salome-kernel-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch portage/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch --- portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch 2010-08-12 21:46:00.926992935 +0200 +++ portage/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -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 -uNr portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch portage/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch --- portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch 2010-08-13 22:04:53.431551780 +0200 @@ -0,0 +1,21 @@ +--- src5.1.4.orig/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4 2008-12-10 10:14:34.000000000 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/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.4.orig/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx 2008-12-10 10:14:33.000000000 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx 2009-09-29 11:10:13.227293648 +0200 +@@ -25,6 +25,7 @@ + #include + + #ifdef HAVE_MPI2 ++#define OMPI_IGNORE_CXX_SEEK 1 + #include "mpi.h" + #endif + #include diff -uNr portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch portage/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch --- portage.orig/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch 2010-08-13 22:01:39.473551456 +0200 @@ -0,0 +1,13 @@ +Only in src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY: .import_hook.py.swp +diff -ur src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py +--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py 2010-03-07 17:35:38.450323100 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/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 -uNr portage.orig/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild portage/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild --- portage.orig/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild 2010-08-13 21:35:11.234552466 +0200 @@ -0,0 +1,118 @@ +# 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 eutils python + +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/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 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" + python_set_active_version 2 +} + +src_prepare() { + use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch + [[ $(python_get_version) == 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() { + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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_install() { + 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$(python_get_version)/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 -uNr portage.orig/sci-misc/salome-med/ChangeLog portage/sci-misc/salome-med/ChangeLog --- portage.orig/sci-misc/salome-med/ChangeLog 2010-08-12 21:46:00.927551502 +0200 +++ portage/sci-misc/salome-med/ChangeLog 2010-08-17 17:11:08.226521972 +0200 @@ -2,6 +2,16 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-med-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-med-5.1.4.ebuild, + +salome-med-5.1.4-check_metis.patch, + +salome-med-5.1.4-check_scotch.patch, + +salome-med-5.1.4-gcc.patch, + +salome-med-5.1.4-scotch.patch: + Version bump to 5.1.4. Added support for vtk 5.6. Disabled as-needed flag. + 29 Jun 2010; Justin Lecher salome-med-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch portage/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch --- portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch 2010-08-14 22:45:53.997608151 +0200 @@ -0,0 +1,48 @@ +--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200 ++++ src5.1.4/MED_SRC_5.1.4/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 -uNr portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch portage/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch --- portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch 2010-08-14 22:48:53.840608330 +0200 @@ -0,0 +1,74 @@ +--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200 ++++ src5.1.4/MED_SRC_5.1.4/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 +- #include ], ++ #include ], + [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 +- #include ], ++ #include ], + [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 +- #include ], ++ #include ], + [SCOTCH_Graph* graph; + SCOTCH_graphInit(graph)], + scotch_binaries_ok=yes, diff -uNr portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch portage/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch --- portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch 2010-08-14 22:40:40.783029675 +0200 @@ -0,0 +1,11 @@ +--- ./src5.1.4.orig/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100 ++++ ./src5.1.4/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:15:35.420479255 +0100 +@@ -21,7 +21,7 @@ + // + #include + #include +- ++#include + + /*****************************************************************************************************/ + diff -uNr portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch portage/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch --- portage.orig/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch 2010-08-14 22:51:51.669607824 +0200 @@ -0,0 +1,11 @@ +--- src5.1.4.orig/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100 ++++ src5.1.4/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2009-09-27 23:26:59.010112791 +0200 +@@ -19,7 +19,7 @@ + #include + extern "C" { + #define restrict +-#include "bin/scotch.h" ++#include "scotch.h" + } + #include "MEDSPLITTER_Graph.hxx" + #include "MEDSPLITTER_SCOTCHGraph.hxx" diff -uNr portage.orig/sci-misc/salome-med/salome-med-5.1.4.ebuild portage/sci-misc/salome-med/salome-med-5.1.4.ebuild --- portage.orig/sci-misc/salome-med/salome-med-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-med/salome-med-5.1.4.ebuild 2010-08-17 15:16:09.036521545 +0200 @@ -0,0 +1,127 @@ +# 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 eutils flag-o-matic python + +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/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + 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 + use amd64 && epatch "${FILESDIR}"/${P}-med_int.patch + + rm -r -f autom4te.cache + ./clean_configure + ./build_configure +} + +src_configure() { + 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" + has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6" + +# --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 + + use amd64 && append-flags -DHAVE_F77INT64 + + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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_install() { + 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$(python_get_version)/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 -uNr portage.orig/sci-misc/salome-meta/ChangeLog portage/sci-misc/salome-meta/ChangeLog --- portage.orig/sci-misc/salome-meta/ChangeLog 2010-08-12 21:46:00.937551168 +0200 +++ portage/sci-misc/salome-meta/ChangeLog 2010-08-17 17:13:45.146521888 +0200 @@ -1,5 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + +*salome-meta-5.1.4 (17 Aug 2010) + +17 Aug 2010; Michael Riss + +salome-meta-5.1.4.ebuild: + Version bump to 5.1.4 + 21 May 2008; Daniel Tourde Initial import. +salome-meta-3.2.6.ebuild diff -uNr portage.orig/sci-misc/salome-meta/salome-meta-5.1.4.ebuild portage/sci-misc/salome-meta/salome-meta-5.1.4.ebuild --- portage.orig/sci-misc/salome-meta/salome-meta-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-meta/salome-meta-5.1.4.ebuild 2010-08-14 02:16:11.567552436 +0200 @@ -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.4*[debug?,mpi?] + =sci-misc/salome-gui-5.1.4*[debug?] + =sci-misc/salome-med-5.1.4*[debug?,mpi?] + =sci-misc/salome-geom-5.1.4*[debug?] + =sci-misc/salome-smesh-5.1.4*[debug?] + =sci-misc/salome-visu-5.1.4*[debug?] + =sci-misc/salome-component-5.1.4*[debug?,mpi?] + =sci-misc/salome-yacs-5.1.4*[debug?] + =sci-misc/salome-pycalculator-5.1.4*[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 -uNr portage.orig/sci-misc/salome-pycalculator/ChangeLog portage/sci-misc/salome-pycalculator/ChangeLog --- portage.orig/sci-misc/salome-pycalculator/ChangeLog 2010-08-12 21:46:00.947822822 +0200 +++ portage/sci-misc/salome-pycalculator/ChangeLog 2010-08-17 17:15:39.062521507 +0200 @@ -1,5 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + +*salome-pycalculator-5.1.4 (17 Aug 2010) + +17 Aug 2010; Michael Riss + +salome-pycalculator-5.1.4.ebuild: + Version bump to 5.1.4 + 21 May 2008; Daniel Tourde Initial import. +salome-pycalculator-3.2.6.ebuild, +salome-pycalculator-3.2.6.patch diff -uNr portage.orig/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild portage/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild --- portage.orig/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild 2010-08-14 02:25:51.538551479 +0200 @@ -0,0 +1,83 @@ +# 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 eutils python + +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/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +PYCALCULATOR_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 +} + +src_prepare() { + rm -r -f autom4te.cache + ./build_configure +} + +src_configure() { + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \ + $(use_enable debug ) \ + $(use_enable !debug production ) \ + || die "econf failed" +} + +src_install() { + 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$(python_get_version)/site-packages/salome" >> ./90${P} + doenvd 90${P} + rm adm_local/Makefile adm_local/unix/config_files/Makefile \ + adm_local/unix/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 -uNr portage.orig/sci-misc/salome-smesh/ChangeLog portage/sci-misc/salome-smesh/ChangeLog --- portage.orig/sci-misc/salome-smesh/ChangeLog 2010-08-12 21:46:00.948551261 +0200 +++ portage/sci-misc/salome-smesh/ChangeLog 2010-08-17 17:17:37.590521774 +0200 @@ -1,6 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-smesh-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-smesh-5.1.4.ebuild: + Version bump to 5.1.4. Added support for vtk 5.6. Disabled as-needed flag. + 29 Jun 2010; Justin Lecher salome-smesh-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild portage/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild --- portage.orig/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild 2010-08-15 18:54:40.887500448 +0200 @@ -0,0 +1,110 @@ +# 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 eutils flag-o-matic python + +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/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/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + 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" + has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6" + + use amd64 && append-flags -DHAVE_F77INT64 + + # 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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_install() { + 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$(python_get_version)/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 -uNr portage.orig/sci-misc/salome-visu/ChangeLog portage/sci-misc/salome-visu/ChangeLog --- portage.orig/sci-misc/salome-visu/ChangeLog 2010-08-12 21:46:00.948551261 +0200 +++ portage/sci-misc/salome-visu/ChangeLog 2010-08-17 17:25:26.349521673 +0200 @@ -1,6 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-visu-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-visu-5.1.4.ebuild: + Version bump to 5.1.4. Added support for vtk 5.6. Disabled as-needed flag. + 29 Jun 2010; Justin Lecher salome-visu-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-visu/salome-visu-5.1.4.ebuild portage/sci-misc/salome-visu/salome-visu-5.1.4.ebuild --- portage.orig/sci-misc/salome-visu/salome-visu-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-visu/salome-visu-5.1.4.ebuild 2010-08-17 17:21:07.263749770 +0200 @@ -0,0 +1,105 @@ +# 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 eutils flag-o-matic python + +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/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" +VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 + append-ldflags $(no-as-needed) +} + +src_prepare() { + 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" + has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6" + + use amd64 && append-flags -DHAVE_F77INT64 + + 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$(python_get_version)/site-packages/salome \ + --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/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_install() { + 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$(python_get_version)/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 -uNr portage.orig/sci-misc/salome-yacs/ChangeLog portage/sci-misc/salome-yacs/ChangeLog --- portage.orig/sci-misc/salome-yacs/ChangeLog 2010-08-12 21:46:00.958551427 +0200 +++ portage/sci-misc/salome-yacs/ChangeLog 2010-08-17 17:27:04.401804778 +0200 @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*salome-yacs-5.1.4 (17 Aug 2010) + + 17 Aug 2010; Michael Riss + +salome-yacs-5.1.4.ebuild: + Version bump to 5.1.4 + 29 Jun 2010; Justin Lecher salome-yacs-5.1.3.ebuild: Python ABI fixes diff -uNr portage.orig/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch portage/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch --- portage.orig/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch 2010-08-15 20:34:39.407500866 +0200 @@ -0,0 +1,12 @@ +diff -ur src5.1.4.orig/YACS_SRC_5.1.4/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.4.orig/YACS_SRC_5.1.4/adm/unix/config_files/ac_python_devel.m4 2010-03-08 20:51:25.810829226 +0100 ++++ src5.1.4/YACS_SRC_5.1.4/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 -uNr portage.orig/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild portage/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild --- portage.orig/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ portage/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild 2010-08-14 02:24:46.799552200 +0200 @@ -0,0 +1,103 @@ +# 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 eutils python + +DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical +Simulation. YACS component" +HOMEPAGE="http://www.salome-platform.org" +SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/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" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" + +pkg_setup() { + [[ $(python_get_version) > 2.4 ]] && \ + ewarn "Python 2.4 is highly recommended for Salome..." + python_set_active_version 2 +} + +src_prepare() { + 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() { + 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_install() { + 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$(python_get_version)/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 "" +}