sci-misc/salome-* bumped to 5.1.4

ebuild by Michael Riss in bug 330303

5 files changed, 164 insertions, 11 deletions

diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog
index 1332a03c5..8688d4c00 100644
--- a/sci-misc/salome-kernel/ChangeLog
+++ b/sci-misc/salome-kernel/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*salome-kernel-5.1.4 (27 Oct 2010)
+
+  27 Oct 2010; Thomas Kahle <tomka@gentoo.org> +salome-kernel-5.1.4.ebuild,
+  +files/salome-kernel-5.1.4-openmpi.patch,
+  +files/salome-kernel-5.1.4-python-2.6.patch:
+  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
+
   29 Jun 2010; Justin Lecher <jlec@gentoo.org> salome-kernel-5.1.3.ebuild:
   Python ABI fixes
 
diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest
index 2a44d66d8..c272da01f 100644
--- a/sci-misc/salome-kernel/Manifest
+++ b/sci-misc/salome-kernel/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX salome-kernel-5.1.3-lib_location.patch 532 RMD160 852dd572d00008217256fe980a55d761d7192cea SHA1 fee095613301325cef6bf66b9f6a0f5da4c5ae06 SHA256 5f4e16f9c9c5f11233cd69b0723017543f46c1697c18f22ea650a104feba7998
 AUX salome-kernel-5.1.3-openmpi.patch 771 RMD160 28c2b4f26c450e23117726cabe299836f88e3192 SHA1 a114862c6320ce0828145a171f5fc55437d486b3 SHA256 720a235568eacde244ca68e18b9eae64b54bba65ece15247ff7363252d38d81d
 AUX salome-kernel-5.1.3-python-2.6.patch 765 RMD160 3ed18d32155d35bdee4ff7bb27b706cb854d602b SHA1 8bdd812c3a1333a2467f0340db573d895f17deb8 SHA256 2d88ded3a1e2bf04e2874803cf7ee8f125032af2996afb9992e3743509ae39bd
+AUX salome-kernel-5.1.4-openmpi.patch 771 RMD160 3b3fdd5550fb3d2b24b5c31ba9e820c7d0788075 SHA1 999f22e6c16ef17528a77e7c07e370180f502fc2 SHA256 cb24d46ad8866594c97aae49898a926dfcbd05b41f0236bbf139a6667e660bf9
+AUX salome-kernel-5.1.4-python-2.6.patch 765 RMD160 59828627ed69184e039d1c9d90b9e2a988bb01fd SHA1 335af09c980f53b70b7f88753de164a47e633379 SHA256 7d17ce8599f222de12d04d430fffe7da75ab31fd3361c19435f4b58126ce7d79
 AUX salome-kernel.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2
 DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+DIST src5.1.4.tar.gz 120063320 RMD160 c309cebcc4808071d72b5a335185002d69d1420f SHA1 a8b922424af634bda35269e6049a1262e27fc260 SHA256 dd59384ad4fbbbe49c72e946eed9e0f6144a01c799efab62033113a3db46eeae
 EBUILD salome-kernel-5.1.3.ebuild 3641 RMD160 650c46f36e898b748bd174de5dc96c4dde40ae20 SHA1 3f8ce38d9d0c4ad47fb3f42b2c00a2d9621a6da1 SHA256 94e65c7e40162e879cd32b23fbe4633895ee4d86f4c2be5226ed024312cd375e
-MISC ChangeLog 3289 RMD160 ae912e1bab7b1a5f7035fedc320f3c63612abde7 SHA1 5c1076dd75b7724087cc2c9442f08fbc712f1b50 SHA256 0826c4e7c76f9fedee9c7f3d26a7bbebfd57568be4a31ea0669cd9e0ad38727f
+EBUILD salome-kernel-5.1.4.ebuild 3641 RMD160 650c46f36e898b748bd174de5dc96c4dde40ae20 SHA1 3f8ce38d9d0c4ad47fb3f42b2c00a2d9621a6da1 SHA256 94e65c7e40162e879cd32b23fbe4633895ee4d86f4c2be5226ed024312cd375e
+MISC ChangeLog 3547 RMD160 09483a05087fdb7c8770716758fb1dcc6618dcd4 SHA1 72e7961b0bbdb6003c9a28b41b6e6f0bade992e5 SHA256 d78b78bcea7cd5c84f02a7b01264884d9bb4b2306dba29c692f30b21beb4e750
 MISC metadata.xml 247 RMD160 e1c681233bddd30ebb6140396aa6b8531cad2654 SHA1 aaf4d3d22ca073fc6b2858d3775ef9458f98c283 SHA256 0da057781b1ed4721163e092cab86b9ee862a15d6bc20c8c6877000daca4c394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwqWgYACgkQgAnW8HDreRY0GQCfa1gl3V3+ttrTyN9tGUC6qwRj
