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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 39 insertions, 7 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/Manifest b/sci-libs/colpack/Manifest
index b59f9c129092..f530c1d5cc80 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,10 +1,11 @@
 AUX colpack-1.0.6-flags.patch 408 SHA256 2a0e0321d7fd3b30a2fee3c8ecbfb3cef7ae1ca75f47d898fe99618216849e4d SHA512 5a614971ea0bb9da829596b352c59455b2a6d892cd96ffd68c5dd6a0f7aea63e35c2fda911a050df55d37109337cb95e52f1bab12174681f964c59c9e0721723 WHIRLPOOL 6ee703a74ff0a9214457b8ffbb0c2ba453eddbb82604a11ba4dcf062d2a36eb4ea47156c138048ca2068d7dab178c7427deeb7c11e15faceba23b3209521f9b8
 AUX colpack-1.0.8-no-bin.patch 510 SHA256 d0e2a71cb7654d19156847c3107a874d875f3c5e55c6f5eeda23b6d7c59edd76 SHA512 6601ece1f23aa0c8c9f63f3ffb6c31270e79d5362294c6ce1c4f4da0189c331768675b8e434a346e5dbe8e6fc390d2706320602609bff736d2d62c1d54dd0a60 WHIRLPOOL 153dd958558c867e2a13814443e4374d74c9046dc90b7f5d61c789c7f2d212c521098da7a2b112023e7583ceba45947c52ed39bc36beb51ebf8155356f7d6ef7
+AUX colpack-1.0.9-fix_gcc49_omp.patch 1072 SHA256 12c5b9d008e1eef0b63722870e1cbf9bba1f00472a9d35aa9e6e9c452b8c2771 SHA512 702bf542933b59c3fa086595aaf2e680041faae87909b58664a76d60a15e4136cc101a571cc0596277f734be46660a683107a68fbddde4af0c42c39beebe0e77 WHIRLPOOL 2f35c174c2d4465e5c554eac814093fc0ea760ed287227f03bf8bfed704f0c73e0181097dd0a67c199b29f8a36f93311711e96bea580d6ed8fca050220f5a487
 DIST ColPack-1.0.6.tar.gz 1027189 SHA256 d03208883aaa48544124c7fa950c2ea1aa88bc38c7997c4a563b176b6bc212ea SHA512 646ffdd459c40906f6c57888c0e38b791f9559a88ce649e9041271655a9d98658db1c6c0f3b09d64b9bd2c7d74c71a6bd8b13972ae7c7bbac42b300b8e3844c9 WHIRLPOOL 80e5c7f368b362bf4dda84661b364fa1f55215446339fec98bce5dfd7a7dcffc97a79c73329d0a721f012c7bc6651626f6ed5b1f5e284c1b540bcf047d0178b7
 DIST ColPack-1.0.8.tar.gz 1213739 SHA256 4668e34318dc63c93dea9bc90938e1bfa738d0e323c909f89df388a4feddc41d SHA512 c059ab353ea229e73c9bc40cc4778db6852929b51d8d90f1e2c95fb66d0264622b3b6a54eecc1c9f4419d9f31578c83b7a62e4844e26ad23621d4e8c332bfff4 WHIRLPOOL dfc481b3fe79bcfbe796e5f40e52795ad1b7d2f15752dcc5972da93c865793ecd89bc87a4108736bf5b6db62d707d740a62b1c1f5f9321d92764616c804d1f9e
 DIST ColPack-1.0.9.tar.gz 1185335 SHA256 06c5d3e61ab873b27d7962a9f09e90cbc52ccd9f480e88f1ecb50e6bced11932 SHA512 762ab506f95788f9134033b60bf582472b80ab14766ad6795a7db1b780de0ae49bb30f1c9bd74b4f62cf46cc6029c37ef90a483e41b62bf4067cd4a71eb3db6c WHIRLPOOL f84e1766350265c3ecfb43d827327a018218be342f22adbd5f95d7172b9b489c12ed3978796b9c9d70b69058d88816ed6cb5979217ccca16c7691ecccedc3a51
 EBUILD colpack-1.0.6.ebuild 991 SHA256 363268667f84b64412d4787745155eaa8d101673c44003965c57cf9f7dadc3aa SHA512 65065746730b1bfb3ce33ea3a0e51097e5c6f40213687ac0d08b1dd676c9abff00886c4be5b310ef250015b857d18c49583ccbddbf691a1887c26ed8cf7694e3 WHIRLPOOL db4f6de47d8a95b26010e4eacfde8f6d57a1a0dca021f7f34191f1ee73db178f8c428be5806425bb2edf201612c87c17c11020b81c0cfe05f79c7ae650153a18
 EBUILD colpack-1.0.8.ebuild 1079 SHA256 64c515de748097c6f4de89b6d2c50a1b86c3c6dd2768d0467d87aff8d882429c SHA512 78ff51dd9ca841fdcfa92b0fe5ce4389238f1030b4a9ad248324ece38e3e0f9aa59f3155a2e28f1aa3d7f82e09761ccc03075d5c6018c8ec7cb48455459a46fd WHIRLPOOL 9bdd39bca1e343a1de5ad593a8b5f65c3e1e503f2cfcfb57792fd4e2c10bfdb1ac1cb258ee0b7fc36f480376c9dbd30340119c20c3e42c9e8b608ac9e74ae87f
