gentoo resync : 24.02.2018

19 files changed, 39 insertions, 26 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7345831473ae..47dc8de91c20 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 90c514c1fe75..34b003a0a37f 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,5 +2,5 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.2.3-r1.ebuild 7470 BLAKE2B f15775486bb8a47e11191d3fb361f25f3b82fac5a6d81e2fa4e1b3161a5b9b0ace3b70c912304ed2da3d6821ea4500367ffa5919844e7e5159bf3e7c2563beb9 SHA512 dfbf230bf61217897c873a5c5feb54189a434ab783f259d8ccb293c72c7443ceec9509dfae55539088ecceea221406df3b6e76675e088c3f46daa625c2cdd693
+EBUILD gdal-2.2.3-r1.ebuild 7519 BLAKE2B a9c89375ce4204b9a5b4149cf33078f78687c1cd442acfce7c3a1dedc985eb39f4dd94b059df9b4eb5fbd3536a1487557bae6e5ff56d53ae0ddc88978b997f14 SHA512 543d4aee1eb21294a005d88d242c81b37f96d25059355fdd36c3a1366d60199060d1d7a2abd372062652fafe99bdce7cdde447845c10ca45193c1aef990c9e15
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index e1c5f8a92cf7..9370d1a2cd68 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
@@ -117,6 +117,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619148
+	append-cxxflags -std=c++14
 
 	tc-export AR RANLIB
 	local myopts=()
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index ba0a0809d30e..7e5976ee840b 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,5 +2,5 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb1
 DIST geos-3.6.1.tar.bz2 1833434 BLAKE2B 7feede989d9aacad8b72e107d988bac7746e74e1674d812a2db738f124d357cf0cb24b4040f36a0e1290086c87585f1155f5cac962bb2c8ad83d7879d7f30af7 SHA512 8b28e7706567375ca02ae5f5dbebf0870e8fed8ea430596a3637e5c975e72bc0f3c16c31b052f154042dd029c54130325a8d44de95c3458f5da024a97d3cfaf9
 DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
 EBUILD geos-3.6.1.ebuild 1326 BLAKE2B 63fec330aa117188041ac2a9653d3a05df850bdedfdc8dc22442c5be81b50d7c6ef73785de7a304d1341ec18911e7ad0a1ea940b8c23b764f49215a1d782dd70 SHA512 98a71dde912af00e31687741a6d327f3a03a69c659a02b9b98ff554dfb8c6765518ff139d40f5c890a033079410072c6a6d4ff09e8825e69f83efad2f89f80a0
-EBUILD geos-3.6.2.ebuild 1329 BLAKE2B cbf192a1bfcd333a6ff710b6b37c35b6f915206c72f85b3e14e03c6bf352c67f4a26ff47237bb811eae592eb944ca528996316d5913114df52e58c00ff841555 SHA512 a20a6ff91a4ffb65a97a71a884b1b888fe247f0808b4589daa349a08b1c7e271e7ca3f3a924680b278abbf056c8020da5747c8936826aca5df75157344eee6db
+EBUILD geos-3.6.2.ebuild 1328 BLAKE2B c7d158b3c163208fc0f00c5f829ef9138bd557b7f2e803a2bcef75b8de5ecacca0511d9af543f2bf7617dacec6247cbec2d6391a3da034a81d7b352049c33f49 SHA512 232e668e4663159448ce0307bcdbbc139727c0f5a9b68e5ffcbd3c0343aabf50b2cd4473db7d024218ed541d05d1713961eb297252889c013d1db15a7e8b0781
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.6.2.ebuild b/sci-libs/geos/geos-3.6.2.ebuild
index 4dae1eaf9d6c..f28ee0b8da05 100644
--- a/sci-libs/geos/geos-3.6.2.ebuild
+++ b/sci-libs/geos/geos-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index e8ac85af1e4c..41ae01d16f44 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,5 +1,5 @@
 DIST ignition-math3_3.2.0.tar.bz2 382201 BLAKE2B 79d0450356d931e3150afddd8f0d558923c6a27be4a56566ba18c6dc654b61b32acb92eff2ce5a87228bd512058e4b68d85b26bbbf1ac6a6c6af617b5ebcf59e SHA512 ffb5d61105ba0951c6420c53d64b47bdd65bdcac17e8ef2ce7cb83aeb2310280e5acb4d029d1af5c05fb5c40accf05df61d1e04dc990225159f1749284e3dcf1
 DIST ignition-math4_4.0.0.tar.bz2 387717 BLAKE2B 1b19bcd377eb18b616a300e022419ba2651795e04c0f0a3769f565e6febdc1a37f321c81730e1c13c9f9b17f35e6cf558d1129b278b2477ec8d5a5f46b927d66 SHA512 4815c6222945fd228b2d23c9da7ad8876f8ba1fea382312e1eb320819ec5d8bbf637095c18dbe2413184bbea77040bd1a5492ea9427355fc5e62f6169277530e