-y/0AnjcxwckUL+JFAdi6uDUcfkdhk0qz
-=nu1f
------END PGP SIGNATURE-----
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch
new file mode 100644
index 000000000..daa51bbbf
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch
@@ -0,0 +1,21 @@
+--- src5.1.4.orig/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4	2008-12-10 10:14:34.000000000 +0100
++++ src5.1.4/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4	2009-09-29 10:14:56.821299268 +0200
+@@ -76,7 +76,7 @@
+ 
+   if test "$WITHMPI" = "yes";then
+     mpi_ok=yes
+-    MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC"
++    MPI_LIBS="$MPI_LIBS -lmpi -lmpi_cxx"
+   else
+     mpi_ok=no
+   fi
+--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx	2008-12-10 10:14:33.000000000 +0100
++++ src5.1.4/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx	2009-09-29 11:10:13.227293648 +0200
+@@ -25,6 +25,7 @@
+ #include <SALOME_Communication.hxx>
+ 
+ #ifdef HAVE_MPI2
++#define OMPI_IGNORE_CXX_SEEK 1
+ #include "mpi.h"
+ #endif
+ #include <string>
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
new file mode 100644
index 000000000..2395d95bc
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
@@ -0,0 +1,13 @@
+Only in src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY: .import_hook.py.swp
+diff -ur src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py
+--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py	2010-03-07 17:35:38.450323100 +0100
++++ src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py	2010-03-07 17:37:18.940255407 +0100
+@@ -150,7 +150,7 @@
+             l.append((subname,submod))
+     return l
+ 
+-def import_hook(name, globals=None, locals=None, fromlist=None, *args):
++def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args):
+     """ Import replacement for sharing modules among multiple interpreters
+         Mostly update sys.modules before doing real import
+     """
diff --git a/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild b/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild
new file mode 100644
index 000000000..98fbac271
--- /dev/null
+++ b/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild
@@ -0,0 +1,118 @@
+# 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 eutils python
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. KERNEL Component"
+HOMEPAGE="http://www.salome-platform.org"
+SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc mpi numpy"
+
+RDEPEND="mpi?     ( || ( sys-cluster/openmpi[cxx]
+		 				 sys-cluster/mpich2[cxx] ) )
+		 debug?   ( dev-util/cppunit )
+		 numpy?   ( dev-python/numpy )
+		 >=dev-python/omniorbpy-3.4
+		 >=net-misc/omniORB-4.1.4
+		 >=dev-libs/boost-1.40.0
+		 sci-libs/hdf5"
+
+DEPEND="${RDEPEND}
+		>=app-doc/doxygen-1.5.6
+		media-gfx/graphviz
+		dev-python/docutils
+		dev-lang/swig
+		dev-libs/libxml2
+		>=dev-python/docutils-0.4"
+
+MODULE_NAME="KERNEL"
+S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+
+pkg_setup() {
+	[[ $(python_get_version) > 2.4 ]] && \
+		ewarn "Python 2.4 is highly recommended for Salome..."
+
+	#Warn about mpi use flag for hdf5
+	has_version "sci-libs/hdf5[mpi]" &&
+		ewarn "mpi use flag enabled for sci-libs/hdf5, this may cause the build to fail for salome-kernel"
+	python_set_active_version 2
+}
+
+src_prepare() {
+	use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch
+	[[ $(python_get_version) == 2.6 ]] && \
+		epatch "${FILESDIR}"/${P}-python-2.6.patch
+
+	has_version "sys-cluster/openmpi" && \
+		epatch "${FILESDIR}"/${P}-openmpi.patch
+
+	./clean_configure
+	./build_configure
+}
+
+src_configure() {
+	local myconf=""
+
+#   --without-mpi does not disable mpi support, just omit it to disable
+	if use mpi; then
+		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"
+		fi
+	fi
+
+	econf --prefix=${INSTALL_DIR} \
+	      --docdir=${INSTALL_DIR}/share/doc/salome \
+	      --infodir=${INSTALL_DIR}/share/info \
+	      --datadir=${INSTALL_DIR}/share/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 ) \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with debug cppunit /usr ) \
+	|| die "econf failed"
+}
+
+src_install() {
+	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
+
+	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
+
+	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$(python_get_version)/site-packages/salome" >> ./90${P}
+	doenvd 90${P}
+	use doc && dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/${PN}.png
+	make_desktop_entry runSalome Salome ${PN} "Science;Engineering"
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+
+	ewarn "note a small change to /etc/hosts may be required"
+	ewarn "salome doesn't seem to recognise localhost within the hosts file"
+	ewarn "a line such as"
+	ewarn "127.0.0.1	name.domain	name"
+	ewarn "may be required within /etc/hosts"
+	ewarn ""
+}