dev-python/pyamg: Back port upstream commit 850 to fix compilation with gcc-4.7, #431112

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 42 insertions, 4 deletions

diff --git a/dev-python/pyamg/ChangeLog b/dev-python/pyamg/ChangeLog
index 34f6e3cc0f91..46d888cb9a00 100644
--- a/dev-python/pyamg/ChangeLog
+++ b/dev-python/pyamg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyamg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/ChangeLog,v 1.5 2012/04/23 18:21:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/ChangeLog,v 1.6 2012/08/14 16:58:16 jlec Exp $
+
+  14 Aug 2012; Justin Lecher <jlec@gentoo.org> pyamg-2.0.4.ebuild,
+  +files/pyamg-2.0.4-gcc-4.7.patch:
+  Back port upstream commit 850 to fix compilation with gcc-4.7, #431112
 
 *pyamg-2.0.4 (23 Apr 2012)
 
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index e3566128c54b..e291620eb7b4 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.0.0-stencil.patch 475 SHA256 f0aed9693fde0f7ae053c324996d0ae18b8c7aa1d4e50def11977dae399cd155 SHA512 0b177087263547455e9c25cc65cc2b2ee12885d78eabe1550fe4c4cd22c0391689a2fc4d604b9d9a6055c07655523dae017710e436fc3f159bb8bf89866004de WHIRLPOOL 9878816104782bbf86d3c33892beca38e79500c21e3e750e2437c1544117aa1a4e9c0b8d093cbe41dbe344338097f28b29ffece5d958c55538096c377b39220b
+AUX pyamg-2.0.4-gcc-4.7.patch 462 SHA256 d83ac2172d5b412fb0a9f3112d076bb65e4d6c693a18c05370aeaef0cc35487a SHA512 bb8cac3170c214e2a4ead008eb19bcc5290f6196aa413797a2779caad40ad349d88ce7e3404b9c923850706c56aa7e2adeb79487515436f08953d6d4607a230a WHIRLPOOL 490c0f70fe7b5782322906363680aab08327dac4485e2f15d642a93fe82c16996913ae2e8c66d029dfd621188cd6c5c168f72b651f994a70d606a9f583917b2e
 DIST pyamg-2.0.0.tar.gz 1364498 SHA256 293e85e61b245f034e2346d9ecc476e084148fa68084eab267cffdd269f30c2b SHA512 2d559fd0798ed885c1acec1f79f8ab010055f0090a825b495515fecd90512738f608836a19f13db6ee1618b48869366db0eb2bfe0ac0845b9e6edf50891e71c7 WHIRLPOOL 66aaab488f535146f0da49b854e9e367743ace446c7995696c797f8a36663b0014dc1b6947c00754f9e962bb260df37d7191efba3cf6f6a79e8d454bd896dfbd
 DIST pyamg-2.0.4.tar.gz 1365073 SHA256 258436c56711a05c1045da0295cd420977672f535da86674dcea976cbc2a8b56 SHA512 2c16b8703707d1a70205468c9e78d02b3a240b799f9de560df0fe0b28156fdae3c33604875fb09f29a2ca9ecb8bec621dd6bae56765541425f509eeb9cc089b1 WHIRLPOOL 7762c0d9e3d5988d4c5b26a26fa4c853eae14c17f135f1a54284853c1c3b85d5b762e2ffcc4df97325c29d67cf91145d062bb8ca2067e85450dad30324599c0d
 EBUILD pyamg-2.0.0.ebuild 1384 SHA256 7b273fee4e466b186d7183e78d6ad1182ed465cd7abb23ce0340b4c3952d7085 SHA512 92a1d7480fb52c1413214e3321072f2653f50ecd0504f94d5bd796095af433807db34fc7b690dc24265ff57adc65a767e0d94a9276adb147b8cfcb87ab2dff6d WHIRLPOOL 8e9e0887519b02ec75094a38708e773aef8ed9faf8c7061b6d045c0e53df6d520ada0c37a64ac36cd86cefc3c235215d5d2fa978803d6764b54df31dd67adf76