-EBUILD ignition-math-3.2.0.ebuild 880 BLAKE2B b866fffaa38d0825997ac051a3be3ca79fb5e7b529b5abe344bd05d15e835eb2cb6212d1425d067461160ae85be4cedc7b370761447c52d758ce951bc4d9f4ef SHA512 8c5e7eb0bba7b5c928dd42169a7ffcc594ef338314dfa81373b6ffe3e5d836d944627ae68c342ca01b630c6badb1e094cb680e449fb5d68f160fb9b93bf96a88
-EBUILD ignition-math-4.0.0.ebuild 585 BLAKE2B 37def6107b2b72929d9b2f4306e4a7bb3c5844eade668ccef8878c96ae0efb1b83b91ad9a215ca4243e4d2235c2a815b06bc92ae775272bf89cd6d0633e51fad SHA512 23cfb27f6f8bfc659ffd0d82b9eb10927f6f50229857d8a2f23c85af49669f223a398c9527c5d6fc6cd73435b72ab1f6ea3c98b7a1c642482013644537f17645
+EBUILD ignition-math-3.2.0.ebuild 881 BLAKE2B b22579cc9846ff35aa82bbcc84565881803a180ccb52bf675d0fd80fb58a5f386d014e8f14b2b91602f3ab8450a9caaec6bef4dbcf6656dd0d67201fd4de8ffa SHA512 f13343d8a98b7e40e2e9c67142831fcd52e86aa42246cd5c8ea81f3821518746e9786fb9ea81b2b205a4841557f33f6d0ed389f758a112f29905646d7b60284c
+EBUILD ignition-math-4.0.0.ebuild 586 BLAKE2B 58612cff1c406ae4afc93963ca099ec0d53415fd57127a604bae1b498695de2743f64a41547c75e2e08225247086efe4848bfb3c06685a56f312dde95aff1639 SHA512 2665fe6615cb7ff1be80534a26b6c2452004c9a8719afb163e211302ed369f8886bbf9d90a682b6c24d192cfebb3414d0b93871cbfe0f479c4afe416469798e5
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-3.2.0.ebuild b/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
index edbe8795a029..a4ba79c991d3 100644
--- a/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-multilib vcs-snapshot flag-o-matic
 
 DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="http://ignitionrobotics.org/libraries/math"
+HOMEPAGE="https://ignitionrobotics.org/libraries/math"
 SRC_URI="https://bitbucket.org/ignitionrobotics/ign-math/get/${PN}3_${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/ignition-math/ignition-math-4.0.0.ebuild b/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
index 423c6ac865d2..03d5e2d9fbbb 100644
--- a/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-multilib vcs-snapshot flag-o-matic
 
 DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="http://ignitionrobotics.org/libraries/math"
