Fix gcc-4.9 compatibility (bug 541238)

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

diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog
index 5e218d7f70cfc69c93201eb35811d617a7db3833..6ef53442be7b52b04d54b0b82e6e465a7c73233d 100644 (file)
--- a/sci-mathematics/polymake/ChangeLog
+++ b/sci-mathematics/polymake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/polymake
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.13 2014/06/27 10:49:06 tomka Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.14 2015/03/03 09:34:22 tomka Exp $
+
+  03 Mar 2015; Thomas Kahle <tomka@gentoo.org> +files/polymake_gcc49.patch,
+  polymake-2.13.ebuild:
+  Fix gcc-4.9 compatibility (bug 541238)
 
   27 Jun 2014; Thomas Kahle <tomka@gentoo.org>
   -files/polymake-2.11-drop-jreality.patch, -files/polymake-2.12-soname.patch,

diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index b436fa6e582676f1b32e561af5ee694adef1434c..ff48b270a698d197dcdd49d441ea6897e8fb2df0 100644 (file)
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX polymake_gcc49.patch 2497 SHA256 cef2a15991205a07078c06113dab9fb39c825d850099322cea28a415040da0f3 SHA512 0e0d65badb3031593378af6eff71381f90378c59641448d662571955a20fd744f68e643967539839355d6071c4082f467fcefee4f7c1c67b45b638250e13674a WHIRLPOOL 1ff6cda15e12c8cf463323e298d809d0c881f747e6f3c24f203c40714a90b4be47dc88b4f2535b1ba4dca0e3bf131d4c2484b2631f2d9088e19135e9e8b12997
 DIST polymake-2.13-1.tar.bz2 16539798 SHA256 d010edc206b22356333493e90bd24f807c7341730232276d47dbf1b62eb53aba SHA512 90fd0c7eacbb673734e08860a753f75dae06347ce8affcb5d50c55a51975b85260db841393979c0143be5a71a26b6737f9513509d75a5950b40654c54d0be3ea WHIRLPOOL cef5c95930c7633acb0652e6ce3cd6c85b469af912ad1adb695e58a018e4cedbdac9f63caaeb12f3da0a8f7fb2b71e853b782f308a1594cfc89d2c9697e6c170
-EBUILD polymake-2.13.ebuild 1657 SHA256 13280932cd514f2e96e6ddace08e1b15bff54acd7abc6807ac6c4bb861353aea SHA512 55547ef613c481513de95768fe1b9e1f2a87e6d8d92263a71c2ae334a5b1581b27c31174a46aa3f298fb13079364f14758ea8cd655eb94377f30e23194aa205b WHIRLPOOL bc4889adb66b63c1444fe67804ac0e05701bdd87319e6392f5eb8e1bbfbf0f7b330bd91c61b2b9452b3836a5c3267083380aadd230b0d1736d84391c186f7837
-MISC ChangeLog 2451 SHA256 d26113b8530c896b96fdb5d730da684f48916a8d4e2146d00658e58a5a25f725 SHA512 b0c84659869aa3ee52a0d0a4af38ad7d53a6e02cb7a106f0e7e52b12c026a8c7fba7b601e6c7540d95835db07f86b26b49275c37ad87295353021661a4ec6217 WHIRLPOOL b225089dc33efec9ced8962049726a83543cbcc25a003f90a881e938036483269122fce195226680273152b41ba51e80e6f73a827fce93603fe31f13145767e5
+EBUILD polymake-2.13.ebuild 1697 SHA256 ff27a8f2ac3d1c9d27873ca9cc6e05e4e88622d9907b01e5ee8016013fc3c93e SHA512 77dba09e73473e2bbe317fa631ce55505c4965de07f0ba44e7a3114737561ce75cec5ef2ae15ae170be3fc3d74869dbe0d91735103f46d733c3916974504c072 WHIRLPOOL 77d436fcf57b8d2552bab3caea1982abdb9757c983ba5456f5e51e92de2c4e2cfdbb4f6b9a5be9cb62b3e3d3b9cee47b29e87440bdca71b2c77f686898e57985
+MISC ChangeLog 2593 SHA256 c6f9bce6496701e7dbbb0332f56c03c58f843e4b42b4bee496de6cdea2f0866b SHA512 fc7f75c495db981f9dc162212422155e1e7345db864403bce23cbaf3529d60642f77f0f912e8b189d088ce5eee96d2671e122ec869976d1e6d5513a449b32bb8 WHIRLPOOL 553e55e10e1696a7480bfb28219a55344333dda4a0e1bd3eeddf2f3d1c1d9406b9d53f27d3701eeca0a10b846654fe79b7ec6d06edd71550cc33015d7272725f
 MISC metadata.xml 615 SHA256 05a17f47de10b29c32a8edd01ed12ad2584e6f2762c931605af0e1845bed6895 SHA512 c6a38afbcee33c06ad25920bfdebbfd19d295a1e584dbcb2847bdcbeb38c61553e34b26634ae4599edf072b5193a823cc55ced08a3e6f3d6ecf98a430e5e5a7f WHIRLPOOL bde24a2798501f1a89562902641d01f0c059ab8e91642e7e1a852290c5f9b9a4c7c3a3a21df5a1e841ba65801ecd326cc2109da598791723deb92e35a26a5c66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOtTEsACgkQid6yGVZcMrxcLAD/eOYDWgoMDRb9Em6MO1XP2LXP