-EBUILD pyamg-2.0.4.ebuild 1346 SHA256 7275c1e41a424838da0792e5c88edad0dd29bc4dcded7d879eeeb7f4facd733a SHA512 5c28e6b16ddc7a3e9d9d51780dcd3744b10a101a41eaec5b57f884b8985bee5b0c993e48a67d3a70642d8652ca022528f1676f0104a07e8e8d004dfe6bdd59de WHIRLPOOL 2bfd92cc272e69581c33789eb562f1f2fce6c149e4e8b5f8b0651ccbfef9ce8c6edbb0a4d7c6c5459065606ba9c422d29baba488b9c3c15968bc20d482cf67d3
-MISC ChangeLog 1110 SHA256 dd222a885a650ec430d9adcefcd6192ec63296bc41987932761e8e74f83a0101 SHA512 2d3039dc4a61a79db1a1de5bb18a1efcb60cc9b163f7471d8966deeeff78eb4e570f2b9c9fd31c97125760cdd4e2b5a9ce7bedf5c1dace83c1b01f6880052730 WHIRLPOOL 19d62286438089e59837df8780662cbbaad3eddfd1485d4a8a7bd569d7afa892a11f19069a35557e504d7b090d5ccfc6edc61ed56fd81107ecc91fac7bd05023
+EBUILD pyamg-2.0.4.ebuild 1426 SHA256 31cc214909a20662b9d0731290f53a2743ee4df4a2d309d7832d11c546a88203 SHA512 094bcf6ed9366046910beb98f3e5d54ae97123e3fb4757c947e68247a78fa568a7505a0e5f4f970eff2dfd4f2d2e87d72c35ab7abff84582cd3b7b10bebfd073 WHIRLPOOL 3cc608c672ff2e49a94319536a75e088d3130d82c697bf697447e1afb474d8599f127de5c68ba38d900c006d10a70e17610547a6de8798bcf12e4b03590a72ee
+MISC ChangeLog 1283 SHA256 af412af27a95440d755407c1d3e9b4bb0cb4c7d6995853d4e46116f9042305d7 SHA512 b0e5aaad7eece2e1af8e52abb91c67a4ad101e627532ff2679d7ffc91f3ce761983773d17f41226bff4063bd916fd23ea4e361d68ffb76ca5035dc11c8ab77ad WHIRLPOOL 702ba62bd9dddf565f4f81391631e6c4f28fc0fbcea68e5d78806db4230547a08ac226165760a5701753f2a556e4e3ada2429bf4f8a8710c1cf56cef0e9ecd47
 MISC metadata.xml 1045 SHA256 c8e4c196f82ceebf98003db1cd9883fd1b21bd865714bf76d4462139793f10be SHA512 86e953790c74d3262e01a48e13ef80dda9b665ee50602d1014ba7d057510bd4080aa01fc0df14f646eb491387ad099368d85b083196388cdc765f6ac768ba348 WHIRLPOOL c00a6a988d3d9fbfc3dc602e02d7363b6e66f31ada13599d4deaf987579943828105f1e50e5ac38a7475e52ddb53be24e9a6df1cf6df3e3d0500df1d034ce068
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlAqg68ACgkQgAnW8HDreRZJJACeMDWdFUm5v3MPLa0NQ+ZPu4mr
+T1IAn0UPq0nLW2cPUxvEditcDTcZxsOy
+=uS0b
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch b/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch
new file mode 100644
index 000000000000..0ed5402b7e48
--- /dev/null
+++ b/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch
@@ -0,0 +1,16 @@
+ pyamg/amg_core/ruge_stuben.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/pyamg/amg_core/ruge_stuben.h b/pyamg/amg_core/ruge_stuben.h
+index 51cec80..d0ff9a9 100644
+--- a/pyamg/amg_core/ruge_stuben.h
++++ b/pyamg/amg_core/ruge_stuben.h
+@@ -7,6 +7,8 @@
+ #include <cassert>
+ #include <limits>
+ #include <algorithm>
++#include "graph.h"
++#include "linalg.h"
+ 
+ /*
+  *  Compute a strength of connection matrix using the classical strength
diff --git a/dev-python/pyamg/pyamg-2.0.4.ebuild b/dev-python/pyamg/pyamg-2.0.4.ebuild
index 95af1cd482d1..a8f930b6feb3 100644
--- a/dev-python/pyamg/pyamg-2.0.4.ebuild
+++ b/dev-python/pyamg/pyamg-2.0.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.4.ebuild,v 1.1 2012/04/23 18:21:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.4.ebuild,v 1.2 2012/08/14 16:58:16 jlec Exp $
 
 EAPI=4
+
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
@@ -27,6 +28,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	distutils_src_prepare
+}
+
 src_compile() {
 	distutils_src_compile
 	if use doc; then