gentoo resync : 17.10.2017

12 files changed, 44 insertions, 12 deletions

diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 3f7d07e4adb1..4c652fa04650 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -4,12 +4,12 @@ DIST clhep-2.2.0.1.tgz 1844675 SHA256 1006284b195e569276ba9d6e3e2b0b2d002e098c10
 DIST clhep-2.2.0.5.tgz 1847046 SHA256 92e8b5d32ae96154edd27d0c641ba048ad33cb69dd4f1cfb72fc578770a34818 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a WHIRLPOOL 4d5b7429e4b0498393c8f664045df4ba27a073a7e926ee9a5f9e196e5d0d3dd4da2cb4bf77e8eb37e6651c3e1f3f9742167414010ae5606e02f307ab6efe82c4
 DIST clhep-2.3.1.0.tgz 1538945 SHA256 66272ae3100d3aec096b1298e1e24ec25b80e4dac28332b45ec3284023592963 SHA512 786ad6289ab064c3c428ba2a8f534fcadd09f1f00a9c725dc987ea46c55d1f4ec7beab25221c978992dd195b02a65388a35aa6d7f471b6742c9ff6cdb7a8b7a4 WHIRLPOOL 44f77d13c0c7b0f74c7d66c1196214d47f5ec71411365746769d7d2f1dbe53b8d4e18fbefffd6a677a3329ba16e5333277d5e6c6e8f880c24cca7d1e7c88224b
 DIST clhep-2.3.3.1.tgz 1565701 SHA256 cd74bfae4773620dd0c7cc9c1696a08386931d7e47a3906aa632cc5cb44ed6bd SHA512 b13e336f9c4dd741291768a4c59075e88467ad54dc41a07eeb519712055e1a26c2369bffb6aeeeac4199066ce1bc863e9d90647094dd2fced7069d82a4cd1317 WHIRLPOOL 03cea53429711d1c076c1d5ccf61e3f072109608fd79219ae8dfd0540b86da18c13eae1f317d3eddad080860f8e0da25b41fe9f0a3b0ae448ec7ae22a2d16749
