From 86b6c840658422259a5ca9d079a2f63d9f708cd1 Mon Sep 17 00:00:00 2001 From: oli Date: Tue, 26 Aug 2008 20:49:24 +0000 Subject: sci-misc/salome-kernel: Removed fetch restriction, added python-2.5 support, removed hardcode git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1248 32389bae-6d03-0410-99cf-db05cde120eb --- sci-misc/salome-kernel/ChangeLog | 19 ++++++++++++++ sci-misc/salome-kernel/Changelog | 14 ---------- sci-misc/salome-kernel/Manifest | 7 ++--- sci-misc/salome-kernel/metadata.xml | 5 ++++ sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild | 31 ++++++++--------------- 5 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 sci-misc/salome-kernel/ChangeLog delete mode 100644 sci-misc/salome-kernel/Changelog create mode 100644 sci-misc/salome-kernel/metadata.xml diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog new file mode 100644 index 000000000..dc8eb9d0a --- /dev/null +++ b/sci-misc/salome-kernel/ChangeLog @@ -0,0 +1,19 @@ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 26 Aug 2008; Oliver Borm (boroli) + salome-kernel-3.2.6.ebuild, -Changelog, +metadata.xml: + Removed fetch restriction, added python-2.5 support, removed hardcode + + 6 July 2008; Daniel Tourde + Updated to a new gcc-4.3 patch provided by Bert K. + + 29 May 2008; Daniel Tourde + +salome-kernel-3.2.6-gcc-4.3.patch + Added support to gcc-4.3. Patch provided by Bert Karwatzki + + 20 May 2008; Daniel Tourde + Initial import. + +salome-kernel-3.2.6.ebuild, +salome-kernel-3.2.6_omniorg.patch, +salome-kernel-gcc4.patch, +salome-kernel-3.2.6-Batch_Couple.patch, +salome-kernel-3.2.6_openpbs.patch, +salome-kernel.png, +salome-kernel-3.2.6-mpich2.patch, +salome-kernel-3.2.6-pyobject.patch + A major thank to Francois Dorin , Jon Hood , Dewald Pietersen , and Richard Westwell for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! + See bug #155974 for more info diff --git a/sci-misc/salome-kernel/Changelog b/sci-misc/salome-kernel/Changelog deleted file mode 100644 index afff2123b..000000000 --- a/sci-misc/salome-kernel/Changelog +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - 6 July 2008; Daniel Tourde - Updated to a new gcc-4.3 patch provided by Bert K. - - 29 May 2008; Daniel Tourde - +salome-kernel-3.2.6-gcc-4.3.patch - Added support to gcc-4.3. Patch provided by Bert Karwatzki - - 20 May 2008; Daniel Tourde - Initial import. - +salome-kernel-3.2.6.ebuild, +salome-kernel-3.2.6_omniorg.patch, +salome-kernel-gcc4.patch, +salome-kernel-3.2.6-Batch_Couple.patch, +salome-kernel-3.2.6_openpbs.patch, +salome-kernel.png, +salome-kernel-3.2.6-mpich2.patch, +salome-kernel-3.2.6-pyobject.patch - A major thank to Francois Dorin , Jon Hood , Dewald Pietersen , and Richard Westwell for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! - See bug #155974 for more info diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest index 83c4387bb..bf165813b 100644 --- a/sci-misc/salome-kernel/Manifest +++ b/sci-misc/salome-kernel/Manifest @@ -6,6 +6,7 @@ AUX salome-kernel-3.2.6_omniorg.patch 159 RMD160 6071fe5caa4b2d38bc34e26dfeb5c2b AUX salome-kernel-3.2.6_openpbs.patch 847 RMD160 f41b3adde69f2958941643da10b7551de7b40257 SHA1 5e50bfbd38a9d71cd255c59e1b029871c612636c SHA256 5a1c31be402230260b1ce828a553619feeeb439cc7635eed695a68a70507aec6 AUX salome-kernel-gcc4.patch 5928 RMD160 9fa81eeac2d5dbb64b3137e711553b4b76bc9e08 SHA1 59eeee6e19b3e5e6c5490b8fbf9e4b67e9ecd9db SHA256 6c5a19dac8893c054c03467a4e463aa582b88c22c37a7d2ce88ba75f918e06dc AUX salome-kernel.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2 -DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-kernel-3.2.6.ebuild 5629 RMD160 864e79d24d2b7f098683aa534e96daefffd8148f SHA1 b8e212a51b06ba6c18d56e7e75d1d43758648d43 SHA256 6d45b5f0cc6de5cc55aca49add2e87135cbfdb181d4f66e5f69db97b167b0c61 -MISC Changelog 1057 RMD160 7199fd581065a42ce6f0a196c90af808d7cba7b0 SHA1 830d1108f90b73fe9d9c1eb242ceb0922a5fcaf7 SHA256 d8c7b7cf61606435f52432a937cd729e79153c9a6be9084dadcce372974630f7 +DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 +EBUILD salome-kernel-3.2.6.ebuild 5418 RMD160 2e73db28e351b92ed371b3f026bd0d3250397443 SHA1 a646ace2b5e168e9100d44b520a6a3a5a5034a81 SHA256 bccd834f7c53ae26287435d05b206dd19beabab4e01159b65e84f736a87a5016 +MISC ChangeLog 1242 RMD160 9779e290074853e0ef3c32bf22618a741f7ea184 SHA1 43d3a28e3ccf23c0c7e975a74d061892a0d7bd59 SHA256 02b5423a880bb8aaab1972dc9c7beb2704e0833d635fbeb56ae6075813960769 +MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-kernel/metadata.xml b/sci-misc/salome-kernel/metadata.xml new file mode 100644 index 000000000..b229aec85 --- /dev/null +++ b/sci-misc/salome-kernel/metadata.xml @@ -0,0 +1,5 @@ + + + +sci + diff --git a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild index dc400b42a..5f1ff91e7 100644 --- a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild +++ b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 - +# $Header: $ inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. KERNEL Component" HOMEPAGE="http://www.salome-platform.org" -SRC_URI="salome-3.2.6.tar.gz" +SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="doc corba opengl openpbs mpi debug X" -RESTRICT="fetch" RDEPEND="opengl? ( virtual/opengl ) mpi? ( sys-cluster/mpich2 ) @@ -26,7 +25,7 @@ DEPEND="${RDEPEND} app-doc/doxygen media-gfx/graphviz dev-libs/boost - dev-lang/python:2.4 + dev-lang/python >=dev-python/PyQt-3.13 >=dev-python/sip-4.1.3 dev-python/numeric @@ -47,16 +46,6 @@ INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}" KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}" export OPENPBS="/usr" - -pkg_nofetch() -{ - einfo "You have to download manually the source code. You can download it from :" - einfo " http://www.salome-platform.org/download/dl326" - einfo "" - einfo "Put the archive in the \"/usr/portage/distfile\" directory and rename it \"salome-3.2.6.tar.gz\"" -} - - src_unpack() { python_version @@ -78,7 +67,9 @@ src_unpack() epatch "${FILESDIR}"/${P}-Batch_Couple.patch # If Python 2.5 is planned to be used, the following patch must be applied. This, however, # needs to be thoroughly tested! - #epatch "${FILESDIR}"/${P}-pyobject.patch + if version_is_at_least "2.5" "${PYVER}"; then + epatch "${FILESDIR}"/${P}-pyobject.patch + fi # Fix for mpich2 detection, this is also used by salome-component at least epatch "${FILESDIR}"/${P}-mpich2.patch @@ -88,7 +79,7 @@ src_unpack() fi # Correct the Salome version number - sed -i "s:3.2.5:3.2.6:g" configure.ac + sed -i "s:3.2.5:${PV}:g" configure.ac ./clean_configure ./build_configure @@ -142,7 +133,7 @@ src_compile() $(use_with opengl opengl /usr) \ $(use_enable corba corba-gen) \ || die "configuration failed" - + # Compilation emake || die "compilation failed" } @@ -171,12 +162,12 @@ src_install() echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P} doenvd 90${P} if use doc ; then - dodoc AUTHORS ChangeLog COPYING INSTALL LICENCE NEWS README README.FIRST.txt + dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt fi # If use omniORB as corba if use corba ; then - sed -i 's@import CORBA@from omniORB import CORBA@' ${D}/${INSTALL_DIR}/bin/salome/runSalome.py + sed -i 's@import CORBA@from omniORB import CORBA@' "${D}"/"${INSTALL_DIR}"/bin/salome/runSalome.py fi # Install icon and .desktop for menu entry -- cgit v1.2.3-65-gdbad