From 3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 Mon Sep 17 00:00:00 2001 From: Etienne Lorriaux Date: Mon, 15 Mar 2010 00:38:41 +0100 Subject: sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6 --- sci-misc/salome-pycalculator/ChangeLog | 9 +- sci-misc/salome-pycalculator/Manifest | 7 +- .../files/salome-pycalculator-3.2.6.patch | 11 -- .../salome-pycalculator-3.2.6.ebuild | 131 --------------------- .../salome-pycalculator-5.1.3.ebuild | 96 +++++++++++++++ 5 files changed, 107 insertions(+), 147 deletions(-) delete mode 100644 sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch delete mode 100644 sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild create mode 100644 sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild (limited to 'sci-misc/salome-pycalculator') diff --git a/sci-misc/salome-pycalculator/ChangeLog b/sci-misc/salome-pycalculator/ChangeLog index 0f442b918..405799559 100644 --- a/sci-misc/salome-pycalculator/ChangeLog +++ b/sci-misc/salome-pycalculator/ChangeLog @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ 21 May 2008; Daniel Tourde Initial import. @@ -6,6 +6,13 @@ 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 +*salome-pycalculator-5.1.3 (14 Mar 2010) + + 14 Mar 2010; Etienne Lorriaux + -salome-pycalculator-3.2.6.ebuild, -files/salome-pycalculator-3.2.6.patch, + +salome-pycalculator-5.1.3.ebuild: + Version bump 5.1.3 + removed broken 3.2.6 + 04 Sep 2008; Oliver Borm (boroli) salome-pycalculator-3.2.6.ebuild: removed omniorb* dependencies, as they are already in salome-kernel diff --git a/sci-misc/salome-pycalculator/Manifest b/sci-misc/salome-pycalculator/Manifest index 36e08e87e..cb6db0dec 100644 --- a/sci-misc/salome-pycalculator/Manifest +++ b/sci-misc/salome-pycalculator/Manifest @@ -1,5 +1,4 @@ -AUX salome-pycalculator-3.2.6.patch 535 RMD160 5cf0de1ecd17f58e84115efd2178118565f71e36 SHA1 f66595c14bdf6a73b0e91479e267b73a64a2101a SHA256 6e8f10d9db73baa0a4939b8b3403e66dba397949f38f0495ab62600a7bc9c12a -DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-pycalculator-3.2.6.ebuild 3913 RMD160 fce27abe14043298ee67eee11afaffb7d34b9466 SHA1 ed41ded88aa11b89415f7b67dd916c2882e68280 SHA256 4e86c7f359752382616b54f85895154401cec381ac20b7c534917ce6826c8398 -MISC ChangeLog 907 RMD160 afbac61b682fde2c78b866472bd5ab0744b59389 SHA1 1c2f109c0d240d50ed1ab317733b0fbfc0f09830 SHA256 0f6ecd4013ffb246807913bab1992adadf4d075c3e971027736e0c8ee1cefb55 +DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b +EBUILD salome-pycalculator-5.1.3.ebuild 2459 RMD160 135357735c2fd36a905ca95cc1a2ea7ad0a7eff2 SHA1 8f1fe3759766070f9cf90bf0a17e6c4dd123890b SHA256 342207452b03e635b9b830da45b011d74295330caea388382e73f7a5c98c23cc +MISC ChangeLog 1169 RMD160 9a394bc004f22dd4d31a01f8be33b3041cb7284c SHA1 d4eae863981bcb1691d6c00b2866d3293e145ef1 SHA256 6369d3284068312de225a4a718aa7e82d8374f78c3b397edb19f8683e94342ee MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 diff --git a/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch b/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch deleted file mode 100644 index 9897907f4..000000000 --- a/sci-misc/salome-pycalculator/files/salome-pycalculator-3.2.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./PYCALCULATOR_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200 -+++ ./PYCALCULATOR_SRC_3.2.6/build_configure 2008-02-21 10:20:34.000000000 +0100 -@@ -109,7 +109,7 @@ - - # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files - echo "" >> configure.in_tmp1 --echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 -+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - - echo "" >> configure.in_tmp1 - echo "AC_OUTPUT([ \\" >> configure.in_tmp1 diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild deleted file mode 100644 index 959e491dd..000000000 --- a/sci-misc/salome-pycalculator/salome-pycalculator-3.2.6.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# 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. PYCALCULATOR Component" -HOMEPAGE="http://www.salome-platform.org" -SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="debug doc mpi" - -RDEPEND="mpi? ( sys-cluster/mpich2 ) - debug? ( dev-util/cppunit )" - -DEPEND="${RDEPEND} - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-med-${PV} - >=sci-misc/salome-component-${PV}" - -MODULE_NAME="PYCALCULATOR" -MY_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" - -src_unpack() { - python_version - distutils_python_version - ewarn "Python 2.4 is highly recommended for Salome..." - - if ! built_with_use sci-libs/vtk python ; then - die "You must rebuild sci-libs/vtk with python USE flag" - fi - - unpack ${A} - cd "${MY_S}" - epatch "${FILESDIR}"/${P}.patch -} - - -src_compile() { - local myconf="" - cd "${MY_S}" - rm -r -f autom4te.cache - ./build_configure - - # CXXFLAGS are slightly modified to allow the compilation of - # salome-pycalculator with OpenCascade and gcc-4.1.x - if version_is_at_least "4.1" $(gcc-version) ; then - append-flags -ffriend-injection -fpermissive - fi - - # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk - if has_version ">=sci-libs/vtk-5.0" ; then - einfo "vtk version 5 detected" - append-flags -I/usr/include/vtk-5.0 - else - einfo "vtk version 4 or prior detected" - fi - - # Compiler and linker flags - if use amd64 ; then - append-flags -m64 - fi - - # Specifying --without- for mpi / mpich - # has the same effect as turning it on - # so we just ommit it if it's not required to turn it off - if use mpi; then - myconf="${myconf} --with-mpi --with-mpich" - fi - - # 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 \ - ${myconf} \ - $(use_enable debug ) \ - $(use_enable !debug production ) \ - $(use_with debug cppunit /usr ) \ - || die "configuration failed" - - # Compilation - MAKEOPTS="-j1" emake || die "Compilation failed" -} - - -src_install() { - cd "${MY_S}" - - # Installation - emake prefix="${D}/${INSTALL_DIR}" \ - docdir="${D}/${INSTALL_DIR}/doc/salome" \ - infodir="${D}/${INSTALL_DIR}/share/info" \ - datadir="${D}/${INSTALL_DIR}/share/salome" \ - libdir="${D}/${INSTALL_DIR}/$(get_libdir)/salome" \ - PYTHON_SITE_INSTALL="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" \ - sharedpydir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome/shared_modules" install \ - || die "emake install failed" - - if use amd64 ; then - dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib - fi - - 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} - doenvd 90${P} - rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb - insinto "${INSTALL_DIR}" - doins -r adm_local - if use doc ; then - dodoc INSTALL - fi -} - - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\`" - elog "now to set up the correct paths." - elog "" -} diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild new file mode 100644 index 000000000..db478f235 --- /dev/null +++ b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +PYTHON_DEPEND="2:2.4" + +inherit distutils eutils + +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" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="debug doc" + +RDEPEND="debug? ( dev-util/cppunit ) + >=sci-misc/salome-kernel-${PV} + >=sci-misc/salome-med-${PV} + >=sci-misc/salome-component-${PV} + >=dev-python/omniorbpy-3.4 + >=net-misc/omniORB-4.1.4 + >=sci-libs/med-2.3.5" + +DEPEND="${RDEPEND} + >=app-doc/doxygen-1.5.6 + media-gfx/graphviz + >=dev-python/docutils-0.4" + +MODULE_NAME="PYCALCULATOR" +MY_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" + +PYVER=$(python_get_version) + +pkg_setup() { + [[ ${PYVER} > 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 \ + $(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 + + 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} + doenvd 90${P} + rm adm_local/Makefile + insinto "${INSTALL_DIR}" + doins -r adm_local + + use doc && dodoc INSTALL +} + +pkg_postinst() { + elog "Run \`env-update && source /etc/profile\`" + elog "now to set up the correct paths." + elog "" +} -- cgit v1.2.3-65-gdbad