[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     4a0832f4a3fbc03195c3f9a2bbadde48c40b58a4
Author:     Grégory Salvan <apieum <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 22:26:59 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a0832f4

merge parallelmesh.cpp patches

 ...dora-metis.patch => netgen-5.x-metis-fixes.patch} | 15 ++++++++++++---
 .../netgen/files/netgen-5.x-metis-numflag.patch      | 20 --------------------
 sci-mathematics/netgen/netgen-5.3.1.ebuild           |  5 ++---
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
similarity index 85%
rename from sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
rename to sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
index 68b3396..cf59613 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
@@ -1,5 +1,5 @@
---- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp	2016-02-20 21:55:59.227450843 +0100
-+++ ./netgen/libsrc/meshing/parallelmesh.cpp	2016-02-20 21:46:32.331435233 +0100
+--- netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp	2014-08-29 11:54:05.000000000 +0200
++++ netgen/libsrc/meshing/parallelmesh.cpp	2016-02-20 23:07:00.350568182 +0100
 @@ -14,7 +14,7 @@
  
  #if METIS_VER_MAJOR >= 5
@@ -47,6 +47,15 @@
  	BubbleSort(array);
        }
  
+@@ -1318,7 +1318,7 @@
+     idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
+ 
+     int weightflag = 0;
+-    // int numflag = 0;
++    int numflag = 0;
+     int nparts = ntasks - 1;
+ 
+     int options[5];
 @@ -1377,7 +1377,7 @@
  
      for ( int el = 0; el < ne; el++ )
@@ -72,7 +81,7 @@
      idxtype *v_weights = NULL, *e_weights = NULL;
  
 -    int weightflag = 0;
--    int numflag = 0;
+-    // int numflag = 0;
 -    int nparts = ntasks - 1;
 +    metis::idx_t weightflag = 0;
 +    metis::idx_t numflag = 0;

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
deleted file mode 100644
index 9e5ba88..0000000
--- a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libsrc/meshing/parallelmesh.cpp	2014-08-29 11:54:05.000000000 +0200
-+++ libsrc/meshing/parallelmesh.cpp	2016-02-11 19:12:14.474185736 +0100
-@@ -1318,7 +1318,7 @@
-     idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
-
-     int weightflag = 0;
--    // int numflag = 0;
-+    int numflag = 0;
-     int nparts = ntasks - 1;
-
-     int options[5];
-@@ -1485,7 +1485,7 @@
-     idxtype *v_weights = NULL, *e_weights = NULL;
-
-     int weightflag = 0;
--    // int numflag = 0;
-+    int numflag = 0;
-     int nparts = ntasks - 1;
-
-     int edgecut;

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index cf09c82..0c2da7d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -35,9 +35,8 @@ src_prepare() {
 	default
 	# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
 	epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
-	epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
-	# Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
-	epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch"
+	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
+	epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
 	epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
 	if use mpi; then
 		export CC=mpicc