summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2015-03-01 12:22:52 +0000
committerThomas Kahle <tomka@gentoo.org>2015-03-01 12:22:52 +0000
commita0605b571132e90bc0346da5e460e5f69cba5b9c (patch)
tree4a4d780636481c6fae831ff0163a7f1b0f86d0ad /sci-mathematics
parentComrel: Default-disable more add-on patches (diff)
downloadhistorical-a0605b571132e90bc0346da5e460e5f69cba5b9c.tar.gz
historical-a0605b571132e90bc0346da5e460e5f69cba5b9c.tar.bz2
historical-a0605b571132e90bc0346da5e460e5f69cba5b9c.zip
Fix gcc-4.9 build (541364)
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x565C32BC
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/normaliz/ChangeLog6
-rw-r--r--sci-mathematics/normaliz/Manifest11
-rw-r--r--sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch11
-rw-r--r--sci-mathematics/normaliz/normaliz-2.12.2.ebuild3
4 files changed, 24 insertions, 7 deletions
diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
index cead83ad7cc4..ab6a23f2ccc3 100644
--- a/sci-mathematics/normaliz/ChangeLog
+++ b/sci-mathematics/normaliz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/normaliz
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.23 2015/01/29 10:02:44 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.24 2015/03/01 12:22:49 tomka Exp $
+
+ 01 Mar 2015; Thomas Kahle <tomka@gentoo.org>
+ +files/normaliz-2.12.2-gcc49.patch, normaliz-2.12.2.ebuild:
+ Fix gcc-4.9 build (541364)
*normaliz-2.12.2 (29 Jan 2015)
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 4a4a6bb1e75b..5ed2eebb9647 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -3,19 +3,20 @@ Hash: SHA256
AUX normaliz-2.10-respect-flags.patch 1278 SHA256 2d43c1dc6e3533114e42f26f15319e78c459f19f9fbf34fb2dcd30bef70473f8 SHA512 eb7d2d4db3264bc2d5097c9b76dc094ef616944fdc5ee1cd5a6e7a01488d81a39d3af7d745934891a52e2d96945baab36a779b19e9a73f803beafd02a99294a9 WHIRLPOOL 70ed35fecd178a76d14b54528bd07a97111cb660804de0f02fdd89dce18906fc880487e67d90a18db9dc43d9ce30a21528193b7b1f85f2e6b14e8321bbfbfc54
AUX normaliz-2.12.1-respect-flags.patch 2097 SHA256 e759b884ea9e021d8f22bcd2f38b441517243ae84d19308f6f4349f327bb9385 SHA512 c5a01a49cd1f61a5eea007b991e44eb39910481a214ea169dbf87904c6bf258c23e6a85391e9584d125935b5b71e0b3285339fdd7f8e1d7e824aca6e953a2d54 WHIRLPOOL 7fc5ba979257d3ac56364566bd7e07d1d1154a7856ceea5137ec0daa23cfad97b566466ceb9c0a81b88f174960a98d9bc492d9e42a35d5cf559675c0254cc2aa
+AUX normaliz-2.12.2-gcc49.patch 447 SHA256 2f04a82bf34a07709df04299bbff62ed869f2f94b7473f90cabb208e35278cfe SHA512 465fc30dac17c2ba6c8f702386556fba21d5d2d6cf3282ac5bd87aa2f578b96c5ec852518ab345742518563e4882b99a58484b70576db36766e66498273449e1 WHIRLPOOL 21aad4c16c8d84e0f7d9632dda5ecc99ea71e435f7a3672a41570727c84b635406bf973157c913977f9b11ce0067f04b2bf383765523f0409a24d19bbc35075b
AUX normaliz-2.5-respect-flags.patch 1381 SHA256 2c216675652ad8c7f41112bd8f97bfdb9c4493088081909ae6042ff4449c1818 SHA512 ae69d581de3cd712a7da07f11b21cafaf9dd684ada6919e9ae28884fefa7ef30f30e02e04be6b9c28be75216a560d89361ae6c07cab24cf3a62c07de15266779 WHIRLPOOL 368e79c97645d6406e4af40d6ba6276a75e81dd9e958b7f3dbb9c2742333f11599f78ed08debf4ca55a2cb67a67f408c316788b3e7d8d60e683b6da81a6febf3
DIST Normaliz2.10.zip 6172120 SHA256 0bf4910e9cfd71a22e3f0b9f77e8ce520e380872510096d4b5cc0b9498084788 SHA512 99a1d0ed28c0df96769500aacb99e1393480e717ce438174063b2844e8bf09d265f3de6db76e8ea4f47507e35a691a2dc0ee68c567d55acf3ac39e2e95a5781a WHIRLPOOL 6deb90616a459a16e5b1f62ee97b6b954b830ff157bb08dddcb372ae8b6e2402051bb119855d82133d7652eece1a1399e61f0a43aaf40ed88ea64230e345aef3
DIST Normaliz2.12.2.zip 6432949 SHA256 230772425b3c9964b9e144c0919c75fac0ec95260a1943c10a8a94eea9d7273e SHA512 fd42071cb87b8efbaf9af0885c173a0583e0b38dedb8821a83225eeebb44060a7b5748c44adfc4faeac20c3a1706071bcb9883cb4447e4a1ff3aeb770bd22038 WHIRLPOOL cb2974e02eac6e6d51c234214a719a24ad2e12d1400f0a6f8aee3e7a4ba3aa2ba053beec65c9032f42726e4dd4f1866820bb5b7b96f7c3d34cd132fcdbdb91af
DIST Normaliz2.5.zip 4678783 SHA256 31decc5172450ac918b97ff5cefb3b9b9b94e70d69cc4271962ba90f04ecde43 SHA512 38533ea00887429105831ad7272fabed18c9aa4c44ae0aa1265dc235f27120f161f6b760b98cede5aaceb44590397ea3e2c5a7e1d209924820543f494a338953 WHIRLPOOL 235c932df90dcc887ad2017575c711e634ec698ec48ea72bc06fd094e174690de6a6bbcf7da68a5551b0db2d0f15397d58d38336e2039a82b949ae441210cdf0
EBUILD normaliz-2.10.1.ebuild 1827 SHA256 2788588a1937f7d27256f50c2ed744af71305452e5cd13a5e204378fddd223f8 SHA512 8e34b2d92005bb7f6a3966914d560c1880fcd47e25862d07aaa9c4379931c5f2731da6cc1f81fbe3c229cbb67cd258ea3fad810bb17f981c870dc5683753b14c WHIRLPOOL c02f6974ea144e01c504f138b99a50e1fed2a76668b194ba002a2d39e2570c9d76e24098298cd63d63161166a5ea6d5279dfb708479963e49155345b1db8a513
-EBUILD normaliz-2.12.2.ebuild 1839 SHA256 f56616f1058a8ff24c05d3457dadaad7fb4247f631398d68e6f647f29b9c408a SHA512 bc107f183535f97b564040d9b626998c01de5d9b698c775d0fee376213cc48b7158343550a5072759bad63356faae9406f3c00cfa8f0aac9586f8bee4d0aaafa WHIRLPOOL a7df3d9235c69957d8d702e106649a339f42c9775fb05f1b150cbf6f309d703cb900a64b527165d45624c13e63e8f58096e3ccb451834027aafece7f9187aa35
+EBUILD normaliz-2.12.2.ebuild 1886 SHA256 dfb57592f280385ee3d21a206454aed96f8a92de394bac9fb169a10fdf652ded SHA512 2977b165cd0e0cd68a069f8cf2ae4a5d555c6efb81d0157fa199378401cef44c857e95a794c7a08e2012fc5c057664f35af044b2b072d60152a6a1efba586ed5 WHIRLPOOL b555ac6d94888ff6ae7f1159b639f415949ac64f0311d0460a30cdc8ae2ff01942238076347588ed8ba31079f905c24b3c18c6c404e3af7624efe4fb910ba251
EBUILD normaliz-2.5-r1.ebuild 1559 SHA256 a85d9cfeea85559f82ddd26f3ed69274d4e40e2efa513feccf2f293c5ef78b9d SHA512 6b3dbb6647938121dcc6fec621387cba104927420deeb1d9dfabc7a5f9e4bc606525a9c9e4c8e0880910a52081c690e0c22b8934c31bf2462ff41803f39feeec WHIRLPOOL 84fb7b3e7a6dc1bf27cd9a76b45fe2b399b9fa79a315557ef88417e41116aa48e53682edab0dc9709c2afe365277ba56e22e2841adb98b7ca08c233183737d76
-MISC ChangeLog 3528 SHA256 4aff1624b2064137bcfd0258d0547e869886309161dce727e30e543c37c18a9a SHA512 2bd42698fbb86b8d9b6870d66c79c67c7a565f80b2871c30b6037790198295c829ed01a1595e7498715abb678f87a2282b780a749d7c48e37669f334a635f217 WHIRLPOOL e47feae553d7f353e631060822529526ba15082b2f4dd7dff3d65ac73e30b8e2f0fd064d257c305f369f492980c3288e7b226592debd5b52c639d5570ecf639a
+MISC ChangeLog 3667 SHA256 2b1fd010a8339888d243af62d9b2fe2f51d5e1a5143a56ac4ab9aab4188e891d SHA512 bb1d514ef22e542b0fcd523e7c95fb606c3389e98e7976825016fef47b278b3fac713b7311efa6a38a0d7eba3b39d9f062ae32f31409b01487f6f80ba8be0004 WHIRLPOOL a0f70bb2bcbb27461f7402c53e31d70b12629a2dbf37fe5455ea885e84c36f4dcc24134d89617c9fef9b7a3ea561d2989f30fc0b3de946bb195d56a23810fa2b
MISC metadata.xml 616 SHA256 82c05970a971097431b4bde6e09350531ba376163fcb471bfbdfc8eed0676a83 SHA512 bbdb4f07547fbda1d6eeaced642eb16297feb04ee1bc3fc4e09c760e46d87cc8ed5a116fa87e743a863193a501b69d9008b540f6b3d793694b1e7b5b47ba3ca5 WHIRLPOOL 281e6fa8577a7bfda09c07718137b3f00c993a82f92c3118c17c118342cc87fcda4f2c2f55625a1b827f06b8410cb1c0256abd92a67bfb592dc002957b0532ee
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlTKBZcACgkQid6yGVZcMrzFlgEAhiohEuphY0XW5Tc+S1uwujQE
-j5myH91oZArjubXDLAwA/i9GywgA6/NVJJ7uXano7a8IFPLpUqQ/Z7irBhWJHtgL
-=Z5D9
+iF4EAREIAAYFAlTzBQkACgkQid6yGVZcMrwBdQEAh9VTbrN0os/DhLU9Xa1bLbnI
+dXaTgjq8ZIr0r4SLTn4BAILAANEUv9MWtLoowPqKdqalC3vXidXD6Z2VcdGbOBws
+=Yc/J
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
new file mode 100644
index 000000000000..35a28c8cf2a3
--- /dev/null
+++ b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
@@ -0,0 +1,11 @@
+diff -U 3 -dHrN Normaliz2.12/source/libnormaliz/general.h Normaliz2.12.patched/source/libnormaliz/general.h
+--- Normaliz2.12/source/libnormaliz/general.h 2014-10-23 15:01:56.000000000 +0200
++++ Normaliz2.12.patched/source/libnormaliz/general.h 2015-03-01 13:20:01.057017555 +0100
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <assert.h>
++#include <cstddef>
+
+ #ifdef _WIN32 //for 32 and 64 bit windows
+ #define NMZ_MPIR //always use MPIR
diff --git a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
index 027b7eb1e88c..07f3a2f24db4 100644
--- a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.1 2015/01/29 10:02:44 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.2 2015/03/01 12:22:49 tomka Exp $
EAPI=5
@@ -28,6 +28,7 @@ S=${WORKDIR}/${MYP}
src_prepare () {
epatch "${FILESDIR}/${PN}-2.12.1-respect-flags.patch"
+ epatch "${FILESDIR}/${PN}-2.12.2-gcc49.patch"
# Respect users AR tool (Bug 474532)
sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die