gentoo resync : 17.10.2017

3 files changed, 21 insertions, 3 deletions

diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index af7b536619bf..bfb3d0142e84 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,4 +1,5 @@
 AUX thepeg-1.8.3-java.patch 922 SHA256 1b71b643587a784699dae94d601de1eb3b352e2e6a91126105121b0e631972ef SHA512 2c2bd711e6a96e3e8ab12b313929b7e4814b69bd7f7631e137c233ec2478d4538299113c035ed94b8e58aa1195b0c8cdc21d23996fbecbb0319815b162556699 WHIRLPOOL 23461aff09193196472c1f3be8be1475855c161d47943cfd01523958df5e7a53b85f91c15cc5bb5da473e4e6c59e80ef64d9e7c54321ad6834a14a5456e3889b
+AUX thepeg-2.0.4-gcc6.patch 252 SHA256 ae622cf6fcb023175059a452be508bce7d77ea63378588956f9e5200b55b16a8 SHA512 741dc3a52fdd040b2fc0ba21c778b4e2427abd55977f3858ef8f8acedc2c3a4007a38fe0903cf89eb1c305ebbc31f527f04d52da794ac85563864c53d50c4363 WHIRLPOOL f8755fec653751493fb42d6d449c10e0f73110d3822a713f4a20e967048ca2818e1db52dfea8a61f2cf5a5fc414e21f6f1211b65c227c1a11d98d786a65cc897
 DIST GRV98nlo.LHgrid 221908 SHA256 78e7b133ac1f1d5576aa688f98adb8b6e29feb15cbb58556c860cb7e183da647 SHA512 fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6 WHIRLPOOL ce0d01cd7c293efd199704cdeb0cb5ad9093393eef56b72cb6096b2e6135ce57d1710b0cbcd219bb4dfe82b15d684a3f6a5aad6dda97d3428dc2f645ec5a2dc4
 DIST MRST2001nlo.LHgrid 719692 SHA256 7ec031afa2bd254b95b66b3058291365091f58b48e4be2b368e61fc170c51d58 SHA512 126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930 WHIRLPOOL bce25b3dc3b0a29c537eafac243c81bdb83b4e3daca34627d7d8bb8c59f802bb12ea6e8611fe2758a8c9a9880dab16276c11a332059431df0b14ecb6eb6d40f3
 DIST ThePEG-1.9.2.tar.bz2 1870577 SHA256 ff7bbb256866f994dae04ade1f57c92d2670edaac3df11c9a300419a5343faf4 SHA512 bc43606c79bb15938969b9d444db49c6af5c8ba21072a879a502086a77fe18b13fec44691046b4e0772b260b83ea7ef29b906027eadda6a8ea004ace9318379c WHIRLPOOL fb686c14a6c8a958f08be670085f10463d2928dacd8efe039e0e5fa781dc7532310702146dd9a0aef5bb8e881e1ff0e5d7f07637b8ad56a80c3d197e67d9c970
@@ -8,6 +9,6 @@ DIST cteq5l.LHgrid 134797 SHA256 83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11ae
 DIST cteq6ll.LHpdf 1461 SHA256 a3c6bd1ebea30f75fa23fa94922ba281872a66e59465b61f73a0f3629c2b5c03 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728 WHIRLPOOL 3eeba4277668b92bfa0de3d0fb27d0d9b940904061b6aa212936e4a9b86f9955188b81d9572672f64155abc7f2c6184fc90f8f81dd7eabbe1b015b749a5af304
 EBUILD thepeg-1.9.2.ebuild 2345 SHA256 b4e7400140962004de1040f53274670a491ae11108bd10ca395fd8d34c7fbe9c SHA512 8c90e20af8ad8558df22dba90cb9c505e473d4d7e5c27813d32f8fec376ed4315e7a3ea0edc07967b5a7e9490f459c13093f62c11a70a34f2593f2a12c3b3d3c WHIRLPOOL 83aeb59f9fe1887d709f99c6332d91b9c9bc5b22cdc3d8e5b3b094200e87b36440e0dc8efa672c5727b5b9dda224c1e1988cea82a14460be230ebe423fefc66d
 EBUILD thepeg-2.0.0.ebuild 2345 SHA256 4f905b5756b15c630153655dd63e0c45b5013201f5d6809d33692eeead68b6ca SHA512 3ef17477953fdabbf805344ffce4f22027855e9dfe2a5dec8580c3e144cb891f3bf36bc58ecc11a32da78a707d07afed666ca7eb26d3f9a9d3d72250a29710ba WHIRLPOOL cb1e29986057180eb1cd56a53b2850b93c50469700445250ec1f541635f0ba10d5289c3491aa5e69c463611ebc472b57a13c6fd125a79f5e7ec8f5edf8f494ff