-6Q/X6PJMIIUQ0Zae2DcA/0CsNpRLR3qX33f1V2r9JOjzKtIkeSF6O01lLBEwi0r7
-=HQ9F
+iF4EAREIAAYFAlT1gJMACgkQid6yGVZcMrxJDQEAwAn0JYoW1Ii+owaJ/e3pvvxY
+KL+CM8xto6SjWOgmxKQA/i950jGBDcwqgWRFvGZaEnVX7Y+hpWyFiUuelNMOuH5G
+=LQ+y
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/polymake/files/polymake_gcc49.patch b/sci-mathematics/polymake/files/polymake_gcc49.patch
new file mode 100644 (file)
index 0000000..bc2cac5
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake_gcc49.patch
@@ -0,0 +1,68 @@
+commit 9fdecb57cb728170d0b87637c67947acf0cd27a4
+Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
+Date:   Sat May 17 23:05:41 2014 +0200
+
+    fix ppl configure.pl test for gcc 4.9
+
+diff --git a/bundled/ppl/configure.pl b/bundled/ppl/configure.pl
+index 128af1f..a147ea1 100644
+--- a/bundled/ppl/configure.pl
++++ b/bundled/ppl/configure.pl
+@@ -43,6 +43,7 @@ sub proceed {
+ 
+    } else {
+       my $error=Polymake::Configure::build_test_program(<<"---", Libs => "-lppl -lgmp");
++#include <cstddef>
+ #include "ppl.hh"
+ #include <iostream>
+ int main() {
+
+commit 6651dd4b284085ffb7385d6cbca1785b6242003b
+Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
+Date:   Wed May 7 15:53:12 2014 +0200
+
+    another gcc 4.9 cstddef header fix
+
+diff --git a/bundled/bliss/apps/graph/src/GraphIso.cc b/bundled/bliss/apps/graph/src/GraphIso.cc
+index 4000dd5..14e0e8f 100644
+--- a/bundled/bliss/apps/graph/src/GraphIso.cc
++++ b/bundled/bliss/apps/graph/src/GraphIso.cc
+@@ -15,6 +15,7 @@
+ */
+ 
+ #include <cstring>
++#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
+ #include <bliss/graph.hh>
+ #include "polymake/graph/GraphIso.h"
+ 
+
+commit 716639b858f476d6a2fd8fe51da67d6cb347ec7c
+Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
+Date:   Tue May 6 14:58:33 2014 +0200
+
+    cstddef include fix for gcc 4.9 (see http://gcc.gnu.org/gcc-4.9/porting_to.html)
+
+diff --git a/bundled/libnormaliz/apps/polytope/src/normaliz.cc b/bundled/libnormaliz/apps/polytope/src/normaliz.cc
+index e6f2208..81e9783 100644
+--- a/bundled/libnormaliz/apps/polytope/src/normaliz.cc
++++ b/bundled/libnormaliz/apps/polytope/src/normaliz.cc
+@@ -14,6 +14,7 @@
+ --------------------------------------------------------------------------------
+ */
+ 
++#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
+ #include <gmpxx.h>
+ 
+ #include "polymake/client.h"
+diff --git a/bundled/ppl/apps/polytope/include/ppl_interface_impl.h b/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
+index fda2f39..1040c9e 100644
+--- a/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
++++ b/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
+@@ -17,6 +17,7 @@
+ #ifndef POLYMAKE_POLYTOPE_PPL_INTERFACE_IMPL_H
+ #define POLYMAKE_POLYTOPE_PPL_INTERFACE_IMPL_H
+ 
++#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
+ #include <gmpxx.h> //for mpz/mpq-handling
+ #include "polymake/polytope/ppl_interface.h"
+ #include "polymake/common/lattice_tools.h"

diff --git a/sci-mathematics/polymake/polymake-2.13.ebuild b/sci-mathematics/polymake/polymake-2.13.ebuild
index e93e99ec539079e03a5eaed84875f4fa73e1dcb1..8e5abe95a9b58707e59d98ca303a20722da305e9 100644 (file)
--- a/sci-mathematics/polymake/polymake-2.13.ebuild
+++ b/sci-mathematics/polymake/polymake-2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.13.ebuild,v 1.1 2014/06/26 12:22:39 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.13.ebuild,v 1.2 2015/03/03 09:34:22 tomka Exp $
 
 EAPI=5
 
@@ -33,6 +33,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 src_prepare() {
        # Don't strip
        sed -i '/system "strip $to"/d' support/install.pl || die
+       epatch "${FILESDIR}/${PN}_gcc49.patch"
 
        einfo "During compile this package uses up to"
        einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if"