diff options
28 files changed, 433 insertions, 198 deletions
diff --git a/sci-misc/salome-component/ChangeLog b/sci-misc/salome-component/ChangeLog index 8909ce515..e105d6c40 100644 --- a/sci-misc/salome-component/ChangeLog +++ b/sci-misc/salome-component/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-component-5.1.3.ebuild: + changed fetch URL + cleaning + *salome-component-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-component/Manifest b/sci-misc/salome-component/Manifest index 3ec0181e3..503b5e9fb 100644 --- a/sci-misc/salome-component/Manifest +++ b/sci-misc/salome-component/Manifest @@ -1,5 +1,5 @@ AUX salome-component-5.1.3-mpi.patch 718 RMD160 4cfed4cf318686774a49fb037c31dc1ff24be94c SHA1 bd2d3ce92ccb57a81033f8639e8624874b529614 SHA256 9b9b85eaf19409927055fa31899aedd765ea1da05bfe5e8d58a8c8fde792345a DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-component-5.1.3.ebuild 3095 RMD160 aaa92c9311e01f4ea8038edbc1aa686bc3b7b002 SHA1 80741d116eb4094b7d688c03d7460bc3099c25d3 SHA256 56c29db520a2c715e65da33a78e1a4fdcb6c2a42a5b85a275e498bf28b410df2 -MISC ChangeLog 1452 RMD160 6da8265d00db25d2de4ecfe365258ed55a912af4 SHA1 9352db644331b5dd2b8b47710249470180939150 SHA256 0f2a83dc38202d28cd6135647090dfe2c9a7c27c353fc01bd9c112778488072f +EBUILD salome-component-5.1.3.ebuild 2991 RMD160 ca1756c309312d4dbca0b1f7a15c731032b151d3 SHA1 a5c6313d4e97bc2749d377ae1028bede7354f483 SHA256 16f22b182a4b7a9ab12162c3f7f1d92bf5ec609c589d07ffeb547454999bae8c +MISC ChangeLog 1578 RMD160 f8f1d7199da6997c379b2bcaa32b8c9c31b7f932 SHA1 9a7ffbf5f1727510110e12ec7f834173030075ab SHA256 e331022430b2b449271d6662ebb654318c9df4aa91441883113a57abca747a5d MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-misc/salome-component/salome-component-5.1.3.ebuild b/sci-misc/salome-component/salome-component-5.1.3.ebuild index 53f0f83fe..a9f3d4ae2 100644 --- a/sci-misc/salome-component/salome-component-5.1.3.ebuild +++ b/sci-misc/salome-component/salome-component-5.1.3.ebuild @@ -5,11 +5,11 @@ EAPI=2 PYTHON_DEPEND="2:2.4" -inherit distutils eutils flag-o-matic +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://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" @@ -38,20 +38,16 @@ DEPEND="${RDEPEND} dev-libs/libxml2" MODULE_NAME="COMPONENT" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" COMPONENT_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 } @@ -59,8 +55,6 @@ src_prepare() { src_configure() { local myconf="" - cd "${MY_S}" - # --without-mpi does not disable mpi support, just omit it to disable if use mpi; then append-ldflags -lmpi -lmpi_cxx @@ -77,23 +71,15 @@ src_configure() { --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 \ ${myconf} \ $(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" @@ -102,7 +88,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}" 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 diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog index a36b6e7f2..15c52160c 100644 --- a/sci-misc/salome-gui/ChangeLog +++ b/sci-misc/salome-gui/ChangeLog @@ -1,6 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + salome-gui-5.1.3.ebuild: + changed fetch URL + cleaning + added sci-libs/vtk[mpi] dependency to solve: + http://bugs.gentoo.org/show_bug.cgi?id=155974#c528 + *salome-gui-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest index 4883ed14c..03ada9f3d 100644 --- a/sci-misc/salome-gui/Manifest +++ b/sci-misc/salome-gui/Manifest @@ -1,5 +1,5 @@ AUX salome-gui-5.1.3-qt4-path.patch 466 RMD160 eccedc638d748a4cfa0e394ebe04cc748bacbc5e SHA1 539a3105d97c38a4d30fd8e8620af63fe4278568 SHA256 051e0e2c75328e4a9b301d33ba77944befbc2603c656c096a05db8cb64f70fc0 DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-gui-5.1.3.ebuild 3194 RMD160 d77df7c4b4f6020eafb1a4e5e63abbebdd3e717c SHA1 bbe4e5b47447184bb4276f237ec5b3daf7b28491 SHA256 23162f9247f27f5eab9ee966c2692254e3da26a601f84246d7380652e9416d33 -MISC ChangeLog 2073 RMD160 a54c5af7f69746202dacd9f76aa5f1751b37593b SHA1 b9e6151d569ab4fd580e499d59ef015446bdb368 SHA256 75f51c8cfc00245e7c1028ab8718e1036b967a3f3a848648c96a690d7ddbfd16 +EBUILD salome-gui-5.1.3.ebuild 3263 RMD160 4df905f16b5f63bffe7eaa906533a5a9e534b98c SHA1 010135e5e4eb6c31ebbf3bc13c3605be3d224170 SHA256 7bd6ec60e1b54f41cc12928b2a6aa7d0885d7c0290ec26d067e08ad9d8bf54e3 +MISC ChangeLog 2293 RMD160 33bed41efaae598545b63342f20953e4ea5e551c SHA1 76f14a5a5af1f14f5938c949cc63a797510cb4ac SHA256 b18f491f28bd5fb4f6c1778459902451aff96ba0b123c1890b7286acf3217b7c MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-gui/salome-gui-5.1.3.ebuild b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild index 01195511b..21cb5c90c 100644 --- a/sci-misc/salome-gui/salome-gui-5.1.3.ebuild +++ b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild @@ -5,11 +5,11 @@ EAPI=2 PYTHON_DEPEND="2:2.4" -inherit distutils eutils flag-o-matic +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://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" @@ -28,7 +28,7 @@ RDEPEND="opengl? ( virtual/opengl ) >=x11-libs/qt-opengl-4.5.2 >=x11-libs/qwt-5.2 >=dev-python/PyQt4-4.5.4 - >=sci-libs/vtk-5.0[python] + >=sci-libs/vtk-5.0[python,mpi] >=sci-libs/opencascade-6.3 app-text/dgs" @@ -40,19 +40,16 @@ DEPEND="${RDEPEND} dev-libs/libxml2" MODULE_NAME="GUI" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +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() { - 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}" - epatch "${FILESDIR}"/${P}-qt4-path.patch rm -r -f autom4te.cache @@ -61,8 +58,6 @@ src_prepare() { } src_configure() { - cd "${MY_S}" - local vtk_suffix="" has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0" @@ -74,8 +69,8 @@ src_configure() { --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-qt=/usr \ --with-qwt=/usr \ --with-qwt_inc=/usr/include/qwt5 \ @@ -90,14 +85,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 @@ -105,9 +96,11 @@ 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 \ + adm_local/unix/config_files/Makefile + insinto "${INSTALL_DIR}" doins -r adm_local use doc && dodoc AUTHORS INSTALL NEWS README 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 diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog index 9ecb0e368..71d051ee4 100644 --- a/sci-misc/salome-med/ChangeLog +++ b/sci-misc/salome-med/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> + salome-med-5.1.3.ebuild, +files/salome-med-5.1.3-med_int.patch: + changed fetch URL + cleaning + new patch to (partially) solve typedef long med_int issues on amd64: + http://bugs.gentoo.org/show_bug.cgi?id=155974#c525 + *salome-med-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest index 3d813c198..28c08d003 100644 --- a/sci-misc/salome-med/Manifest +++ b/sci-misc/salome-med/Manifest @@ -1,10 +1,11 @@ AUX salome-med-5.1.3-check_metis.patch 1573 RMD160 fdcc8a1fcba4d16f4c3a8e8636820c49876476b7 SHA1 28b0021cabc939a7f45df84e36953ea4cf1622f5 SHA256 471f36d3ecb15c5ebf6e4664237958c6f6b01f84d9fb4a184c5d5cf988721aac AUX salome-med-5.1.3-check_scotch.patch 2538 RMD160 b501d483cdf6accd0f562676179d1be9ecfa038a SHA1 0ad2ef4901f02396c812b26e6e0264c3ae3321d4 SHA256 6802967adc584ba37317c85a8a100cef4734ce12515732b271e9057d788d14ff AUX salome-med-5.1.3-gcc.patch 1641 RMD160 09962970219edb007984413cd1a010044ec19cef SHA1 233f51828285c4b9fe0dc5a473fa76f7dc8fb2aa SHA256 a6c70ba8dc12f6c2a11565c9551801dc8d3eee63435f2c6977bd2e4d5e545241 +AUX salome-med-5.1.3-med_int.patch 15420 RMD160 46314924e3f8fbf1347f736f47a927272e8030a2 SHA1 efea52020f1dd0aff7a653cca5576098dfbbf6c3 SHA256 b9c0be4f14b2edc9da6eb389133b4059516c18e1292c51cc74f23fdee1ad5ed7 AUX salome-med-5.1.3-mpi.patch 780 RMD160 cc39b630de3f2576fea941b01aa1543b25547dee SHA1 c6afde49f3315e41ad034083290d449a57d3b82b SHA256 8ffd65e56b57ffa3351cc5451562ded665bd3ccba2ccd53865868b763c2bc616 AUX salome-med-5.1.3-qt4-path.patch 466 RMD160 1be9c383e3db380bc1d9a91792d89fa65071685f SHA1 4c4bcde03173ee5f911a925bd7190215761bdab3 SHA256 94b4730b80bfd6abd71d203309467cb4a0fc027d8dbc634633b1f0f4f8e3a08d AUX salome-med-5.1.3-scotch.patch 411 RMD160 9ecd63a9cd71e6f6a4767c30baa135b6f3e3dadc SHA1 44eb2455570716883643b9c08160924a40c9ef0c SHA256 717c995a718f52ef889c4f204457d22614d85696bb0cca3df96756906791464a DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-med-5.1.3.ebuild 3815 RMD160 1272bd050ab2932490254da297985d43b3ca4639 SHA1 0e8d2f988c7968433f82d32f283fd964c4d7af78 SHA256 e13283e5bb57b35132dc3a4bfa0777fa399637a8812bb2393a182d5d2b78dedd -MISC ChangeLog 2269 RMD160 fe98e6f0fdc379ac4af6798c41056bc1d830c7e5 SHA1 7305757b576069db861de45161fa8b80665de527 SHA256 5d6ce488d4ef2c00402baa06e75a735ebdc14ffc105daff85fe046894d29db75 +EBUILD salome-med-5.1.3.ebuild 3795 RMD160 54afae121ae34cf67a4f47b5262b3c027e9c85c9 SHA1 596b6d52c37994c6e5eeb62b2768203fe54dbd86 SHA256 df04ea7eb86b17b1b764831d7296fa2c867528f8291bf06291bdd9998c5e770b +MISC ChangeLog 2552 RMD160 641f3a605c078cdb7d8fc8e8d8a20eae6da39805 SHA1 32da15ffc46160df7a3af5eb704a895fb3dc3e7f SHA256 135108d579d34928f6f0398750add93a106a3c8046becfaf99b356cd3b385681 MISC metadata.xml 274 RMD160 81f0dbbb32fd2de80832c9872616b0a48b2d4c04 SHA1 72f2c4ce931ef27e7f913218049757f318f0415d SHA256 49d1680ffc0598f56db8198488dc66263eef05571d59bb3875e0a8858f54f5e4 diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch new file mode 100644 index 000000000..6db1510a4 --- /dev/null +++ b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch @@ -0,0 +1,297 @@ +diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx +--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:07:56.860301255 +0100 ++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:33:59.740251721 +0100 +@@ -189,7 +189,7 @@ + + int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, + joint_description, +- &distant, name_distant); ++ (med_int*)&distant, name_distant); + + for (int ic=0; ic<ncorr; ic++) + { +@@ -209,7 +209,7 @@ + { + + med_2_3::MEDjointLire(fid, meshname, name, +- node_corresp,ncouples, ++ (med_int*)node_corresp,ncouples, + cor_typent_local, cor_typgeo_local, + cor_typent_dist, cor_typgeo_dist + ); +@@ -247,7 +247,7 @@ + if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; + int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); + if (ntype==0) continue; +- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, ++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, + med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); + offset+=ntype; + } +@@ -259,7 +259,7 @@ + int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes(); + { + int* array=new int[nnode]; +- med_2_3::MEDglobalNumLire(fid,meshname, array, nnode, ++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode, + med_2_3::MED_NOEUD, med_2_3::MED_POINT1); + nodeglobal[idomain]=array; + } +@@ -280,7 +280,7 @@ + + int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type); + if (ntype==0) continue; +- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, ++ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, + med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); + offset+=ntype; + } +@@ -348,7 +348,7 @@ + jointSort(node_corresp, nbnodes, false); + + error= +- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes, ++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes, + med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1); + if (error==-1) cout << "erreur creation de joint "<<endl; + +@@ -388,7 +388,7 @@ + if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; + int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); + if (ntype==0) continue; +- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, ++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, + med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); + offset+=ntype; + +@@ -426,7 +426,7 @@ + + int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type); + if (ntype==0) continue; +- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, ++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, + med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); + + offset+=ntype; +@@ -443,7 +443,7 @@ + + m_collection->getTopology()->getNodeList(idomain,array); + +- med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode, ++ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode, + med_2_3::MED_NOEUD, med_2_3::MED_POINT1); + + delete[] array; +@@ -507,7 +507,7 @@ + corresp.push_back(value[icol]); + } + int size_joint = corresp.size()/2; +- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], ++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], + size_joint, med_2_3::MED_MAILLE, + (med_2_3::med_geometrie_element)local_type ,med_2_3::MED_MAILLE, + (med_2_3::med_geometrie_element)distant_type ); +@@ -541,7 +541,7 @@ + med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second; + int size_joint=size/2; + //med_2_3::med_err error = +- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE, ++ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE, + local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem); + delete[] corresp; + } +diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx +--- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:07:56.624073897 +0100 ++++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:42:31.140322486 +0100 +@@ -34,6 +34,7 @@ + + #include <vector> + #include <set> ++#include <med.h> + + //***************************************************************************** + // Some useful macros +@@ -46,7 +47,7 @@ + * Pair of index. + * See definition of GaussIndexList. + */ +-typedef std::pair < std::set<int>*, std::set<int> > IndexPair; ++typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair; + + /** + * List of gauss index for optimized domain split. +diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx +--- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:07:55.512824126 +0100 ++++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:23:57.950316309 +0100 +@@ -169,11 +169,11 @@ + { + int ngro=MEDnGroupe(fid,(char *)meshName,i+1); + med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); +- med_int *attide=new int[natt]; +- med_int *attval=new int[natt]; ++ med_int *attide=new med_int[natt]; ++ med_int *attval=new med_int[natt]; + char *attdes=new char[MED_TAILLE_DESC*natt+1]; + char *gro=new char[MED_TAILLE_LNOM*ngro+1]; +- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); ++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); + std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); + ret[i]=cur; + delete [] attdes; +@@ -196,11 +196,11 @@ + { + int ngro=MEDnGroupe(fid,(char *)meshName,i+1); + med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); +- med_int *attide=new int[natt]; +- med_int *attval=new int[natt]; ++ med_int *attide=new med_int[natt]; ++ med_int *attval=new med_int[natt]; + char *attdes=new char[MED_TAILLE_DESC*natt+1]; + char *gro=new char[MED_TAILLE_LNOM*ngro+1]; +- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); ++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); + for(int j=0;j<ngro;j++) + { + std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM); +@@ -446,11 +446,11 @@ + { + int ngro=MEDnGroupe(fid,(char *)meshName,i+1); + med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); +- med_int *attide=new int[natt]; +- med_int *attval=new int[natt]; ++ med_int *attide=new med_int[natt]; ++ med_int *attval=new med_int[natt]; + char *attdes=new char[MED_TAILLE_DESC*natt+1]; + char *gro=new char[MED_TAILLE_LNOM*ngro+1]; +- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); ++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); + std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); + if(std::find(fams.begin(),fams.end(),cur)!=fams.end()) + ret.push_back(numfam); +@@ -474,11 +474,11 @@ + { + int ngro=MEDnGroupe(fid,(char *)meshName,i+1); + med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); +- med_int *attide=new int[natt]; +- med_int *attval=new int[natt]; ++ med_int *attide=new med_int[natt]; ++ med_int *attval=new med_int[natt]; + char *attdes=new char[MED_TAILLE_DESC*natt+1]; + char *gro=new char[MED_TAILLE_LNOM*ngro+1]; +- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); ++ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); + std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); + for(int j=0;j<ngro;j++) + { +@@ -566,12 +566,12 @@ + MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1); + int *tmp=new int[curNbOfElem]; + char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1]; +- MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD); ++ MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD); + delete [] tmp; + delete [] noms; + //trying to read global numbering + int *globArr=new int[curNbOfElem]; +- if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0) ++ if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0) + elem.setGlobal(globArr); + else + delete [] globArr; +@@ -590,9 +590,9 @@ + int *index=new int[curNbOfPolyElem+1]; + int *locConn=new int[arraySize]; + int *fam=new int[curNbOfPolyElem]; +- MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize); +- MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD); +- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); ++ MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize); ++ MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD); ++ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); + conn.push_back(elem); + } + curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD); +@@ -604,8 +604,8 @@ + int *indexFace=new int[indexFaceLgth]; + int *locConn=new int[connFaceLgth]; + int *fam=new int[curNbOfPolyElem]; +- MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD); +- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); ++ MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD); ++ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); + int arraySize=connFaceLgth; + for(int i=0;i<curNbOfPolyElem;i++) + arraySize+=index[i+1]-index[i]-1; +@@ -1051,11 +1051,11 @@ + std::vector<int> medConnIndex2; + int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2); + if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE) +- MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); ++ MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); + else + { + if(curMedType==MED_POLYGONE) +- MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD); ++ MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD); + } + } + } +--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:24:36.370545867 +0100 ++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:30:11.329293723 +0100 +@@ -300,8 +300,8 @@ + char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; + char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; + int dom1, dom2; +- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); +- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); ++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1); ++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2); + CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0); + CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0); + CPPUNIT_ASSERT_EQUAL(dom1,1); +@@ -467,8 +467,8 @@ + char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; + char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; + int dom1, dom2; +- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); +- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); ++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); ++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); + CPPUNIT_ASSERT_EQUAL(dom1,1); + CPPUNIT_ASSERT_EQUAL(dom2,0); + +@@ -548,7 +548,7 @@ + //testing cells global numbering + num = new med_2_3::med_int[2]; + MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc); +- med_2_3::med_int* globcellref = new int[2]; ++ med_2_3::med_int* globcellref = new med_int[2]; + globcellref[0]=1; + globcellref[1]=3; + +@@ -773,10 +773,10 @@ + char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; + char desc2[MED_TAILLE_DESC]; + char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; +- //int dom1, dom2; +- med_2_3::med_int dom1, dom2; +- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); +- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); ++ int dom1, dom2; ++// med_2_3::med_int dom1, dom2; ++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); ++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); + CPPUNIT_ASSERT_EQUAL(dom1,1); + CPPUNIT_ASSERT_EQUAL(dom2,0); + +@@ -1143,8 +1143,8 @@ + char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1]; + char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1]; + int dom1, dom2; +- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); +- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); ++ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); ++ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); + CPPUNIT_ASSERT_EQUAL(dom1,1); + CPPUNIT_ASSERT_EQUAL(dom2,0); + diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild index 90adb220d..a09b93238 100644 --- a/sci-misc/salome-med/salome-med-5.1.3.ebuild +++ b/sci-misc/salome-med/salome-med-5.1.3.ebuild @@ -5,11 +5,11 @@ EAPI=2 PYTHON_DEPEND="2:2.4" -inherit distutils eutils flag-o-matic +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://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" @@ -37,20 +37,16 @@ DEPEND="${RDEPEND} dev-libs/libxml2" MODULE_NAME="MED" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" MED_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}" - epatch "${FILESDIR}"/${P}-qt4-path.patch epatch "${FILESDIR}"/${P}-gcc.patch use mpi && epatch "${FILESDIR}"/${P}-mpi.patch @@ -59,6 +55,7 @@ src_prepare() { 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 @@ -66,7 +63,6 @@ src_prepare() { } src_configure() { - cd "${MY_S}" local myconf="" local vtk_suffix="" @@ -83,15 +79,15 @@ src_configure() { fi fi - cd "${MY_S}" + 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${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-qt=/usr \ --with-vtk=${VTKHOME} \ --with-vtk-version=${vtk_suffix} \ @@ -105,15 +101,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 @@ -121,7 +109,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}" 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 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}" diff --git a/sci-misc/salome-visu/ChangeLog b/sci-misc/salome-visu/ChangeLog index 1340a1a62..5985e0e9b 100644 --- a/sci-misc/salome-visu/ChangeLog +++ b/sci-misc/salome-visu/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-visu-5.1.3.ebuild: + changed fetch URL + cleaning + solved typedef long med_int issues + *salome-visu-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-visu/Manifest b/sci-misc/salome-visu/Manifest index 9fc4f5a30..b0a541c77 100644 --- a/sci-misc/salome-visu/Manifest +++ b/sci-misc/salome-visu/Manifest @@ -1,4 +1,4 @@ DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-visu-5.1.3.ebuild 2989 RMD160 75f3f8bac5c58a7fcbe944cbad852ae87492753c SHA1 6efbd34727c40b8d02b92b282092d623b88a806f SHA256 dde82e00d380df92860e2b9a1f5d834e0d39fc792e044e8b64f35a1ede56109f -MISC ChangeLog 1398 RMD160 ddaab42fdeec660a9fbdb2f50dd433e32896c872 SHA1 4a30fe3d7a6e493b2344ba98747a0a1dbb41893c SHA256 17e072efd42f3746bc980b77ce8b423aa4cb4096047a5fc29dacf248bb33c8c2 +EBUILD salome-visu-5.1.3.ebuild 2964 RMD160 995e6c78d2f6adfbd02aa3f75098d018bec78919 SHA1 1c3e0cc663ede60d3fd7e76cf2b5829468c221d2 SHA256 7016c0e2298884b1d78580a0336b9f438315fa67174e95ca0804f3694800cd3d +MISC ChangeLog 1556 RMD160 7357da1b8f5217fcd08fd4ec5edb572325e62324 SHA1 682acec49d5e6ad65993d74874d962410ad3e721 SHA256 c22d9f334dde86d39dce102e998b3203f8023a99f78f083636004a32de62acda MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild index 392819fcb..f2193d98a 100644 --- a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild +++ b/sci-misc/salome-visu/salome-visu-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. VISU 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" @@ -38,19 +38,16 @@ DEPEND="${RDEPEND} >=dev-python/docutils-0.4" MODULE_NAME="VISU" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +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() { - 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 } @@ -62,15 +59,15 @@ 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}" + 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${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" \ @@ -81,15 +78,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 @@ -97,7 +86,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}" diff --git a/sci-misc/salome-yacs/ChangeLog b/sci-misc/salome-yacs/ChangeLog index d1470415b..9da5d85c4 100644 --- a/sci-misc/salome-yacs/ChangeLog +++ b/sci-misc/salome-yacs/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-yacs-5.1.3.ebuild: + changed fetch URL + cleaning + *salome-yacs-5.1.3 (14 Mar 2010) 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> diff --git a/sci-misc/salome-yacs/Manifest b/sci-misc/salome-yacs/Manifest index 1e21968dc..b8ff2c8b3 100644 --- a/sci-misc/salome-yacs/Manifest +++ b/sci-misc/salome-yacs/Manifest @@ -2,6 +2,6 @@ AUX salome-yacs-5.1.3-ac_python_devel.patch 1284 RMD160 e595a81ae436cdb03d86acad AUX salome-yacs-5.1.3-lib_location.patch 663 RMD160 6e02098839ad76c09adb995bd71567b7dbe9a770 SHA1 54a16203762e03ad1d96bd4f67cc33c7d66dfd71 SHA256 a21deface225771ce0210506e190b82d69a486e41a417743d82794988188d5d4 AUX salome-yacs-5.1.3-libdir.patch 988 RMD160 db03b310f8ab1a45586fc3a0d597147e359258fe SHA1 0073bba897ff0b59f5d768504432788fc7b5ab59 SHA256 080e5d8b945f275927db499d199b7bd7f3c5fcce28a4878b9f840e26dc745bba DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -EBUILD salome-yacs-5.1.3.ebuild 2866 RMD160 c672a465726c8d359e9487f13b412e40cf9a95f5 SHA1 02b8d0d2224d8f3074dd740f1d807977a2e14f2c SHA256 b4bcd57ca62cd71e7a99c030ac70faae97d4fa7db39dcb3fa0edad9acdef3819 -MISC ChangeLog 440 RMD160 25bfd70c64d7166dbfb077b8f8aedebfd4ddc272 SHA1 3319b1130823de86b0327366f527dee29e6b9416 SHA256 18f099554946fd7a79880752820d808f97bd4f658be37b8936c9515adf170bd1 +EBUILD salome-yacs-5.1.3.ebuild 2736 RMD160 d795f6bd8a0d44624098c6dc93034d6532c1a726 SHA1 12c42fca1dbbfe078192673cb0ba8b8205f7efd4 SHA256 75a55e020697f36172a40f5faa61e74c40e8e3d4aa9c8c89aa77290f70f60a86 +MISC ChangeLog 561 RMD160 b9a41a9622dc89c4e090b34c859b3ae3f438e7e4 SHA1 afd0ee746811c951c5b93ae6e458f13baca41c19 SHA256 ab26c2ee982bc523c4a6f771cacc5e362cffcacc4dc5081a7fee87638f8e4a56 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac diff --git a/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild index 4081d6457..47ea1024b 100644 --- a/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild +++ b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild @@ -5,12 +5,12 @@ EAPI=2 PYTHON_DEPEND="2:2.4" -inherit distutils eutils +inherit eutils python DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. YACS 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" @@ -43,19 +43,15 @@ DEPEND="${RDEPEND} >=dev-python/elementtree-1.2.6" MODULE_NAME="YACS" -MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" +S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}" INSTALL_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}" - epatch "${FILESDIR}"/"${P}"-ac_python_devel.patch if use amd64; then epatch "${FILESDIR}"/"${P}"-lib_location.patch @@ -68,8 +64,6 @@ src_prepare() { } src_configure() { - cd "${MY_S}" - econf --prefix=${INSTALL_DIR} \ --datadir=${INSTALL_DIR}/share/salome \ --docdir=${INSTALL_DIR}/doc/salome \ @@ -84,15 +78,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 @@ -100,7 +86,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/Makefile insinto "${INSTALL_DIR}" |