sci-misc/salome-* bumped to 5.1.4

ebuild by Michael Riss in bug 330303

7 files changed, 286 insertions, 11 deletions

diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
index fde581e7e..58ed3ee44 100644
--- a/sci-misc/salome-med/ChangeLog
+++ b/sci-misc/salome-med/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*salome-med-5.1.4 (27 Oct 2010)
+
+  27 Oct 2010; Thomas Kahle <tomka@gentoo.org> +salome-med-5.1.4.ebuild,
+  +files/salome-med-5.1.4-check_metis.patch,
+  +files/salome-med-5.1.4-check_scotch.patch,
+  +files/salome-med-5.1.4-gcc.patch, +files/salome-med-5.1.4-scotch.patch:
+  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
+
   29 Jun 2010; Justin Lecher <jlec@gentoo.org> salome-med-5.1.3.ebuild:
   Python ABI fixes
 
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index f41a2ca54..19b205070 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -8,14 +5,13 @@ AUX salome-med-5.1.3-med_int.patch 15420 RMD160 46314924e3f8fbf1347f736f47a92727
 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
+AUX salome-med-5.1.4-check_metis.patch 1573 RMD160 6161d11c4f2bfc9c0c56bb4eb21dd362a2b48091 SHA1 c135ba372ab0b776b3ed78618486947a5ff2f007 SHA256 9e2c46b3e4e855621495a09f311150d62c9d7429db578c3bebd0c0ffe0388e63
+AUX salome-med-5.1.4-check_scotch.patch 2538 RMD160 1fe609bb4be7c5b3dff640f1a270bf896ac093bd SHA1 d3b87bd90c0cd0153959bdfd25277913d02c3362 SHA256 77d8add6d3584140d9607716a1786acf1f22be187710c55e5b66fc2a14329146
+AUX salome-med-5.1.4-gcc.patch 420 RMD160 e6d00d77e70a3906f43dab76f97025c287adc29c SHA1 13d5772327ef961ae4937af415f613b84810dba3 SHA256 cc1a5b0599e149c1448c1993fdfdcb2af1ad8c2b1921e0ac6b8b018c349a9d47
+AUX salome-med-5.1.4-scotch.patch 411 RMD160 1a096ab3ba71c5e7c0f2e654022255af8f30f4dc SHA1 9fc334b2a4d5b75a7457e56157f5b2a1537d8adb SHA256 79d3e87c52bebc2a6a7fb06fcd4fed4fe366aa8403615d3e60c9790068734fb4
 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-med-5.1.3.ebuild 3824 RMD160 4b1fa2beb4c1afa047428393997acc9e264a404d SHA1 fdf46ab845d952d5444e374cb5095c7351c94107 SHA256 cadec99cf8b5c8609575c2be8c8c19f5bf8bbac2fee4f9497047281334cc2167
-MISC ChangeLog 2644 RMD160 a5a9b7ea508c23f180a0ee473e6cc7e31bf5d526 SHA1 1592628adef96612d203768455ca305df34e89f0 SHA256 1cbe8cb1b646646853b313d3bd965e2dc601cee43b24024b8b3fb4a280d1080c
+EBUILD salome-med-5.1.4.ebuild 3869 RMD160 dfbe03227b3bde72ec08dad18356a79d2184085b SHA1 a9ebb07623d8b8ce9d2a5322516a440184ee803e SHA256 1f414c79119f015d1a91d2fa53a8b4b0ba243f447e05e3a4d0954cdc5b89dee2
+MISC ChangeLog 2971 RMD160 fedfd026bfdfb3bc8c76657e35a13925727c3777 SHA1 d10d91a3b13481dccf0acbd76e1f92bd7daf849e SHA256 8b86b200e26c0b74c1378c7ac7520bf8e0db0e9fbf693b54d33d1ecd1d8d92c3
 MISC metadata.xml 274 RMD160 81f0dbbb32fd2de80832c9872616b0a48b2d4c04 SHA1 72f2c4ce931ef27e7f913218049757f318f0415d SHA256 49d1680ffc0598f56db8198488dc66263eef05571d59bb3875e0a8858f54f5e4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwqWh0ACgkQgAnW8HDreRZLUACeKVEAtxSG/JpvAfkdTs+vtH30
