diff options
| author |   Etienne Lorriaux <etienne.lorriaux@gmail.com> | 2010-04-05 01:03:18 +0200 |
|---|---|---|
| committer | Etienne Lorriaux <etienne.lorriaux@gmail.com> | 2010-04-05 01:03:18 +0200 |
| commit | 4423c859702d6ae0ccb3140e3027979ba0430829 (patch) | |
| tree | c23d071e80d3f0bf3c59ae217230d7c3b4ccb30e /sci-misc/salome-smesh | |
| parent | Changed DEPEND of media-libs/SoQt from 1.4.2_alpha4181 to 1.4.2_alpha1841 (diff) | |
| download | sci-4423c859702d6ae0ccb3140e3027979ba0430829.tar.gz sci-4423c859702d6ae0ccb3140e3027979ba0430829.tar.bz2 sci-4423c859702d6ae0ccb3140e3027979ba0430829.zip | |
sci-misc/salome-*: changed fetch URL + cleaning (thanks Oliver), new
patch + modifs to (partially) solve med_int issues on amd64
Diffstat (limited to 'sci-misc/salome-smesh')
| -rw-r--r-- | sci-misc/salome-smesh/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-misc/salome-smesh/Manifest | 4 | ||||
| -rw-r--r-- | sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild | 29 |
3 files changed, 16 insertions, 22 deletions
diff --git a/sci-misc/salome-smesh/ChangeLog b/sci-misc/salome-smesh/ChangeLog index 5ca1e9844..62d0fe439 100644 --- a/sci-misc/salome-smesh/ChangeLog +++ b/sci-misc/salome-smesh/ChangeLog @@ -1,6 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + salome-smesh-5.1.3.ebuild: + changed fetch URL + cleaning + solved typedef long med_int issues + *salome-smesh-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-smesh/Manifest b/sci-misc/salome-smesh/Manifest index 57769a7ef..9fc258607 100644 --- a/sci-misc/salome-smesh/Manifest +++ b/sci-misc/salome-smesh/Manifest @@ -1,4 +1,4 @@ DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-smesh-5.1.3.ebuild 3140 RMD160 3cf2d185a17a246921ba32dc96a6f63af71dcd90 SHA1 92c65cd406ba34dc7908b138eab6904c7fad9783 SHA256 9b6131bb333383133b19cccef25caa4b4812a039eecd7b7b3077c045fb09c3ca -MISC ChangeLog 1809 RMD160 71a8f42402f3696440dd8893d09bc6e2db1adcf7 SHA1 99545b54f700ec192ceaaa1c1b2ec0e3a50810f5 SHA256 f48e6c1f57f39caee9c41f36f0b67731e530b35ca03a314de19bc69e260d336c +EBUILD salome-smesh-5.1.3.ebuild 3115 RMD160 e40c5f057a34816917750b08a8bf46a4b02327a2 SHA1 32981e2390f8aaa6f560433a45d5c30f543715ca SHA256 a73b3028c280a2cc16eea988c00429162a840215e64eb8759e51e4fb2c7ad085 +MISC ChangeLog 1968 RMD160 6004c7d79e8ee5730111b252b5cbdd1e06fee15d SHA1 2b5ed4c924d3f32fe4c0f742cc64159ca8caae74 SHA256 57d7fefa7f01a00de3ca491da7da50aeeb3c5f7203e88aadd382db2692d326ab MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild index f88a1aad3..126d32cb2 100644 --- a/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild +++ b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild @@ -5,11 +5,11 @@ EAPI=2 PYTHON_DEPEND="2:2.4" -inherit distutils eutils +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://www.stasyan.com/devel/distfiles/src${PV}.tar.gz" +SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" @@ -42,40 +42,37 @@ DEPEND="${RDEPEND} >=dev-python/docutils-0.4" MODULE_NAME="SMESH" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +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() { - PYVER=$(python_get_version) - [[ ${PYVER} > 2.4 ]] && \ + [[ $(python_get_version) > 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" + 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${PYVER}/site-packages/salome \ - --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/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' \ @@ -86,15 +83,7 @@ src_configure() { || 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 @@ -102,7 +91,7 @@ src_install() { 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} + 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}" |