+HOMEPAGE="https://ignitionrobotics.org/libraries/math"
 SRC_URI="https://bitbucket.org/ignitionrobotics/ign-math/get/${PN}4_${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index 949d49b2ea2f..bf106034ac1c 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -5,5 +5,5 @@ AUX libdap-3.18.1-disable-net-tests.patch 1281 BLAKE2B fd00fb1920a8440a633aa9595
 AUX libdap-3.18.1-fix-buildsystem.patch 621 BLAKE2B 09ec113a8860388d9d1150b7111352316b52d8307e29c3db2d6de00d2bc912d46d7c27f2e0f3429382691ff2d3696252c019554c28d8c92ea8f74db9c7877e5b SHA512 4aeb883dd338ed3c27ab2fe217d8419c8e4130485eec11f12b75dad6979034b4cbe251b4f81d21280a05257cd7bd5e56fdbb20b08f48ac0d48822024cf00d9bb
 AUX libdap-3.18.1-fix-c++14.patch 2287 BLAKE2B 2d6c036ab9ad4d611215de48b4288aa93868f3411d5637fcde7757ada661319472827bc4eea7084f925ecd9f9561d2156a4add8f5eb04693b4eb687f02efc398 SHA512 6bd2722f16cd3491922b43040148efb09dcf66f2403bcc8caae028d3497a5c864d6539b980c32cda01f35fffc2c724b68d20042f8d341f0a3a50c8fa78670535
 DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38
-EBUILD libdap-3.18.1.ebuild 1095 BLAKE2B 3b8fabafe6098b821d37d73b151f9fb2df0ec83aac69b161c154f0fa116230afd46c94b43ca47cfa146c39237ad76b968fccbbf19e0c8c84ef2b6ff8afd1f53d SHA512 10f6e2e7070b7bae860043a15cbb4d570f68a9f0c265eef4416aa4400a8748878773b3d30b3a59f4fdd6bfa9d0cced7064974173d383bdab62334ec01e5216b8
+EBUILD libdap-3.18.1.ebuild 1151 BLAKE2B ea8b98ce07887d2e5d06680ae4d5d881deabaa7c867e7dcda481ede42906c039a2f24f4d5606ec3f7c262975103c936c339f6926e5883110794f928a573b1c95 SHA512 1580012d315a89a770513d7beb940a603fb581ec935da4617825e77526c9a0ddcec60024fe2ca043ffe94d56428aacd7d28fa1a1d68059de8f7025a68c1dffe4
 MISC metadata.xml 772 BLAKE2B 93699e5e75c2fffc660963cbc98fd31194553489cd52954c67f79b1b429077e46f66cbf9e6ba170a8e1c9a8213a5e9451350de461d7afe136ba1db88396a9d61 SHA512 277e96ec4eef7a080303e3b3b054d51c017ef2227644ed2d78a35d5c873f085f4524aa14b4f0f523a3d501c96a1f078032941d62005721e8264e2c5d625182eb
diff --git a/sci-libs/libdap/libdap-3.18.1.ebuild b/sci-libs/libdap/libdap-3.18.1.ebuild
index b0a4bfc02ba2..c0680c183d37 100644
--- a/sci-libs/libdap/libdap-3.18.1.ebuild
+++ b/sci-libs/libdap/libdap-3.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2"
 HOMEPAGE="http://opendap.org/"
@@ -38,6 +38,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619144
+	append-cxxflags -std=c++14
+
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static)
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index c6493c979999..d6c58d1eff4c 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -4,5 +4,5 @@ AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4
 AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
-EBUILD linux-gpib-4.1.0.ebuild 6127 BLAKE2B 180134cdf998320798607b501570acfde9d0ba966bc196be7b0140ace6c30152c7eee3030fc3b380773c816e39a7fd04d57026c5675b819e71aa04120bee6343 SHA512 a6df0070dd9ce9a98e291422b07c9ac3e9f146f43290a65cf44d239ae324877e891a90c25978251e2c0e79af04d85ac8fb8bbb0415004050f7289b8900969a7c
+EBUILD linux-gpib-4.1.0.ebuild 6148 BLAKE2B eba62ead0f6400de24715a07347737f4ba03e465d6a0eb16dbec5e2c5ca0301ba3c258a9e9c4268fc3a267433cb60f7ca726da61b51e563a516d60a90d92d9fc SHA512 63029b5e608e9834545850403d1aceaedd3c247d5c26fa5ff5ac33714dc6511a297dd2d4a068df6e9fae735566f6dad56574e9c737b672251a7f114566b9999e
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
index 8430c062a4bf..b4f528a35e76 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm ~x86"
 IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
 
 COMMONDEPEND="