-EBUILD thepeg-2.0.4.ebuild 2227 SHA256 bca027985043510c847504f9f4019143db82c16c9921cf0c846aa7e9f5de9687 SHA512 72b7869e9e56d947849be6c0291cce6ae1607d77757e1364e4b03e7efea97b19f6e33588e111bafc96633d5086ec5aa3be5c095c33d04d25dba2d4d35c1775c7 WHIRLPOOL 7b2740d5f5aeb509d2cd3b78cd1d7cd1c4ec92e1eae898128c55d0ab9deab409e771353ca097af31032d35a58fa79baedd101cc31fe30fb854b07d28288f992d
+EBUILD thepeg-2.0.4.ebuild 2266 SHA256 09105a773e292965527571ff4f98e937655079886600465d12c78147183318ac SHA512 da03c3a845352fbc8fe21f5c108cc6ebc8ad8b5b7aa25b37b79e4672ec0536c9aa9f2a7644b8e615f5544bde67e231ad59253acd2760782c81d9c610db85da72 WHIRLPOOL d3b765bf63fb1bc3d05ff03fb3965f52e397c8b6ca3eb63a201526d6179be98ce9238964986e043829d571a16db2e4d847524d380641b7c7ef16ee943021f50d
 MISC ChangeLog 2509 SHA256 db8c890f569e40913ae9e04256171410866681c8c0495de42eb4e71402b181cf SHA512 af2248e7a2a9d4fb1565422d4525e63499a5d77fc5ff51ebee68be2ed5bd9bd747706189cf96a81809b017ffe7fb450793969fa7fdac9f1b7f0d7da3c9ec58f1 WHIRLPOOL af83ca0f3ed92fe2cafb1d50226c8e335039d8c391e46f4f58a79e1030b5f45abf111c6784f5241a1debe7e4b23142e4f15cf79b3736f856983ead64fc136319
 MISC metadata.xml 1066 SHA256 a49853a487c0f8618d6d6529eaa1da6d6a5028ba75ab6c9dd81cfbe580d6b7ea SHA512 f42af9eb2e0cb212ed9c374b9da6775f4857435c5cb418ebef15f39b061b0a2ddb85269aff102e40cc499a9834cb16d24e44d3b3de9de3a26078edfc7162eac5 WHIRLPOOL 3d29946d0a2bdd4eb0dc71ffde636be576482a203e94997ed89eeb30da5c3db6dd3852fb38526306a762965f3676935d47093c10fbfa88f226db62b267bbb10b
diff --git a/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch
new file mode 100644
index 000000000000..ed3bdac7b54b
--- /dev/null
+++ b/sci-physics/thepeg/files/thepeg-2.0.4-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/599564
+
+--- a/Utilities/UnitIO.h
++++ b/Utilities/UnitIO.h
+@@ -25,6 +25,9 @@
+ 
+ namespace ThePEG {
+ 
++using std::isnan;
++using std::isinf;
++
+ /**
+  * The OUnit< class is used to
+  * facilitate output of unitful numbers to a
diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild
index 84e48567e16a..6cea3900306d 100644
--- a/sci-physics/thepeg/thepeg-2.0.4.ebuild
+++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.3-java.patch
+	"${FILESDIR}"/${PN}-2.0.4-gcc6.patch
+)
 
 src_prepare() {
 	find -name 'Makefile.am' -exec \