1 |
commit: ec1223124a8d0d3065019c40d69c7675b801a8fb |
2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 15 05:03:09 2017 +0000 |
4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 16 09:44:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec122312 |
7 |
|
8 |
sci-physics/thepeg: Fix building with GCC-6 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/599564 |
11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
12 |
|
13 |
sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch | 14 ++++++++++++++ |
14 |
sci-physics/thepeg/thepeg-2.0.4.ebuild | 7 +++++-- |
15 |
2 files changed, 19 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..ed3bdac7b54 |
20 |
--- /dev/null |
21 |
+++ b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch |
22 |
@@ -0,0 +1,14 @@ |
23 |
+Bug: https://bugs.gentoo.org/599564 |
24 |
+ |
25 |
+--- a/Utilities/UnitIO.h |
26 |
++++ b/Utilities/UnitIO.h |
27 |
+@@ -25,6 +25,9 @@ |
28 |
+ |
29 |
+ namespace ThePEG { |
30 |
+ |
31 |
++using std::isnan; |
32 |
++using std::isinf; |
33 |
++ |
34 |
+ /** |
35 |
+ * The OUnit< class is used to |
36 |
+ * facilitate output of unitful numbers to a |
37 |
|
38 |
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild |
39 |
index 84e48567e16..6cea3900306 100644 |
40 |
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild |
41 |
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild |
42 |
@@ -1,4 +1,4 @@ |
43 |
-# Copyright 1999-2016 Gentoo Foundation |
44 |
+# Copyright 1999-2017 Gentoo Foundation |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
EAPI=6 |
48 |
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND} |
49 |
|
50 |
S="${WORKDIR}/${MY_P}" |
51 |
|
52 |
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch ) |
53 |
+PATCHES=( |
54 |
+ "${FILESDIR}"/${PN}-1.8.3-java.patch |
55 |
+ "${FILESDIR}"/${PN}-2.0.4-gcc6.patch |
56 |
+) |
57 |
|
58 |
src_prepare() { |
59 |
find -name 'Makefile.am' -exec \ |