-EBUILD clhep-2.1.4.1.ebuild 1341 SHA256 aaa5ee15992346e82b2cc2ac17cdaa35aaaf5c75aef3a36ff1ebab4b1097bc52 SHA512 ed488e18fb000d46197ffbf108c26e1b36b92993fc345b45d5d71fa83cae4f6876727d6b2e00a5be6a1e8d647e9cc16aa61b19b6db0c1eaf407848258ae305ca WHIRLPOOL 2a398c43518674ce3aa72197e4766086b3143bba2a4c98c4a3f7612ee205466e0fc1d426dbce25ba0d8f57f8e001e65ff030b1114bd9851f426b0b4d18e04210
-EBUILD clhep-2.1.4.2.ebuild 1352 SHA256 dd7c5dbb81da13fccf0fe5dd29d06096e0e8d2cf012b95b2b99f0c0683470d2d SHA512 16a0b0f6bf4363d479f2d8ee9974098b3d315ea5109fda983533b596d9ae1a3e66ddfccdd066654c6deffac4d05c1f76e85deab7eda32ce0d88c2c71e28d24d9 WHIRLPOOL ed269d73983b10db996d7add14dd0498f4b23d12847d2d6e94140781183e9b267f1cef91f8a74a7efa14d9a2ad6e96940aedec1b203bb08b291b186dbb0740c6
-EBUILD clhep-2.2.0.1.ebuild 1352 SHA256 dd7c5dbb81da13fccf0fe5dd29d06096e0e8d2cf012b95b2b99f0c0683470d2d SHA512 16a0b0f6bf4363d479f2d8ee9974098b3d315ea5109fda983533b596d9ae1a3e66ddfccdd066654c6deffac4d05c1f76e85deab7eda32ce0d88c2c71e28d24d9 WHIRLPOOL ed269d73983b10db996d7add14dd0498f4b23d12847d2d6e94140781183e9b267f1cef91f8a74a7efa14d9a2ad6e96940aedec1b203bb08b291b186dbb0740c6
-EBUILD clhep-2.2.0.5.ebuild 1348 SHA256 63ae99715a5afb3fbe94cdac8fe7dc983ae0563e110414012eb1b7bf25419a32 SHA512 ca0e8931cdf473f2be975e7a01f77176f50a9a6e576ab1a9ab36bb1dd2fbe40fb3486c2a53176d9570842560f534555cd0401d84a7e74bf0995d879fd885ebed WHIRLPOOL 506f5ad98b2af8c1bf67ae67533bb4b9732b6d913e7e90d90879ebfb4c03df5e649862a8ed72a464d360783f035c0acd5c45abf0c0a878b29dd2bfd06f4a24e7
-EBUILD clhep-2.3.1.0.ebuild 1352 SHA256 dd7c5dbb81da13fccf0fe5dd29d06096e0e8d2cf012b95b2b99f0c0683470d2d SHA512 16a0b0f6bf4363d479f2d8ee9974098b3d315ea5109fda983533b596d9ae1a3e66ddfccdd066654c6deffac4d05c1f76e85deab7eda32ce0d88c2c71e28d24d9 WHIRLPOOL ed269d73983b10db996d7add14dd0498f4b23d12847d2d6e94140781183e9b267f1cef91f8a74a7efa14d9a2ad6e96940aedec1b203bb08b291b186dbb0740c6
-EBUILD clhep-2.3.3.1.ebuild 1248 SHA256 c8b915c6ec7dce785948935137d868707a2c848f9e1250fe3226e88dcb19d23d SHA512 56182096a809c4da490bd2aad8de45c094d6c6c1621c47563693328a017f34e32f50df3bd41617009f6d5baa1b76dc5e90a301f560e3fbc4bfb3093c5ece56f3 WHIRLPOOL 2c640615426fed958581ce6cdbd0daedb8ce57fd03659d83577e140083c4e19082878493cfb9599909ff82a5b4c2ded3f452917553dbaa1ed84d945454e37a4f
+EBUILD clhep-2.1.4.1.ebuild 1367 SHA256 b8e80b8485fb67b71ad1a858122a72a2428b6754681f1fafa0ca919deb4f2829 SHA512 4e14e1d851d8dbd5155b4a527497b875f0779e42e6aaa74e825ec0fcac74d7851e856685b11ceb81b35e7604546928839608e30a8ddb7a93ba2fb9686c1b477c WHIRLPOOL 1575f14f73d95d7ec69b26e6f1c11f8be4cee0a11d924826ef1c878e56ef969e4cd239449f81b317f76305227732c7185641503f5224d800adaa22cfeea30037
+EBUILD clhep-2.1.4.2.ebuild 1378 SHA256 0b4e86987b48ed5698e5069340712498bd37435f7b2a705602659150792c3761 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410 WHIRLPOOL 597fafe4c1432cdb2983233e8a39ad1c82185e5028a85bd45d061f7d0986a5b44d0cfb7eeba87ed85cb36db1ad49d6a8207d3c8c05b08593ae69ef834c7e2a10
+EBUILD clhep-2.2.0.1.ebuild 1378 SHA256 0b4e86987b48ed5698e5069340712498bd37435f7b2a705602659150792c3761 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410 WHIRLPOOL 597fafe4c1432cdb2983233e8a39ad1c82185e5028a85bd45d061f7d0986a5b44d0cfb7eeba87ed85cb36db1ad49d6a8207d3c8c05b08593ae69ef834c7e2a10
+EBUILD clhep-2.2.0.5.ebuild 1374 SHA256 fac9ff60f9d4897314424ec7b880f878fd91414f4b021fb036d21a2cd94280fd SHA512 a11977b880aed6a7a678f5e3f8f661a2687a05ac611f2dccbcacccd56c9f5e27456b46e6af512627a3a849507c70b8df3d13188c589443052fe1b38275d608ef WHIRLPOOL f4bb7635582dcdc8744ed08675347c12e6060053094263031fbb8ba02aa0092fc434f2a8c0fdc34fa4d28af48ecfbb7d82d4076fcc4770e462426edd81594472
+EBUILD clhep-2.3.1.0.ebuild 1378 SHA256 0b4e86987b48ed5698e5069340712498bd37435f7b2a705602659150792c3761 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410 WHIRLPOOL 597fafe4c1432cdb2983233e8a39ad1c82185e5028a85bd45d061f7d0986a5b44d0cfb7eeba87ed85cb36db1ad49d6a8207d3c8c05b08593ae69ef834c7e2a10
+EBUILD clhep-2.3.3.1.ebuild 1274 SHA256 41b378c40d321c93d5048aeabf39f79923a6fddaa6617cf4cf9d4e2e57701010 SHA512 26954289283caf6666d84f4fb48f1ab1514f42d9c694657485c1d84e69524cfeeb7fb89b11a4ce4d9fb946f05493746172c3e69836f40accd60f242fee46e248 WHIRLPOOL 6aa969d25da48ea8bf2aa8c858861ef672de1221afcb5bb98e3f32dea6e9c527bebe1383446052981de13f01da8dc6be46116dbe6cf824723cddcb8620e774c9
 MISC ChangeLog 4442 SHA256 eea1c1df9b604ad32734e1f5b8a25e619aedc95694ec9fdf421b49016c214c6b SHA512 65aebb110c5c980b9391f336b63ffa3dbd8703b92a3189be2bfcc9507ccea4a49530909fc63ad309f904fa0fa2630f97dbb7c00b3dae2027e9f2a6a231a47a22 WHIRLPOOL dd67349fb2eb0e932c1e0a6b308a2e074ed97d4e49cb3af74bd9dc44f40199479ef91b75df9546ed6beed55bd50a2bb042cb33b4fbdaeb4a70da3621e2c53541
 MISC ChangeLog-2015 6665 SHA256 c38824759bb3ac9651e79cfbdff8b49fc0bdd2041cb28496fc6c3528e607d9e9 SHA512 4eb65b83d4f0fc5c0f4db114b7d5c1fa0329966717baf8c32a0872463356bbf4309bbeb655bab67b6fe6a1ab0e610251354ac81dcd1ee3ab8f01fa737bf6f8e8 WHIRLPOOL d6bf4723f82b974b2b4b50d804614f4b5b357624a2c91790b9c762e670a0fbc41ac976a497bafc1b253c5d264c7d8e8124693fa11273e1b15e6dce030ef8e9d7
 MISC metadata.xml 496 SHA256 435dcec4bb9a8ecbbb48fbbf92094e2f4e4a0e12b13a9fa76ae6c750d492d1f1 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96 WHIRLPOOL 08a5f3b8eb063531f070f3a47173bb68d477f21e4787cc0791fe8ae5b798de734f5ba98ba2f4a2407cc93a772b076c1e4db9480f79aa4f9e56b33c209c040cbd