-EBUILD colpack-1.0.9.ebuild 1082 SHA256 f401f61115ecd5ed7a73cb959bf8d188b35acd42f52a504aa74e7f7a5a488a00 SHA512 c09c1e4704bdb69e43770210df5e25925a3e64b9a7482ff3b8ab01746214ebebc9bc152f8e3af9c65252113698c6329241543e0dd51b2f144cc66fd119d8f916 WHIRLPOOL 17226b86733b4c60448cfe0b00c70dce61bd93a6421a86d5e36e5b2888b9bd261cb410a39d8629a5a5efb1bb8b7d1e87db48ae094702d83be779749c8266d201
-MISC ChangeLog 955 SHA256 1c45443f6df3150c289dff4ea33211b9e7a212dc3348cbfa0e5a6a2d7346ac6b SHA512 54dbe804025b60f7fcf2d73535ae90f097c92ad1561cf08f415cb13b1572e49fd8b07f351869f82a83cdfa0faae0e5ca7c8453c0f59ab3acc9d56e4112b659fb WHIRLPOOL 186cee7b0c2b895d77799ecbf416a7892db1b1d1538ca25f90d1e50db31f9c3b39773c191ab3ea8c92ae15e593ee7703c8a743da98b51982b8e35f81dc349789
-MISC metadata.xml 410 SHA256 2b1542b77073f74731770979f8c15f327c775de315ee2a88cc5afac13569ad49 SHA512 421bc9905285931fecd6228ebd5741474d901554139141c004820eecb1db0f7c50204d085c2fbb1be5fbfa8eee4a255532a1ea53251ed5b96179f3d36ed6e4d5 WHIRLPOOL f068f5172e859088cc8cb41b6cc3f35ce6233ac901abf09ab56475a70d163b90cb30260805e947ae95bfa0abff7752cf9cc8c66a622ddf8544dc0c021fb3cc9a
+EBUILD colpack-1.0.9.ebuild 1118 SHA256 955774ae89189dbf229b6def54f73735947b4680bbc5e61d259a0e1c9bd0f6c5 SHA512 e7573708ee70238f3736eede1bcd63af2454e46612aa3f00a4ea06be996a77e991f5d8f1cf51907a97ac63dd3e214cc1ae9c676f9e8340308ac172b2b5735440 WHIRLPOOL 853f13e546c2bd76454d9bf97950a3856c012e5a08c52d65add6daec3492413fe5f2bf2cfd99c92e7ddbb6b46ef280bff84947f3c6783709c2737a7746af52e5
+MISC ChangeLog 1119 SHA256 131bb1d08e926751e6ce5bd0c857a5438fe7ab31457b598f30e1197c2d976307 SHA512 847a4a10d851365365b1f4fad18668dabc1b59f288ea86c3c0f17f0953499e32d3725adab1570c6247c2d1b0659e79233fbeff0c241c5d794117fab2eb9d72ee WHIRLPOOL b423ff4b63e97a71f6ab96a7866e4773ce2f581ab48a0b5afee0220be45080745b011d3be5d752e3030648af6b39447729d16de976099f8caacd0b77ba3ecb7c
+MISC metadata.xml 414 SHA256 1009c38b46f072d147ac80c0a50bf5996c43b318df92bbf11793959c207e5a6d SHA512 a5d72241349f663aae47620b8a12462646189c6a7559aed63a752e112608c531127b26bc0ddd5930cb88fef1f872b0cd808dec3df71899e3d0e5f5df71950fca WHIRLPOOL 260005ea5b2fcaaf9c20fa99c30781c89565bbc4def5b1c1ee4f1d2e844a6a055d0e57acc8ca41bcc82e1e416095793b5c933b63883e5b0b9865d83e6595d398
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.