+	sys-libs/readline:=
 	tcl? ( dev-lang/tcl:0= )
 	guile? ( dev-scheme/guile:12 )
 	perl? ( dev-lang/perl:= )
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index d3e6099e9f82..86b804a30fd2 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1713 BLAKE2B d520a1abe3a11757b50090a86c1a61025e0cbac9175b981ac14608412f69fdc90a20655ad89e4245d4db188848042070dee1e0e4fb21fdafb9b3d14a75292b9a SHA512 0fc862cd24cb1dbb78d54e444b5fdc04a8c2f0f053e78c766c08139b7ea7af88fc172bcd337a5e79de1b867cd29ca71b4eb2e9fbd4a8cd44693c630065f0c647
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1687 BLAKE2B 9d203640e08dc7fc47e1edbdc49aecc93778001b8f569b2205525b84aa950e6af466928e2d424922bcc2d4910cc7d3bd8095fa698adfb2dacb244c5204fac613 SHA512 fda52e860d04b4ad1010dfd4714268c95a513893412a51cc2372e2eafdba93b3a309224433259dff638098d251d094341a838b39237f68315850978240899a20
+EBUILD mpir-3.0.0.ebuild 1730 BLAKE2B d2e2d53e2ef88eae283bd03aa1ed38f3b5bfc9b796208d56a6ad56a44b652215b86167fda36391c1cf401639a408cb697d76924a82b73a9bbd90bad481164377 SHA512 17a52f08f460bf5b446c101831d6113a8edf6d77736115e27523bba0e00833cb931c87661d41ccb2b1577ae0bcb3ed9a8d36d2b3caa077a4b37508dac515391e
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 14bfad90ba26..f6a4b38450fd 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,13 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
 	x86? ( dev-lang/yasm )
 	amd64? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
 "
 RDEPEND=""
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 6bf2ccfed699..5acb1477df40 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -15,7 +15,7 @@ DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B bc8e590509cfb4bfda9deab40bbc6ebc919e39
 DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f SHA512 7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
 EBUILD scipy-0.16.1.ebuild 4249 BLAKE2B 8335f8abb2453467099d68e97aa3aa669634f64b42e75b3c310f6f39178f90c9b8760a1ffa4bb76a3ff6285dc19806074e7408d16427416caa2bcdb9db6aed0e SHA512 adc049f57eb2c16565d8d99983409a6f64f57938aa649d89008587374550af06aa5d1f9476f61d9fcfbaa5615e60732381c1ed436b0dd9241aee00b43370ba44
 EBUILD scipy-0.18.1.ebuild 4254 BLAKE2B 156c9f9cfa488170e9be814e2238f1e4113f6e176f4458f3f659959ab6d552729afff18a3a0c392a579f7025c216a7ce354910f836a26549866764d86d070f74 SHA512 f20fd715cbb7667cabf636db6cf11b8b1de26c497ef87a6d4ee16324415867a9fe06f0bca57677eacb4622b621e60badcd97e8325dc74076492cb0e29ef8e4f2
