sci-libs/colpack: Fix compilation with gcc-4.9, #514534

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 35 insertions, 4 deletions

diff --git a/sci-libs/colpack/ChangeLog b/sci-libs/colpack/ChangeLog
index 9144beaab048..3a4f5811a41b 100644
--- a/sci-libs/colpack/ChangeLog
+++ b/sci-libs/colpack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/colpack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/colpack/ChangeLog,v 1.5 2014/04/05 23:19:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colpack/ChangeLog,v 1.6 2014/11/09 13:53:09 jlec Exp $
+
+  09 Nov 2014; Justin Lecher <jlec@gentoo.org> colpack-1.0.9.ebuild,
+  +files/colpack-1.0.9-fix_gcc49_omp.patch, metadata.xml:
+  Fix compilation with gcc-4.9, #514534
 
 *colpack-1.0.9 (05 Apr 2014)
 
diff --git a/sci-libs/colpack/colpack-1.0.9.ebuild b/sci-libs/colpack/colpack-1.0.9.ebuild
index 02253e39aef0..6401deba1671 100644
--- a/sci-libs/colpack/colpack-1.0.9.ebuild
+++ b/sci-libs/colpack/colpack-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/colpack/colpack-1.0.9.ebuild,v 1.1 2014/04/05 23:19:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colpack/colpack-1.0.9.ebuild,v 1.2 2014/11/09 13:53:09 jlec Exp $
 
 EAPI=5
 
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.6-flags.patch
 	"${FILESDIR}"/${PN}-1.0.8-no-bin.patch
+	"${FILESDIR}"/${P}-fix_gcc49_omp.patch
 )
 
 pkg_setup() {
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch b/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
new file mode 100644
index 000000000000..0510be9f90ef
--- /dev/null
+++ b/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
@@ -0,0 +1,26 @@
+Index: ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
+===================================================================
+--- ColPack-1.0.9.orig/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
++++ ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
+@@ -388,8 +388,9 @@ namespace ColPack
+ 					  if ( m_vi_LeftVertexColors [m_vi_Edges [x]] == m_vi_LeftVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
+ 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
+ #pragma omp critical
++							{
+ 							vi_verticesNeedNewColor.push_back(v);
+-#pragma omp end critical
++							}
+ 							cont = false;
+ 							break;
+ 						}
+@@ -575,8 +576,9 @@ namespace ColPack
+ 					  if ( m_vi_RightVertexColors [m_vi_Edges [x]] == m_vi_RightVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
+ 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
+ #pragma omp critical
++							{
+ 							vi_verticesNeedNewColor.push_back(v);
+-#pragma omp end critical
++							}
+ 							cont = false;
+ 							break;
+ 						}
diff --git a/sci-libs/colpack/metadata.xml b/sci-libs/colpack/metadata.xml
index 25cc889c594a..97c2ff62782c 100644
--- a/sci-libs/colpack/metadata.xml
+++ b/sci-libs/colpack/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   ColPack is a package comprising of implementations of algorithms for
   the specialized vertex coloring problems as well as algorithms for a
   variety of related supporting tasks in derivative computation.