aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-misc/salome-pycalculator')
-rw-r--r--sci-misc/salome-pycalculator/ChangeLog4
-rw-r--r--sci-misc/salome-pycalculator/Manifest4
-rw-r--r--sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild31
3 files changed, 15 insertions, 24 deletions
diff --git a/sci-misc/salome-pycalculator/ChangeLog b/sci-misc/salome-pycalculator/ChangeLog
index 405799559..f6dce0d57 100644
--- a/sci-misc/salome-pycalculator/ChangeLog
+++ b/sci-misc/salome-pycalculator/ChangeLog
@@ -6,6 +6,10 @@
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
+ 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ salome-pycalculator-5.1.3.ebuild:
+ changed fetch URL + cleaning
+
*salome-pycalculator-5.1.3 (14 Mar 2010)
14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
diff --git a/sci-misc/salome-pycalculator/Manifest b/sci-misc/salome-pycalculator/Manifest
index 0442518b7..989250356 100644
--- a/sci-misc/salome-pycalculator/Manifest
+++ b/sci-misc/salome-pycalculator/Manifest
@@ -1,4 +1,4 @@
DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
-EBUILD salome-pycalculator-5.1.3.ebuild 2459 RMD160 8751343615b1d3aa20e1a442c437bfbe8a712974 SHA1 27509cabd6a1268c5dbbb75da4a3207b9d485296 SHA256 fca17384cdea20d97bd7278e2adc256ffde899048436c04ec321e6ecd9c995a1
-MISC ChangeLog 1169 RMD160 9a394bc004f22dd4d31a01f8be33b3041cb7284c SHA1 d4eae863981bcb1691d6c00b2866d3293e145ef1 SHA256 6369d3284068312de225a4a718aa7e82d8374f78c3b397edb19f8683e94342ee
+EBUILD salome-pycalculator-5.1.3.ebuild 2420 RMD160 beb87e35f64b2ebced04f9d59b8873ee3bb42dbe SHA1 d5453854c61dd0294f14be26be3e1c5263f6b0c2 SHA256 82fa4a7d7358522eb1a517ef24f6818a93a17694edab24903504ecb832db6f4e
+MISC ChangeLog 1298 RMD160 d7107a5ae7335fa3d2803febb556f8620c4bb6d4 SHA1 a03aae1f4299aa084602ebc7310bd10f243ce562 SHA256 bbcf82ea9abeccc680d4503e11769de34e053aadb2c394c3ca31f82c7ce15fdb
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild
index c572cfeb6..f0064ddd7 100644
--- a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild
+++ b/sci-misc/salome-pycalculator/salome-pycalculator-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. PYCALCULATOR 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"
@@ -30,48 +30,34 @@ DEPEND="${RDEPEND}
>=dev-python/docutils-0.4"
MODULE_NAME="PYCALCULATOR"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+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"
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}"
-
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 \
$(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
@@ -79,9 +65,10 @@ src_install() {
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}
+ 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/config_files/Makefile \
+ adm_local/unix/Makefile
insinto "${INSTALL_DIR}"
doins -r adm_local