diff --git a/sci-physics/clhep/clhep-2.1.4.1.ebuild b/sci-physics/clhep/clhep-2.1.4.1.ebuild
index b790902eb456..39ae660ca9b0 100644
--- a/sci-physics/clhep/clhep-2.1.4.1.ebuild
+++ b/sci-physics/clhep/clhep-2.1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# no batch mode to allow parallel building (bug #437482)
diff --git a/sci-physics/clhep/clhep-2.1.4.2.ebuild b/sci-physics/clhep/clhep-2.1.4.2.ebuild
index 39b91169a162..fc50b6a42203 100644
--- a/sci-physics/clhep/clhep-2.1.4.2.ebuild
+++ b/sci-physics/clhep/clhep-2.1.4.2.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# no batch mode to allow parallel building (bug #437482)
diff --git a/sci-physics/clhep/clhep-2.2.0.1.ebuild b/sci-physics/clhep/clhep-2.2.0.1.ebuild
index 39b91169a162..fc50b6a42203 100644
--- a/sci-physics/clhep/clhep-2.2.0.1.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.1.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# no batch mode to allow parallel building (bug #437482)
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index f21569474620..35c47db6a89d 100644
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.5.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# no batch mode to allow parallel building (bug #437482)
diff --git a/sci-physics/clhep/clhep-2.3.1.0.ebuild b/sci-physics/clhep/clhep-2.3.1.0.ebuild
index 39b91169a162..fc50b6a42203 100644
--- a/sci-physics/clhep/clhep-2.3.1.0.ebuild
+++ b/sci-physics/clhep/clhep-2.3.1.0.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# no batch mode to allow parallel building (bug #437482)
diff --git a/sci-physics/clhep/clhep-2.3.3.1.ebuild b/sci-physics/clhep/clhep-2.3.3.1.ebuild
index 5238ed7061c7..e284870ec6ae 100644
--- a/sci-physics/clhep/clhep-2.3.3.1.ebuild
+++ b/sci-physics/clhep/clhep-2.3.3.1.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
 	# dont build test if not asked
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index ac5c1ad95ed9..58ecff0f1ab0 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,5 +1,5 @@
 DIST HepMC-2.06.09.tar.gz 4612637 SHA256 c60724ca9740230825e06c0c36fb2ffe17ff1b1465e8656268a61dffe1611a08 SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4 WHIRLPOOL 62b91da92ec30bbc1f5619a87e6172fd563751fe29453ed5bdf31ecae6c5964b59a601b4a52f5c3249cfc20664041ee27bb7114d006dabdf05c5926194890370
