Fix for gcc-4.7, thanks Jimmy Jazz (bug #414029)

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 31 insertions, 4 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 751a550c9500..692d752bb0e5 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.14 2012/05/04 07:46:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.15 2012/05/08 18:27:58 bicatali Exp $
+
+  08 May 2012; Sébastien Fabbro <bicatali@gentoo.org> cgal-4.0.ebuild,
+  +files/cgal-4.0-gcc47.patch:
+  Fix for gcc-4.7, thanks Jimmy Jazz (bug #414029)
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> cgal-3.7.ebuild,
   cgal-3.9.ebuild, cgal-4.0.ebuild:
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index edfb51edac8f..9981c34945fc 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cgal-4.0-gcc47.patch 502 RMD160 dff40eeaba8175b57bd3c290a8c923374a2776af SHA1 b818d1b0b4f0691f82c6d129982e4df03fba7b87 SHA256 33fc60b21d6899908125af0aa4ee9d2c35d3fe978d7be9d0821efd15be3adbaa
 DIST CGAL-3.7-doc_html.tar.xz 16513316 RMD160 4411726b7b05346bfd8588fd1d86c10745ffd015 SHA1 a1ddb76c2c50257c3abf42bab9cf4b5777fe41ee SHA256 6113051e60db83f61d6f9213906a3440ee8c044979370daa244fdcabb5667326
 DIST CGAL-3.7.tar.xz 9548960 RMD160 1e160200aebabea1e2cd3a70785d20407b8b91cb SHA1 5d3ab3d98495d4833f0e1211663df328649ab58e SHA256 3287793e1f1abf27575be30207647a0aef7229e0ea56bd408587000077f1c287
 DIST CGAL-3.9-doc_html.tar.xz 17943040 RMD160 d7ad3d7e1ed0a3a21ff2c5a326a3f40c95ef5fae SHA1 47fbb255f117075634b885c1ab9dce1e83639ac9 SHA256 5f22c62365540a036fa66e18a3abe55fc4f5cb36a60717711c54029c032f8120
@@ -6,6 +10,13 @@ DIST CGAL-4.0-doc_html.tar.xz 18465688 RMD160 1c8fbf803e6d9b6bc858c8e4e08d5beabc
 DIST CGAL-4.0.tar.xz 9875796 RMD160 655b425335da05537f208b8d4e3a00bcad0f6dd2 SHA1 d1f3f328bc5cb026ddb825cb585c7ae27a8856f7 SHA256 a64f0d4b387b9db4cb76410776b93b4c6c86d1b0c5d049ed00386951ca72a5f3
 EBUILD cgal-3.7.ebuild 1771 RMD160 e1660de865d877ea1a324e926824e285f8420a2b SHA1 c7dffa41cf9fccb2a5795eb8c0730d903c6581d0 SHA256 3e9a0d84b7249efcf05ac7d055f9c569aad87981b11147407bbce907be7c7f53
 EBUILD cgal-3.9.ebuild 1813 RMD160 ce14d88c192bff91703a00751d1da3f317c9b064 SHA1 db15af69e81413879be7ef2e349436eadb024860 SHA256 7ac762d0bc0ead47c586c9a2eaed3133d3b8409394df6e38da5bdbbc9131de00
-EBUILD cgal-4.0.ebuild 1770 RMD160 b813904378021d8c7b4a2eafe71de64b4b006d6b SHA1 10516390cfd120f17219a842524a3d6a1ce0e7ca SHA256 bdf31a952d2d8913fd78454d00432882eac0f8a5426c8b63f2bb130deac6882b
-MISC ChangeLog 2307 RMD160 1d09d601535d344670ab760527752858bc02cd1f SHA1 81b7aba0d971ef3f042166ea7e3ccfdcb55df0d8 SHA256 640e2b56032d4c738bd269a58782d96ce25e22471ae177a98d7e6072ad135e77
+EBUILD cgal-4.0.ebuild 1811 RMD160 23ebb531c18f49641b52efddd0fad188a2feae46 SHA1 7e47cdca311a5ea14ea4f2d17e64515e0f9a42e7 SHA256 870b0cbb31c9cf64c40f0f2f08cdc06fdf95b61e4eb502f75ca2bcd5caa309cc
+MISC ChangeLog 2464 RMD160 e133de16e88ddfee3e05171b222cc7387a191d44 SHA1 c719200902c1bb22fa082e96852aced1a5f64a59 SHA256 18dbad13b11c1c30694f87f80acb83664f5ed5455ac74c05763e5f6a458292b3
 MISC metadata.xml 1049 RMD160 2ab153fc344d526d9f9fc12e285160f4ec5d8e60 SHA1 8680032349320bdfaf263551f7ad7f78676f64de SHA256 9b0ea9aa750cf2ca562d0b7e11e83f3b707455f7afb50052c35ca959d0966adb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk+pZbYACgkQ1ycZbhPLE2BddQCdFiZH+gw+HLdZfLVNhHC8WwiI
+ML4AnAz2RQnEvbl0mrEESUtFZKTn5Arh
+=SbHp
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-4.0.ebuild b/sci-mathematics/cgal/cgal-4.0.ebuild
index 13d10922278b..cb1d7fd6413d 100644
--- a/sci-mathematics/cgal/cgal-4.0.ebuild
+++ b/sci-mathematics/cgal/cgal-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.2 2012/05/04 07:46:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.3 2012/05/08 18:27:58 bicatali Exp $
 
 EAPI=4
 CMAKE_BUILD_TYPE=Release
@@ -39,6 +39,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS="AUTHORS CHANGES* README"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 	base_src_prepare
 	sed -i \
 		-e '/install(FILES AUTHORS/d' \
diff --git a/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch b/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
new file mode 100644
index 000000000000..a2ed0e488803
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
@@ -0,0 +1,11 @@
+--- ./include/CGAL/Mesh_2/Do_not_refine_edges.h.ori	2012-04-25 23:14:26.132198961 +0200
++++ ./include/CGAL/Mesh_2/Do_not_refine_edges.h	2012-04-25 23:14:46.304953789 +0200
+@@ -80,7 +80,7 @@
+       const Face_handle& fh = eit->first;
+       const int& i = eit->second;
+ 
+-      if(fh->is_constrained(i) && !is_locally_conform(this->tr, fh, i, p))
++      if(fh->is_constrained(i) && !this->is_locally_conform(this->tr, fh, i, p))
+       {
+         return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED;
+       }