aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-04-05 01:03:18 +0200
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-04-05 01:03:18 +0200
commit4423c859702d6ae0ccb3140e3027979ba0430829 (patch)
treec23d071e80d3f0bf3c59ae217230d7c3b4ccb30e /sci-misc/salome-geom
parentChanged DEPEND of media-libs/SoQt from 1.4.2_alpha4181 to 1.4.2_alpha1841 (diff)
downloadsci-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-geom')
-rw-r--r--sci-misc/salome-geom/ChangeLog4
-rw-r--r--sci-misc/salome-geom/Manifest4
-rw-r--r--sci-misc/salome-geom/salome-geom-5.1.3.ebuild25
3 files changed, 14 insertions, 19 deletions
diff --git a/sci-misc/salome-geom/ChangeLog b/sci-misc/salome-geom/ChangeLog
index 4f6fb95ad..03cbc8c24 100644
--- a/sci-misc/salome-geom/ChangeLog
+++ b/sci-misc/salome-geom/ChangeLog
@@ -1,6 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ salome-geom-5.1.3.ebuild:
+ changed fetch URL + cleaning
+
*salome-geom-5.1.3 (14 Mar 2010)
14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
diff --git a/sci-misc/salome-geom/Manifest b/sci-misc/salome-geom/Manifest
index 6770cd6ca..5b94059de 100644
--- a/sci-misc/salome-geom/Manifest
+++ b/sci-misc/salome-geom/Manifest
@@ -1,5 +1,5 @@
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 3118 RMD160 4c2e13dbe39141b655250c2008c876e1a060a673 SHA1 4814b3e4d0ad1a03259b4aeb1a1e9857c5489b82 SHA256 60708a4645d4ad1fa315900ab1f3eaeafbb7b6d8d2f7066d65520f9b5bfa2176
-MISC ChangeLog 1121 RMD160 a8e3fe3c32a0d92c9e054182161e0f4c70888999 SHA1 749190f4c3ddc1dde5fe01453e5a4dc38e1fe150 SHA256 3d7fb0d29e64d239f92ba0a0793650b341778bd94ab0a909fcf64dcf984fa87b
+EBUILD salome-geom-5.1.3.ebuild 3139 RMD160 b0c4828c9a1fdab87aa344ad7893d57369e58565 SHA1 ce5eb85ca973e2e7157fc6874211bb33ab137335 SHA256 0757ed4c7a39fad17a0eeed19a932f3688c9d584a81bf71dcf5ccfc19bef9fc1
+MISC ChangeLog 1242 RMD160 3215be5dcdac4ad4219287009787a20c1f8ee435 SHA1 39a6a0a9712118807a3edaed75124adbfaf05558 SHA256 a6f36cf528bc86c9a95128508676ae58b744621b9eb3a7080c60b19e0cfba764
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
index df99611ab..5640cb421 100644
--- a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
+++ b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
@@ -5,11 +5,11 @@
EAPI=2
PYTHON_DEPEND="2:2.4"
-inherit distutils eutils
+inherit eutils python
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"
+SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
@@ -39,21 +39,18 @@ DEPEND="${RDEPEND}
dev-lang/swig"
MODULE_NAME="GEOM"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+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() {
- PYVER=$(python_get_version)
- [[ ${PYVER} > 2.4 ]] && \
+ [[ $(python_get_version) > 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
@@ -66,15 +63,13 @@ src_configure() {
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-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,14 +81,10 @@ src_configure() {
}
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
@@ -101,9 +92,9 @@ 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
+ rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile
insinto "${INSTALL_DIR}"
doins -r adm_local