Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/
Date: Mon, 22 Feb 2016 08:38:26
Message-Id: 1456130191.77890639257266037035bd07c0edebd3a7e6b26d.jlec@gentoo
1 commit: 77890639257266037035bd07c0edebd3a7e6b26d
2 Author: Grégory Salvan <apieum <AT> gmail <DOT> com>
3 AuthorDate: Sun Feb 21 20:38:46 2016 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 22 08:36:31 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=77890639
7
8 Added includes fixes patch
9
10 .../netgen/files/netgen-5.x-includes-fixes.patch | 29 ++++++++++++++++++++++
11 sci-mathematics/netgen/netgen-5.3.1.ebuild | 1 +
12 2 files changed, 30 insertions(+)
13
14 diff --git a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
15 new file mode 100644
16 index 0000000..650b575
17 --- /dev/null
18 +++ b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
19 @@ -0,0 +1,29 @@
20 +diff -uwrN -x.git netgen-5.3.1/libsrc/include/meshing.hpp netgen/libsrc/include/meshing.hpp
21 +--- netgen-5.3.1/libsrc/include/meshing.hpp 2016-02-21 20:12:55.885186643 +0100
22 ++++ netgen/libsrc/include/meshing.hpp 2016-02-21 20:09:26.275180871 +0100
23 +@@ -1 +1 @@
24 +-#include <../meshing/meshing.hpp>
25 ++#include "../meshing/meshing.hpp"
26 +diff -uwrN -x.git netgen-5.3.1/libsrc/include/myadt.hpp netgen/libsrc/include/myadt.hpp
27 +--- netgen-5.3.1/libsrc/include/myadt.hpp 2016-02-21 20:12:55.886186643 +0100
28 ++++ netgen/libsrc/include/myadt.hpp 2016-02-21 20:09:26.275180871 +0100
29 +@@ -1 +1 @@
30 +-#include <../general/myadt.hpp>
31 ++#include "../general/myadt.hpp"
32 +diff -uwrN -x.git netgen-5.3.1/libsrc/include/stlgeom.hpp netgen/libsrc/include/stlgeom.hpp
33 +--- netgen-5.3.1/libsrc/include/stlgeom.hpp 2016-02-21 20:12:55.886186643 +0100
34 ++++ netgen/libsrc/include/stlgeom.hpp 2016-02-21 20:09:26.275180871 +0100
35 +@@ -1 +1 @@
36 +-#include <../stlgeom/stlgeom.hpp>
37 ++#include "../stlgeom/stlgeom.hpp"
38 +diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen/libsrc/meshing/parallelmesh.cpp
39 +--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:12:55.888186643 +0100
40 ++++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:09:26.276180871 +0100
41 +@@ -1,6 +1,6 @@
42 + #ifdef PARALLEL
43 +
44 +-#include <meshing.hpp>
45 ++#include "meshing.hpp"
46 + #include "paralleltop.hpp"
47 +
48 + // #define METIS4
49
50 diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
51 index 4cc2cd9..d3cf9f9 100644
52 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
53 +++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
54 @@ -43,6 +43,7 @@ src_prepare() {
55 epatch "${FILESDIR}/${PN}-5.3.1_build.patch"
56 # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
57 epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
58 + epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
59 if use mpi; then
60 export CC=mpicc
61 export CXX=mpic++