-yf8AoIXIVLV0K2SgRsXFOyI/gPqZqbzi
-=/n4m
------END PGP SIGNATURE-----
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
new file mode 100644
index 000000000..a572ad6ae
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
@@ -0,0 +1,48 @@
+--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4.orig	2009-09-27 22:35:51.014701709 +0200
++++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4	2009-09-27 22:41:46.471297649 +0200
+@@ -28,6 +28,10 @@
+ 
+ METIS_CPPFLAGS=""
+ METIS_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*)  METIS_LIBSUFFIX="64" ;;
++*)        METIS_LIBSUFFIX="" ;;
++esac
+ METIS_LIBS=""
+ ENABLE_METIS="no"
+ 
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+ 
+ if test "x${METISDIR}" != "x" ; then
+-  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
+-  METIS_LIBS="-L${METISDIR} -lmetis"
++  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
++  METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
+ fi
+ 
+ metis_ok=no
+@@ -57,7 +61,7 @@
+ 
+ metis_include_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+-  AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
++  AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
+                 metis_include_dir_ok=yes,
+                 metis_include_dir_ok=no)
+ fi
+@@ -81,12 +85,12 @@
+   AC_CHECKING(for METIS binaries)
+   metis_lib_dir_ok=yes
+   if test "x${METISDIR}" != "x" ; then
+-    AC_CHECK_FILE(${METISDIR}/libmetis.a,
++    AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+                   metis_lib_dir_ok=yes,
+                   metis_lib_dir_ok=no)
+     if test "x${metis_lib_dir_ok}" = "xno" ; then
+       METIS_LIBSUFFIX=""
+-      AC_CHECK_FILE(${METISDIR}/libmetis.a,
++      AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+                     metis_lib_dir_ok=yes,
+                     metis_lib_dir_ok=no)
+     fi
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
new file mode 100644
index 000000000..bcf050914
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
@@ -0,0 +1,74 @@
+--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4.orig	2009-09-27 23:07:31.245061430 +0200
++++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4	2009-09-27 23:11:02.080868671 +0200
+@@ -28,6 +28,10 @@
+ 
+ SCOTCH_CPPFLAGS=""
+ SCOTCH_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*)  SCOTCH_LIBSUFFIX="64" ;;
++*)        SCOTCH_LIBSUFFIX="" ;;
++esac
+ SCOTCH_LIBS=""
+ ENABLE_SCOTCH="no"
+ 
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+ 
+ if test "x${SCOTCHDIR}" != "x" ; then
+-  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
+-  SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
++  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
++  SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
+ fi
+ 
+ scotch_ok=no
+@@ -57,14 +61,14 @@
+ 
+ scotch_include_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+-  AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
++  AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
+                 scotch_include_dir_ok=yes,
+                 scotch_include_dir_ok=no)
+ fi
+ 
+ if test "x${scotch_include_dir_ok}" = "xyes" ; then
+   AC_TRY_COMPILE([#include <stdio.h>
+-		  #include <bin/scotch.h>],
++		  #include <scotch.h>],
+                  [SCOTCH_Graph* graph;
+ 		  SCOTCH_graphInit(graph)],
+                  scotch_headers_ok=yes,
+@@ -83,12 +87,12 @@
+   AC_CHECKING(for SCOTCH binaries)
+   scotch_lib_dir_ok=yes
+   if test "x${SCOTCHDIR}" != "x" ; then
+-    AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++    AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+                   scotch_lib_dir_ok=yes,
+                   scotch_lib_dir_ok=no)
+     if test "x${scotch_lib_dir_ok}" = "xno" ; then
+       SCOTCH_LIBSUFFIX=""
+-      AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++      AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+                     scotch_lib_dir_ok=yes,
+                     scotch_lib_dir_ok=no)
+     fi
+@@ -96,7 +100,7 @@
+   if test "x${scotch_lib_dir_ok}" = "xyes" ; then
+     LIBS="${LIBS_old} ${SCOTCH_LIBS}"
+     AC_TRY_LINK([#include <stdio.h>
+-		#include <bin/scotch.h>],
++		#include <scotch.h>],
+                   [SCOTCH_Graph* graph;
+ 		  SCOTCH_graphInit(graph)],
+                 scotch_binaries_ok=yes,
+@@ -105,7 +109,7 @@
+       SCOTCH_LIBSUFFIX=""
+       LIBS="${LIBS_old} ${SCOTCH_LIBS} "
+       AC_TRY_LINK([#include <stdio.h>
+-		   #include <bin/scotch.h>],
++		   #include <scotch.h>],
+                   [SCOTCH_Graph* graph;
+ 		  SCOTCH_graphInit(graph)],
+                   scotch_binaries_ok=yes,
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
new file mode 100644
index 000000000..102cb913d
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
@@ -0,0 +1,11 @@
+--- ./src5.1.4.orig/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:14:50.721209673 +0100
++++ ./src5.1.4/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:15:35.420479255 +0100
+@@ -21,7 +21,7 @@
+ //
+ #include <med.h>
+ #include <string.h>
+-
++#include <stdlib.h>
+ 
+ /*****************************************************************************************************/
+ 
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
new file mode 100644
index 000000000..4045559d0
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
@@ -0,0 +1,11 @@
+--- src5.1.4.orig/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2008-12-10 10:14:43.000000000 +0100
++++ src5.1.4/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2009-09-27 23:26:59.010112791 +0200
+@@ -19,7 +19,7 @@
+ #include <cstdio>
+ extern "C" {
+ #define restrict
+-#include "bin/scotch.h"
++#include "scotch.h"
+ }
+ #include "MEDSPLITTER_Graph.hxx"
+ #include "MEDSPLITTER_SCOTCHGraph.hxx"
diff --git a/sci-misc/salome-med/salome-med-5.1.4.ebuild b/sci-misc/salome-med/salome-med-5.1.4.ebuild
new file mode 100644
index 000000000..c90ef8ea0
--- /dev/null
+++ b/sci-misc/salome-med/salome-med-5.1.4.ebuild
@@ -0,0 +1,127 @@
+# 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 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://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc mpi metis opengl scotch"
+
+RDEPEND="opengl? ( virtual/opengl )
+		 mpi?    ( || ( sys-cluster/openmpi[cxx]
+		 				sys-cluster/mpich2[cxx] ) )
+		 debug?  ( dev-util/cppunit )
+		 metis?	 ( >=sci-libs/metis-4.0 )
+		 scotch? ( >=sci-libs/scotch-4.0 )
+		 >=sci-misc/salome-kernel-${PV}
+		 >=sci-misc/salome-gui-${PV}
+		 >=x11-libs/qt-core-4.5.2
+		 >=x11-libs/qt-gui-4.5.2
+		 >=x11-libs/qt-opengl-4.5.2
+		 >=dev-libs/boost-1.40.0
+		 >=sci-libs/opencascade-6.3
+		 >=sci-libs/med-2.3.5
+		 >=sci-libs/vtk-5.0[python]"
+
+DEPEND="${RDEPEND}
+		dev-lang/swig
+		dev-libs/libxml2"
+
+MODULE_NAME="MED"
+S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+
+pkg_setup() {
+	[[ $(python_get_version) > 2.4 ]] && \
+		ewarn "Python 2.4 is highly recommended for Salome..."
+	python_set_active_version 2
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	use mpi && epatch "${FILESDIR}"/${P}-mpi.patch
+	use metis && epatch "${FILESDIR}"/${P}-check_metis.patch
+	if use scotch; then
+		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
+	./build_configure
+}
+
+src_configure() {
+	local myconf=""
+	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"
+	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
+
+#   --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
+
+	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$(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} \
+	      ${myconf} \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with debug cppunit_inc /usr/include/cppunit) \
+	      $(use_with opengl opengl /usr) \
+	      $(use_with metis metis /usr) \
+	      $(use_with scotch scotch /usr) \
+	|| die "econf failed"
+}
+
+src_install() {
+	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$(python_get_version)/site-packages/salome" >> ./90${P}
+	doenvd 90${P}
+	rm adm_local/Makefile
+	insinto "${INSTALL_DIR}"
+	doins -r adm_local
+
+	use doc && dodoc INSTALL README
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+}