-EBUILD scipy-0.19.1.ebuild 4196 BLAKE2B dfb2b02782522732eb94406e43f839eb9d66628e52697700ad9e6f889ae17a34c5bf4a17625c876bb0c0d122b875349adb0c0c8643fa6d073228dba4d9062dd6 SHA512 e894f6860336c9bd78d0a01fddc7d29fe515172a87a39dd9c1dedec689f637aec8f0e387ef872d8036c2a4f2eb04bca647d34bd023a53b65ca1e60c58643366a
+EBUILD scipy-0.19.1.ebuild 4195 BLAKE2B 77400ab7ab574f43cb0cae20747e44f2de54302460fd03f93713197aa44c02e3fc27b43e2a5af64f4d40ecec2f636051b957c129038f93ba65657469844ac937 SHA512 1fa512c6120be79702a21b6f9ab68a1a6a079c5b4468866d28cd4ee3ecd8516b91f45cb7810f2932794db155cf72b30e92c58b76ba8a6f7bc08fa60738e78dc5
 EBUILD scipy-1.0.0.ebuild 3978 BLAKE2B 71dee72bb5508a1eb06e729e7040c9bed83aa7d09c329e32f0d6e67fe9ca7e7bbce28a796e688215e48185dd921b324ce2b4df32fd90d0d5b2a52da0247a11e9 SHA512 62a0364cf6a67f1342aa5f906d31527033e06ac1f8daf5378a459d7d2487b7d0d2860e1560e0c7f3698eafec1a2abcf14159f89041b3068e5f33bfd7ba7ebef3
 EBUILD scipy-9999.ebuild 3615 BLAKE2B 83d9274d3c6cc56d1de623b99e15da74df3615aec38675912937cf0572a74ce5ad0eaaa945e541707d8a5444251d4009eddeeffb287cd4db89cf610188f0759b SHA512 55148129c46cacdca338380d7d26792dcdb5d7fa3128273de9c44e930d6bf83715574d26d8b065fec8b633f1efbda9d9446a5b6bae04bc9069d315a1ee85f385
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
index 864285aeeb4f..aabfdda6e4e1 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 72a66b313f0f..75bab3953fa4 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -1,6 +1,6 @@
 AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987c414223c6dd53774fe436077dfcee9960f4f628087c7152a21f0855daca7aa10fb18bc91b6362e7da14dffd6ce0718486850aafc3c647c3a7668d SHA512 c2a8a2e5f39b86cd083211f5e14188e8f63822d24b1b0d8a8beb485f0a0766894b4dcd717f6cc57c6352e46b4c69574b5c05ec318b7d6819d03fa68fbcd2e5ea
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r1.ebuild 1484 BLAKE2B cb651db6ee0e08e6d546b93af9ce40904d45a4f3e691685279dbe099d2cbabc13ce5fea4938727bd7dbef525e9a971c53eb07a1418b2dde6ae0cbbf4df09fdad SHA512 c43c846d550da9c12834f00325c3d8d1f8f2511ec58ef04036d855fd643c6c5c27d1b8cec5b88f5275904959fcce6a2cb2e0df96d474ffc2db8affce69d7ca6d
-EBUILD xdmf2-1.0_p141226-r2.ebuild 1710 BLAKE2B 9dd8c9ddc745a2043b76e3669e045922d29a45574e7296537ad6f000b5507cff87a7e58f71d9a10fd26e5c4a2b793d818af4fc22c54d9f0580ac2757e7c343d4 SHA512 1795253fc018b7e135691fee4cb19a8750cedba50bca4d3acc92bf490093b87a903d5a41c3d2fa18afbe9bee10f03cbfe0784a0302f84f1afd4fccb3e9c5eac4
+EBUILD xdmf2-1.0_p141226-r1.ebuild 1540 BLAKE2B fb84d09a0aa7082f90deb5ec8fffa003a409da6ed0318b33837473d1c61bbb9bce6793eeb92152efe4e5495e0baf255432170866764318218250b92b40052f92 SHA512 4758b233409d8979fe16e6c700528692c61784573613f74d154e99902e09b80bf37463558e96627b4e422bdcc98516aaf10066533465d9a0315c8f917c115115
+EBUILD xdmf2-1.0_p141226-r2.ebuild 1766 BLAKE2B 31641e640461982cd1de9544f2b66b09b61ea0090a9646671f0900925858e7b9366f8e2d0d92726caaa0407b5b65017a2498c83fd686ee69814bf1075d0c96ca SHA512 590a9f44aed89b12bfa73bc520d9d27c3ee6db408a7d67d1fea928532d5b1705ca7095c53964a9b0a288ce35fe7dfe886dbfb8d56195a4ca4779680e6f49ad8a
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
index fc04d4922d93..a0cf89a25299 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils multilib python-single-r1
+inherit cmake-utils flag-o-matic multilib python-single-r1
 
 DESCRIPTION="eXtensible Data Model and Format"
 HOMEPAGE="http://xdmf.org/index.php/Main_Page"
@@ -49,6 +49,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619604
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		$(cmake-utils_use doc XDMF_BUILD_DOCUMENTATION)
 		$(cmake-utils_use_build test TESTING)
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
index c7d39a5b0c8c..605039d40cff 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils flag-o-matic python-single-r1
 
 DESCRIPTION="eXtensible Data Model and Format"
 HOMEPAGE="http://xdmf.org/index.php/Main_Page"
@@ -53,6 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 619604
+	append-cxxflags -std=c++14
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=1
 		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)