aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-component
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-component')
-rw-r--r--sci-misc/salome-component/ChangeLog11
-rw-r--r--sci-misc/salome-component/Manifest11
-rw-r--r--sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch11
-rw-r--r--sci-misc/salome-component/files/salome-component-3.2.6.patch28
-rw-r--r--sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch11
-rw-r--r--sci-misc/salome-component/metadata.xml2
-rw-r--r--sci-misc/salome-component/salome-component-3.2.6.ebuild144
-rw-r--r--sci-misc/salome-component/salome-component-5.1.3.ebuild119
8 files changed, 146 insertions, 191 deletions
diff --git a/sci-misc/salome-component/ChangeLog b/sci-misc/salome-component/ChangeLog
index 68d17b7c9..8909ce515 100644
--- a/sci-misc/salome-component/ChangeLog
+++ b/sci-misc/salome-component/ChangeLog
@@ -1,6 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*salome-component-5.1.3 (14 Mar 2010)
+
+ 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ -salome-component-3.2.6.ebuild,
+ -files/salome-component-3.2.6-gcc-4.3.patch,
+ -files/salome-component-3.2.6.patch, +salome-component-5.1.3.ebuild,
+ +files/salome-component-5.1.3-mpi.patch, metadata.xml:
+ Version bump 5.1.3 + removed broken 3.2.6
+
04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
salome-component-3.2.6.ebuild:
removed omniorb* and med dependencies, as they are already in salome-kernel
diff --git a/sci-misc/salome-component/Manifest b/sci-misc/salome-component/Manifest
index 7ba6a0782..a468ead9a 100644
--- a/sci-misc/salome-component/Manifest
+++ b/sci-misc/salome-component/Manifest
@@ -1,6 +1,5 @@
-AUX salome-component-3.2.6-gcc-4.3.patch 560 RMD160 f3f40ff2750a3dcc5189f5e70567a28f931cfeaf SHA1 7998d668a0c0eabbba0ed996195a570db1cfcb62 SHA256 141b30503eaefe3b08f80d2fb59d294c8212760a9c712db87708a7e66e969844
-AUX salome-component-3.2.6.patch 962 RMD160 6faa88abe04da39c973179c587703f16c4ef17ae SHA1 c4fc6b63e10895f5c59095b810e4aa3b6862377f SHA256 55cec4ae7912a51a27cc2597a4be523823f950499c2caf6deeeda4411cf7ab0d
-DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-component-3.2.6.ebuild 4218 RMD160 d55f0519024cfbc6a710991d0d00ce444df6d57d SHA1 bd134820dd59171fa1d403c00d063394a334047f SHA256 7b5ef699a315f3b194b74aa8b899cc738d66b66ca0903a5d21060bfd767daf52
-MISC ChangeLog 1098 RMD160 47632b763ceaa7d5939c5b029f120d69db8a8e3e SHA1 8c808fe6489e0e707b267a0ae82d00afcd87d8cf SHA256 58df96aed0f982985b51ffeff55a5032b65560b4221071a90c07124cce451025
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+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 1ad82041a016352caedf57457576451c365c6df8 SHA1 b1084c4614d77ef54c16d0e8d39b9ed7f46c484f SHA256 bea18a8b65350640f42c77beee6d1849b414164fd662fb3b5b1a545daf78f175
+MISC ChangeLog 1452 RMD160 6da8265d00db25d2de4ecfe365258ed55a912af4 SHA1 9352db644331b5dd2b8b47710249470180939150 SHA256 0f2a83dc38202d28cd6135647090dfe2c9a7c27c353fc01bd9c112778488072f
+MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
diff --git a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch b/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch
deleted file mode 100644
index 51c3c0d37..000000000
--- a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx
---- src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-25 19:32:48.000000000 +0200
-+++ src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-26 02:08:55.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <fstream>
- #include <strstream>
- #include <string>
-+#include <cstring>
- #include <math.h>
-
- using namespace std;
diff --git a/sci-misc/salome-component/files/salome-component-3.2.6.patch b/sci-misc/salome-component/files/salome-component-3.2.6.patch
deleted file mode 100644
index 466118455..000000000
--- a/sci-misc/salome-component/files/salome-component-3.2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./COMPONENT_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./COMPONENT_SRC_3.2.6/build_configure 2008-02-21 09:57:25.000000000 +0100
-@@ -144,7 +144,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
---- ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in 2008-02-21 09:58:54.000000000 +0100
-@@ -26,12 +26,12 @@
- all: resources
-
- install:
-- cp -rf @top_srcdir@/adm_local @prefix@
-+# cp -rf @top_srcdir@/adm_local @prefix@
-
- bin:
-
- resources :
-- cp -rf @top_srcdir@/adm_local $(top_builddir)
-+# cp -rf @top_srcdir@/adm_local $(top_builddir)
-
- inc:
-
diff --git a/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
new file mode 100644
index 000000000..e9e920c8e
--- /dev/null
+++ b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:08:31.371569651 +0100
++++ src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:09:05.060321118 +0100
+@@ -571,7 +571,7 @@
+ done
+ AddComponent_CheckOfUndefined$(EXEEXT): $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_DEPENDENCIES)
+ @rm -f AddComponent_CheckOfUndefined$(EXEEXT)
+- $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS)
++ $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS) $(MPI_LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
diff --git a/sci-misc/salome-component/metadata.xml b/sci-misc/salome-component/metadata.xml
index b229aec85..d369d068f 100644
--- a/sci-misc/salome-component/metadata.xml
+++ b/sci-misc/salome-component/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
+ <herd>sci</herd>
</pkgmetadata>
diff --git a/sci-misc/salome-component/salome-component-3.2.6.ebuild b/sci-misc/salome-component/salome-component-3.2.6.ebuild
deleted file mode 100644
index 9aa85524b..000000000
--- a/sci-misc/salome-component/salome-component-3.2.6.ebuild
+++ /dev/null
@@ -1,144 +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. COMPONENT 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 opengl openpbs"
-
-RDEPEND="opengl? ( virtual/opengl )
- mpi? ( sys-cluster/mpich2 )
- openpbs? ( sys-cluster/torque )
- debug? ( dev-util/cppunit )"
-
-DEPEND="${RDEPEND}
- >=sci-misc/salome-kernel-${PV}
- >=sci-misc/salome-gui-${PV}
- >=sci-misc/salome-med-${PV}"
-
-MODULE_NAME="COMPONENT"
-MY_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"
-
-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
-
- # Gcc 4.3 support
- if version_is_at_least "4.3" $(gcc-version) ; then
- epatch "${FILESDIR}"/${P}-gcc-4.3.patch
- fi
-}
-
-
-src_compile() {
- local myconf=""
- cd "${MY_S}"
- rm -r -f autom4te.cache
- ./build_configure
-
- # CXXFLAGS are slightly modified to allow the compilation of
- # salome-component 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-<flag> for mpi / mpich / openpbs
- # 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
- if use openpbs ; then
- myconf="${myconf} --with-openpbs"
- fi
-
- # Get rid of mpich2 SEEK_SET errors
- # This happens if mpich2 is compiled with the cxx use flag
- append-flags -DMPICH_IGNORE_CXX_SEEK
-
- # 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 ) \
- $(use_with opengl opengl /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" \
- pythondir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages" 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-component/salome-component-5.1.3.ebuild b/sci-misc/salome-component/salome-component-5.1.3.ebuild
new file mode 100644
index 000000000..7672fcc1c
--- /dev/null
+++ b/sci-misc/salome-component/salome-component-5.1.3.ebuild
@@ -0,0 +1,119 @@
+# 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 flag-o-matic
+
+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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc mpi"
+
+RDEPEND="mpi? ( || ( sys-cluster/openmpi[cxx]
+ sys-cluster/mpich2[cxx] ) )
+ debug? ( dev-util/cppunit )
+ >=sci-misc/salome-kernel-${PV}
+ >=sci-misc/salome-gui-${PV}
+ >=sci-misc/salome-med-${PV}
+ >=x11-libs/qt-core-4.4.3
+ >=x11-libs/qt-gui-4.4.3
+ >=x11-libs/qt-opengl-4.4.3
+ >=x11-libs/qwt-5.2
+ >=dev-python/PyQt4-4.4.3
+ >=sci-libs/opencascade-6.3"
+
+DEPEND="${RDEPEND}
+ >=app-doc/doxygen-1.5.6
+ media-gfx/graphviz
+ >=dev-python/docutils-0.4
+ >=dev-python/sip-4.7.7
+ dev-lang/swig
+ dev-libs/libxml2"
+
+MODULE_NAME="COMPONENT"
+MY_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"
+
+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() {
+ 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
+ if has_version ">=sys-cluster/openmpi-1.2.9"; then
+ myconf="${myconf} --with-mpi --with-openmpi"
+ elif has_version ">=sys-cluster/mpich2-1.0.8"; then
+ myconf="${myconf} --with-mpi --with-mpich"
+ append-flags -DMPICH_IGNORE_CXX_SEEK
+ fi
+ fi
+
+ 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 ) \
+ || 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}
+ 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 ""
+}