sci-misc/salome-*: changed fetch URL + cleaning (thanks Oliver), new

patch + modifs to (partially) solve med_int issues on amd64

3 files changed, 15 insertions, 25 deletions

diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog
index 438b3093a..dc621a6f0 100644
--- a/sci-misc/salome-kernel/ChangeLog
+++ b/sci-misc/salome-kernel/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+  salome-kernel-5.1.3.ebuild:
+  changed fetch URL + cleaning
+
 *salome-kernel-5.1.3 (14 Mar 2010)
 
   14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest
index 6cdb60518..63048649e 100644
--- a/sci-misc/salome-kernel/Manifest
+++ b/sci-misc/salome-kernel/Manifest
@@ -3,6 +3,6 @@ AUX salome-kernel-5.1.3-openmpi.patch 771 RMD160 28c2b4f26c450e23117726cabe29983
 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 src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
-EBUILD salome-kernel-5.1.3.ebuild 3703 RMD160 b65f1dddfd82eec068c802ac3631b450a29216d3 SHA1 53f61fbae67e5e572d994e54b5bb4f2a7f350d02 SHA256 2fb99e076695a0d0290d07163ea142957b7c9d01ee9879ef1b39bc64f37d45a2
-MISC ChangeLog 3071 RMD160 977ae29db2f569014bdb10e9c4358d687d33a46f SHA1 22b630f893a46964242feeb7f2fc3bb698cc8e06 SHA256 e390b8f51593c20b61cad13cfddba2f69e6a548ac4c03841697b8faa13f6e38b
+EBUILD salome-kernel-5.1.3.ebuild 3613 RMD160 e17166a443e5717f36422bfda76cd4cc397828bb SHA1 456b5eface06acef76ef6422a759c8d2a3bbe068 SHA256 91fdc952cd83017ddd38ff770be2b5633967fefb561d00091de1cc9d4377f779
+MISC ChangeLog 3194 RMD160 7674daf45b82796c9d30a66cef5b435823616ed3 SHA1 5c1cddbc060bd25b2464d684f819ca274f33a3de SHA256 024d0d2e41a3ba83936510b7a2445a3fcda7a0c82fd508fa3ecc97afcca99ed3
 MISC metadata.xml 247 RMD160 e1c681233bddd30ebb6140396aa6b8531cad2654 SHA1 aaf4d3d22ca073fc6b2858d3775ef9458f98c283 SHA256 0da057781b1ed4721163e092cab86b9ee862a15d6bc20c8c6877000daca4c394
diff --git a/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild b/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild
index b470c9a8a..184eec9a9 100644
--- a/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild
+++ b/sci-misc/salome-kernel/salome-kernel-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. KERNEL 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"
@@ -34,14 +34,12 @@ DEPEND="${RDEPEND}
 		>=dev-python/docutils-0.4"
 
 MODULE_NAME="KERNEL"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+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"
 
 pkg_setup() {
-	PYVER=$(python_get_version)
-	[[ ${PYVER} > 2.4 ]] && \
+	[[ $(python_get_version) > 2.4 ]] && \
 		ewarn "Python 2.4 is highly recommended for Salome..."
 
 	#Warn about mpi use flag for hdf5
@@ -50,12 +48,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cd "${MY_S}"
-
 	use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch
-	[[ ${PYVER} == 2.6 ]] && \
+	[[ $(python_get_version) == 2.6 ]] && \
 		epatch "${FILESDIR}"/${P}-python-2.6.patch
-
+	
 	has_version "sys-cluster/openmpi" && \
 		epatch "${FILESDIR}"/${P}-openmpi.patch
 
@@ -64,8 +60,6 @@ src_prepare() {
 }
 
 src_configure() {
-	cd "${MY_S}"
-
 	local myconf=""
 
 #   --without-mpi does not disable mpi support, just omit it to disable
@@ -81,8 +75,8 @@ src_configure() {
 	      --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 \
+	      --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 ) \
@@ -92,15 +86,7 @@ src_configure() {
 	|| 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
@@ -108,7 +94,7 @@ src_install() {
 	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}
+	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