diff options
Diffstat (limited to 'sci-misc/salome-med')
17 files changed, 0 insertions, 1284 deletions
diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog deleted file mode 100644 index ac7206dcf..000000000 --- a/sci-misc/salome-med/ChangeLog +++ /dev/null @@ -1,77 +0,0 @@ -# ChangeLog for sci-misc/salome-med -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Id$ - - 03 Mar 2013; Justin Lecher <jlec@gentoo.org> salome-med-5.1.3.ebuild, - salome-med-5.1.4.ebuild, metadata.xml: - Update to new qt deps names - - 10 Feb 2012; Alexey Shvetsov <alexxy@gentoo.org> salome-med-5.1.3.ebuild, - salome-med-5.1.4.ebuild: - [sci-misc/salome*] Fix python depend - - 07 Mar 2011; Justin Lecher <jlec@gentoo.org> salome-med-5.1.3.ebuild, - salome-med-5.1.4.ebuild: - Correct Slots for gtk 3 introduction to tree - -*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 - - 04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> - salome-med-5.1.3.ebuild, +files/salome-med-5.1.3-med_int.patch: - changed fetch URL + cleaning - new patch to (partially) solve typedef long med_int issues on amd64: - http://bugs.gentoo.org/show_bug.cgi?id=155974#c525 - -*salome-med-5.1.3 (14 Mar 2010) - - 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com> - -salome-med-3.2.6.ebuild, -files/salome-med-3.2.6-gcc-4.3.patch, - -files/salome-med-3.2.6-hdf5-1.6.7.patch, - -files/salome-med-3.2.6_boost-1.35.patch, - -files/salome-med-3.2.6_environ.patch, -files/salome-med-3.2.6_gcc4.patch, - -files/salome-med-3.2.6.patch, +salome-med-5.1.3.ebuild, - +files/salome-med-5.1.3-check_metis.patch, - +files/salome-med-5.1.3-check_scotch.patch, - +files/salome-med-5.1.3-gcc.patch, +files/salome-med-5.1.3-mpi.patch, - +files/salome-med-5.1.3-qt4-path.patch, - +files/salome-med-5.1.3-scotch.patch, metadata.xml: - Version bump 5.1.3 + removed broken 3.2.6 - - 03 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-med-3.2.6.ebuild, metadata.xml: - Reordered dependencies - - 25 October 2008; Daniel Tourde <daniel.tourde@caelae.se> - +salome-med-3.2.6-hdf5-1.6.7.patch - Patch provided by Bert Karwatzki <spasswolf@web.de> - - 05 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-med-3.2.6.ebuild, +files/salome-med-3.2.6_boost-1.35.patch: - Added patch for >=dev-libs/boost-1.35.0 - - 04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-med-3.2.6.ebuild: - removed omniorb* dependencies, as they are already in salome-kernel - - 27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de> - salome-med-3.2.6.ebuild, -Changelog, +metadata.xml: - Removed fetch restriction, removed hardcode - - 29 May 2008; Daniel Tourde <daniel.tourde@caelae.se> - +salome-med-3.2.6-gcc-4.3.patch - Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de> - - 20 May 2008; Daniel Tourde <daniel.tourde@caelae.se> - Initial import. - +salome-med-3.2.6.ebuild, +salome-med-3.2.6_environ.patch, +salome-med-3.2.6_gcc4.patch, +salome-med-3.2.6.patch - A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> 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-med/Manifest b/sci-misc/salome-med/Manifest deleted file mode 100644 index 7914a3ca2..000000000 --- a/sci-misc/salome-med/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST src5.1.3.tar.gz 106470135 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b -DIST src5.1.4.tar.gz 120063320 SHA256 dd59384ad4fbbbe49c72e946eed9e0f6144a01c799efab62033113a3db46eeae diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch deleted file mode 100644 index c133b7f37..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200 -+++ src5.1.3/MED_SRC_5.1.3/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.3-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch deleted file mode 100644 index 64c8bb2d8..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200 -+++ src5.1.3/MED_SRC_5.1.3/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.3-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch deleted file mode 100644 index 15e349204..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:18:07.064072621 +0100 -+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:19:44.920271906 +0100 -@@ -23,6 +23,7 @@ - #include <cmath> - #include <list> - #include <stdexcept> -+#include <cstdlib> - - //================================================================================ - /*! ---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:18:07.102331566 +0100 -+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:24:44.300321009 +0100 -@@ -21,7 +21,7 @@ - #include <map> - #include <iostream> - #include <mpi.h> --#include <time.h> -+#include <ctime> - - #include "MPIAccessDECTest.hxx" - #include <cppunit/TestAssert.h> ---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:18:07.084009650 +0100 -+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:25:22.930322599 +0100 -@@ -22,7 +22,7 @@ - #include <map> - #include <iostream> - #include <mpi.h> --#include <time.h> -+#include <ctime> - - #include "MPIAccessDECTest.hxx" - #include <cppunit/TestAssert.h> ---- ./src5.1.3.orig/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100 -+++ ./src5.1.3/MED_SRC_5.1.3/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.3-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch deleted file mode 100644 index 6db1510a4..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:07:56.860301255 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:33:59.740251721 +0100 -@@ -189,7 +189,7 @@ - - int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, - joint_description, -- &distant, name_distant); -+ (med_int*)&distant, name_distant); - - for (int ic=0; ic<ncorr; ic++) - { -@@ -209,7 +209,7 @@ - { - - med_2_3::MEDjointLire(fid, meshname, name, -- node_corresp,ncouples, -+ (med_int*)node_corresp,ncouples, - cor_typent_local, cor_typgeo_local, - cor_typent_dist, cor_typgeo_dist - ); -@@ -247,7 +247,7 @@ - if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - } -@@ -259,7 +259,7 @@ - int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes(); - { - int* array=new int[nnode]; -- med_2_3::MEDglobalNumLire(fid,meshname, array, nnode, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - nodeglobal[idomain]=array; - } -@@ -280,7 +280,7 @@ - - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - } -@@ -348,7 +348,7 @@ - jointSort(node_corresp, nbnodes, false); - - error= -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes, -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - if (error==-1) cout << "erreur creation de joint "<<endl; - -@@ -388,7 +388,7 @@ - if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - -@@ -426,7 +426,7 @@ - - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - - offset+=ntype; -@@ -443,7 +443,7 @@ - - m_collection->getTopology()->getNodeList(idomain,array); - -- med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - - delete[] array; -@@ -507,7 +507,7 @@ - corresp.push_back(value[icol]); - } - int size_joint = corresp.size()/2; -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], - size_joint, med_2_3::MED_MAILLE, - (med_2_3::med_geometrie_element)local_type ,med_2_3::MED_MAILLE, - (med_2_3::med_geometrie_element)distant_type ); -@@ -541,7 +541,7 @@ - med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second; - int size_joint=size/2; - //med_2_3::med_err error = -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE, -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE, - local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem); - delete[] corresp; - } -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:07:56.624073897 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:42:31.140322486 +0100 -@@ -34,6 +34,7 @@ - - #include <vector> - #include <set> -+#include <med.h> - - //***************************************************************************** - // Some useful macros -@@ -46,7 +47,7 @@ - * Pair of index. - * See definition of GaussIndexList. - */ --typedef std::pair < std::set<int>*, std::set<int> > IndexPair; -+typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair; - - /** - * List of gauss index for optimized domain split. -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:07:55.512824126 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:23:57.950316309 +0100 -@@ -169,11 +169,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - ret[i]=cur; - delete [] attdes; -@@ -196,11 +196,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - for(int j=0;j<ngro;j++) - { - std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM); -@@ -446,11 +446,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - if(std::find(fams.begin(),fams.end(),cur)!=fams.end()) - ret.push_back(numfam); -@@ -474,11 +474,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - for(int j=0;j<ngro;j++) - { -@@ -566,12 +566,12 @@ - MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1); - int *tmp=new int[curNbOfElem]; - char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1]; -- MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD); -+ MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD); - delete [] tmp; - delete [] noms; - //trying to read global numbering - int *globArr=new int[curNbOfElem]; -- if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0) -+ if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0) - elem.setGlobal(globArr); - else - delete [] globArr; -@@ -590,9 +590,9 @@ - int *index=new int[curNbOfPolyElem+1]; - int *locConn=new int[arraySize]; - int *fam=new int[curNbOfPolyElem]; -- MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize); -- MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD); -- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); -+ MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize); -+ MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD); -+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); - conn.push_back(elem); - } - curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD); -@@ -604,8 +604,8 @@ - int *indexFace=new int[indexFaceLgth]; - int *locConn=new int[connFaceLgth]; - int *fam=new int[curNbOfPolyElem]; -- MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD); -- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); -+ MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD); -+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); - int arraySize=connFaceLgth; - for(int i=0;i<curNbOfPolyElem;i++) - arraySize+=index[i+1]-index[i]-1; -@@ -1051,11 +1051,11 @@ - std::vector<int> medConnIndex2; - int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2); - if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE) -- MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); -+ MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); - else - { - if(curMedType==MED_POLYGONE) -- MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD); -+ MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD); - } - } - } ---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:24:36.370545867 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:30:11.329293723 +0100 -@@ -300,8 +300,8 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0); - CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0); - CPPUNIT_ASSERT_EQUAL(dom1,1); -@@ -467,8 +467,8 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - -@@ -548,7 +548,7 @@ - //testing cells global numbering - num = new med_2_3::med_int[2]; - MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc); -- med_2_3::med_int* globcellref = new int[2]; -+ med_2_3::med_int* globcellref = new med_int[2]; - globcellref[0]=1; - globcellref[1]=3; - -@@ -773,10 +773,10 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC]; - char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; -- //int dom1, dom2; -- med_2_3::med_int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ int dom1, dom2; -+// med_2_3::med_int dom1, dom2; -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - -@@ -1143,8 +1143,8 @@ - char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1]; - char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch deleted file mode 100644 index a4dc19909..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:42:49.442822826 +0100 -+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:43:38.710252330 +0100 -@@ -39,8 +39,8 @@ - void addElementFromSource(int distant_proc, int distant_elem); - void prepareSendRecv(); - void sendRecv(MEDCouplingFieldDouble& field); -- void sendRecv(double* field, MEDCouplingFieldDouble& field) const ; -- void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ; -+ void sendRecv(double* sendfield, MEDCouplingFieldDouble& field) const ; -+ void reverseSendRecv(double* recvfield, MEDCouplingFieldDouble& field) const ; - - // - const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; } diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch deleted file mode 100644 index 0737e67bf..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src5.1.3.orig/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100 -+++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100 -@@ -333,7 +333,7 @@ - - LIBS_old=$LIBS - if test "x$QTDIR" = "x/usr" ; then -- QT_LIB_DIR="" -+ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4" - elif test -d ${QTDIR}/lib; then - QT_LIB_DIR="-L$QTDIR/lib" - elif test -d ${QTDIR}/lib64; then diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch deleted file mode 100644 index 0cfcaf708..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100 -+++ src5.1.3/MED_SRC_5.1.3/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/files/salome-med-5.1.4-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch deleted file mode 100644 index a572ad6ae..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- 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 deleted file mode 100644 index bcf050914..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- 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 deleted file mode 100644 index 102cb913d..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.4-med_int.patch deleted file mode 100644 index 6db1510a4..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.4-med_int.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:07:56.860301255 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx 2010-03-15 17:33:59.740251721 +0100 -@@ -189,7 +189,7 @@ - - int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, - joint_description, -- &distant, name_distant); -+ (med_int*)&distant, name_distant); - - for (int ic=0; ic<ncorr; ic++) - { -@@ -209,7 +209,7 @@ - { - - med_2_3::MEDjointLire(fid, meshname, name, -- node_corresp,ncouples, -+ (med_int*)node_corresp,ncouples, - cor_typent_local, cor_typgeo_local, - cor_typent_dist, cor_typgeo_dist - ); -@@ -247,7 +247,7 @@ - if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - } -@@ -259,7 +259,7 @@ - int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes(); - { - int* array=new int[nnode]; -- med_2_3::MEDglobalNumLire(fid,meshname, array, nnode, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - nodeglobal[idomain]=array; - } -@@ -280,7 +280,7 @@ - - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype, -+ med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - } -@@ -348,7 +348,7 @@ - jointSort(node_corresp, nbnodes, false); - - error= -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes, -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - if (error==-1) cout << "erreur creation de joint "<<endl; - -@@ -388,7 +388,7 @@ - if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue; - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - offset+=ntype; - -@@ -426,7 +426,7 @@ - - int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type); - if (ntype==0) continue; -- med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype, - med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type); - - offset+=ntype; -@@ -443,7 +443,7 @@ - - m_collection->getTopology()->getNodeList(idomain,array); - -- med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode, -+ med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode, - med_2_3::MED_NOEUD, med_2_3::MED_POINT1); - - delete[] array; -@@ -507,7 +507,7 @@ - corresp.push_back(value[icol]); - } - int size_joint = corresp.size()/2; -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], - size_joint, med_2_3::MED_MAILLE, - (med_2_3::med_geometrie_element)local_type ,med_2_3::MED_MAILLE, - (med_2_3::med_geometrie_element)distant_type ); -@@ -541,7 +541,7 @@ - med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second; - int size_joint=size/2; - //med_2_3::med_err error = -- med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE, -+ med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE, - local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem); - delete[] corresp; - } -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:07:56.624073897 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx 2010-03-15 17:42:31.140322486 +0100 -@@ -34,6 +34,7 @@ - - #include <vector> - #include <set> -+#include <med.h> - - //***************************************************************************** - // Some useful macros -@@ -46,7 +47,7 @@ - * Pair of index. - * See definition of GaussIndexList. - */ --typedef std::pair < std::set<int>*, std::set<int> > IndexPair; -+typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair; - - /** - * List of gauss index for optimized domain split. -diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx ---- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:07:55.512824126 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx 2010-03-15 17:23:57.950316309 +0100 -@@ -169,11 +169,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - ret[i]=cur; - delete [] attdes; -@@ -196,11 +196,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - for(int j=0;j<ngro;j++) - { - std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM); -@@ -446,11 +446,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - if(std::find(fams.begin(),fams.end(),cur)!=fams.end()) - ret.push_back(numfam); -@@ -474,11 +474,11 @@ - { - int ngro=MEDnGroupe(fid,(char *)meshName,i+1); - med_int natt=MEDnAttribut(fid,(char *)meshName,i+1); -- med_int *attide=new int[natt]; -- med_int *attval=new int[natt]; -+ med_int *attide=new med_int[natt]; -+ med_int *attval=new med_int[natt]; - char *attdes=new char[MED_TAILLE_DESC*natt+1]; - char *gro=new char[MED_TAILLE_LNOM*ngro+1]; -- MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro); -+ MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro); - std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam)); - for(int j=0;j<ngro;j++) - { -@@ -566,12 +566,12 @@ - MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1); - int *tmp=new int[curNbOfElem]; - char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1]; -- MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD); -+ MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD); - delete [] tmp; - delete [] noms; - //trying to read global numbering - int *globArr=new int[curNbOfElem]; -- if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0) -+ if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0) - elem.setGlobal(globArr); - else - delete [] globArr; -@@ -590,9 +590,9 @@ - int *index=new int[curNbOfPolyElem+1]; - int *locConn=new int[arraySize]; - int *fam=new int[curNbOfPolyElem]; -- MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize); -- MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD); -- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); -+ MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize); -+ MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD); -+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE); - conn.push_back(elem); - } - curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD); -@@ -604,8 +604,8 @@ - int *indexFace=new int[indexFaceLgth]; - int *locConn=new int[connFaceLgth]; - int *fam=new int[curNbOfPolyElem]; -- MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD); -- MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); -+ MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD); -+ MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE); - int arraySize=connFaceLgth; - for(int i=0;i<curNbOfPolyElem;i++) - arraySize+=index[i+1]-index[i]-1; -@@ -1051,11 +1051,11 @@ - std::vector<int> medConnIndex2; - int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2); - if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE) -- MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); -+ MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD); - else - { - if(curMedType==MED_POLYGONE) -- MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD); -+ MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD); - } - } - } ---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:24:36.370545867 +0100 -+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx 2010-03-21 20:30:11.329293723 +0100 -@@ -300,8 +300,8 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0); - CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0); - CPPUNIT_ASSERT_EQUAL(dom1,1); -@@ -467,8 +467,8 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - -@@ -548,7 +548,7 @@ - //testing cells global numbering - num = new med_2_3::med_int[2]; - MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc); -- med_2_3::med_int* globcellref = new int[2]; -+ med_2_3::med_int* globcellref = new med_int[2]; - globcellref[0]=1; - globcellref[1]=3; - -@@ -773,10 +773,10 @@ - char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM]; - char desc2[MED_TAILLE_DESC]; - char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM]; -- //int dom1, dom2; -- med_2_3::med_int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ int dom1, dom2; -+// med_2_3::med_int dom1, dom2; -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - -@@ -1143,8 +1143,8 @@ - char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1]; - char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1]; - int dom1, dom2; -- med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1); -- med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2); -+ med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1); -+ med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2); - CPPUNIT_ASSERT_EQUAL(dom1,1); - CPPUNIT_ASSERT_EQUAL(dom2,0); - 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 deleted file mode 100644 index 4045559d0..000000000 --- a/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/metadata.xml b/sci-misc/salome-med/metadata.xml deleted file mode 100644 index 25c2ffe82..000000000 --- a/sci-misc/salome-med/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <use> - <flag name="metis">Add support for metis</flag> - <flag name="scotch">Add support for scotch</flag> - </use> -</pkgmetadata> diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild deleted file mode 100644 index 23fb90f83..000000000 --- a/sci-misc/salome-med/salome-med-5.1.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -PYTHON_DEPEND="2:2.5" - -inherit eutils flag-o-matic python - -DESCRIPTION="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 metis mpi opengl scotch" - -RDEPEND=" - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - >=dev-qt/qtcore-4.5.2 - >=dev-qt/qtgui-4.5.2 - >=dev-qt/qtopengl-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] - debug? ( dev-util/cppunit ) - metis? ( >=sci-libs/metis-4.0 ) - mpi? ( || ( - sys-cluster/openmpi[cxx] - sys-cluster/mpich2[cxx] - ) ) - opengl? ( virtual/opengl ) - scotch? ( >=sci-libs/scotch-4.0 )" - -DEPEND="${RDEPEND} - dev-lang/swig - dev-libs/libxml2:2" - -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 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-qt4-path.patch - 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" - -# --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 "" -} diff --git a/sci-misc/salome-med/salome-med-5.1.4.ebuild b/sci-misc/salome-med/salome-med-5.1.4.ebuild deleted file mode 100644 index 5937eb093..000000000 --- a/sci-misc/salome-med/salome-med-5.1.4.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -PYTHON_DEPEND="2:2.5" - -inherit eutils flag-o-matic python - -DESCRIPTION="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 metis mpi opengl scotch" - -RDEPEND=" - >=sci-misc/salome-kernel-${PV} - >=sci-misc/salome-gui-${PV} - >=dev-qt/qtcore-4.5.2 - >=dev-qt/qtgui-4.5.2 - >=dev-qt/qtopengl-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] - debug? ( dev-util/cppunit ) - metis? ( >=sci-libs/metis-4.0 ) - mpi? ( || ( - sys-cluster/openmpi[cxx] - sys-cluster/mpich2[cxx] - ) ) - opengl? ( virtual/opengl ) - scotch? ( >=sci-libs/scotch-4.0 )" -DEPEND="${RDEPEND} - dev-lang/swig - dev-libs/libxml2:2" - -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 "" -} |