-EBUILD hepmc-2.06.09-r1.ebuild 2008 SHA256 ab8e3996e4927e3b7b6ac7d2c4fc55d394519c51833cf184bbdf89db7ad9446f SHA512 45ae43d27f3a46c79feaed8f9071f45b9a63d6d22dc8f93c0f329f412eda80eb722db0cce12a441f6a94356bf69131c8508a72c9d90b8fc7bcc1abb37ff52b0a WHIRLPOOL 276f66ccb72364d52167fdf186f1d8a2eab3404650dc7ae5c1c9c53817a78216a88fb7e8d49c8f2b1dc8b1d93cb8547faf64f447710eb743794144f5b50dd482
+EBUILD hepmc-2.06.09-r1.ebuild 2034 SHA256 a241525430287e4d8e44b0dfd71b3c368134cbd85d3be373f6cadbaa0f64e282 SHA512 0c83528e2872cacac7ea2e343a479fb383f6a64af6286737a09e2ed5d57e12cba1e0d579662e7a3a866f75790726b56e822131e9572d1c85fd4951fec823fc51 WHIRLPOOL c977336451a95e75b3dca845dece74c7db0e8a9ab4f8f37dab52b4606b9aa2c742b75356fd1a1cac0dd5494c42a8b9891bf71c68116eb0935aed3091bc388332
 MISC ChangeLog 3586 SHA256 1c634047c1bde1e526fb7ba5f9a2a87bcf3567dea5bc66afb442a47f3003c862 SHA512 7c8e331067647437ecc9f278c1d1d63e0538fd70b80f360c9cdfc97c1687e7b393d85440814aaed9f322c5071e3f1e3f2cbcb8ed67c805bcd136a35f4cf77045 WHIRLPOOL b5fe5f2ce632efb3b96e5aafd67545370edf2bfe48d3a798ca9f907cdd412338f4b8d71fbe373f25d7bea014b1cacc734287ea105a205dc7e075bfa8a81fe949
 MISC ChangeLog-2015 5053 SHA256 1fb557bf408eee5a73f39185d63736db7e3b298e4ac6c3fd3415d90179b4b600 SHA512 c5d7567e359699d58ad9c4a62f7ebd27dd1369d4d6f565b6045a4c199932a6b820ad8a882915637f31364cf86fc6841bbbc9b84d49e41c86e29f265b1e57825d WHIRLPOOL 420a066d467a9c17111c0254620000a3d8d0c53440c8a4842f97858471c5040ab955c3a4e4f327fd5a3620f997e59bac3288f7668142ca7413cd7f27d89ffdcb
 MISC metadata.xml 1386 SHA256 6d4ce6cb438474cffb889b1314febc176012fdd85ea1de72957e7596f2f8e0e1 SHA512 b0ef90b6404b04d1d393e9e8bb04ff08a51f72938362f4ae1e2806bfe29c99d50089f15ddacb59b94d6d554d0ec8842ba7b89777434e0bab08c51627ab8bd9ce WHIRLPOOL 3eefd0c08807619b539c4935dd2ca7fc6c3c894939b16547a954a44fea904dd0ff57508b960cd9e610874b5a77aca2eab74b985f7037d1feb582da077efa8c54
diff --git a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
index 20b3409bd416..46b3b6d47d9e 100644
--- a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,6 +31,8 @@ S="${WORKDIR}/${MYP}"
 DOCS=( ChangeLog AUTHORS )
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	sed -i -e '/add_subdirectory(doc)/d' CMakeLists.txt
 	# CMake doc building broken
 	# gentoo doc directory
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 \