gentoo resync : 30.06.2018

32 files changed, 475 insertions, 113 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ecb228940551..294a12238757 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index bae179657097..dcfe5364f357 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -4,7 +4,7 @@ DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f
 DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d
 EBUILD Shapely-1.3.0.ebuild 616 BLAKE2B 40b5772a42c752cd3a8b1af73c32522d13404d290e55679117f0b66ad8c1b73837ef547f2eccd1f80e92cd6b9340114a7852691641790102dd8fb219d9265bbd SHA512 572a36c51ded12facf3bf61da88b01e84838ed1ae76fd92f1afbbd0ca03d5feddfd9306a7b724e54be961abda8b1a242a5b26a02f018e7ecb4a81497f9faef4b
 EBUILD Shapely-1.3.2.ebuild 616 BLAKE2B 40b5772a42c752cd3a8b1af73c32522d13404d290e55679117f0b66ad8c1b73837ef547f2eccd1f80e92cd6b9340114a7852691641790102dd8fb219d9265bbd SHA512 572a36c51ded12facf3bf61da88b01e84838ed1ae76fd92f1afbbd0ca03d5feddfd9306a7b724e54be961abda8b1a242a5b26a02f018e7ecb4a81497f9faef4b
-EBUILD Shapely-1.5.17-r1.ebuild 1059 BLAKE2B 4f0f4fffff1a90085201b43c56a80c83ee8eaf7bcdc5dd36aa35a722170db915b6d012728d30b8b61bf09de69fee496f73e0f2dbe7f245373872480a8eba8a07 SHA512 37f0822b7f39d8d0701d78a3898b335155b1084671e44711e3bd03c7043af67193cc89d63d4bc8e81b36342efd591edef78d75d3eab98947176cc21dde14477d
+EBUILD Shapely-1.5.17-r1.ebuild 1058 BLAKE2B 1767cd3f5e62169d5372c434a7756f113fb4905761a7fd539a3486d33c6f73cd4137821b6d06d20afc58d3bf030a202f3d23faa59143f158cad6c3e9c0bac228 SHA512 9b5550d65bb9c66c55e1a5284337f95e89cd506c61a7ac5aaacd1d26ad22ce217873030d6f281ab3713ca7fd48819b71b8c413b47ca7b2ce3d9208cc6b49611d
 EBUILD Shapely-1.5.17.ebuild 695 BLAKE2B f40613943d6bc8eed954e46d73a893a554b3ef4c2301e0318066c94972988ce8db5f552de0141387ddb3b01bffd66272bfb87dff55f6769cd1347d375976491a SHA512 cdf62837e50eee43531120a193ced8fa1a0df4da5577b01c153b90702caab4edcce35d6698c441e6dbb1e3a5946f57998c074b36375c516d58059c3658676368
 EBUILD Shapely-9999.ebuild 585 BLAKE2B cf9a5b6f9ed91b90573fab2c75ac0a1ba9f4d4521fb0861bb0433469185fb229e78b60a9a8084ffea9e84b069a8fc68bb389d59c4a762f32fa44de14e3ca8926 SHA512 c09c95c79b6e3d927fb0a3c91cdc2a6c2b8c2671c597196f62aa5aaaedfb4eb5820033664292fb10832718a2ca3481830557a05ab3ec0e1e91998067a96cdb43
 MISC metadata.xml 293 BLAKE2B 556bed997454d3e7c0a32291cae2326e9fcdd3cd91d5a3f43fd5934bb093daf397c3f3628b0f921460f7cb846b1c961a02de772437275193883d59c90f018e78 SHA512 850b4e0ef0b365030c29a55c20eba931ea283a3f1603d0c0f887e80fad352ffcee0c546cd68ada65d4ba9f33fc0bfb2a817b11e630e704a22928380c7180deb4
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index ea589527efbe..f89d281ffe3f 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.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
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index dfd6eeb81df0..c244e9feaa9f 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -5,5 +5,5 @@ DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab8
 EBUILD cfitsio-3.360.ebuild 1466 BLAKE2B 2fb223fb28e174080819389a09174685a77cb4ac1f96015e15932b16d81e059f908fa4052b7bee6fb1db20497eafa312e6fb92f2499b7cf01eb29af1ce052a02 SHA512 d0b05587db82dae7c49250b9e4a426b7d12c6a1c904210da1b08d0dbb0db44ae01cb53f0c28adba97f5487f74bcdc7c1c19b9c4286dcb3ea232a2e77c64b7068
 EBUILD cfitsio-3.38-r1.ebuild 1591 BLAKE2B 4a4360c3b04dee99f0b62d0a03b60c02798211fccc4d3f64af726ce0775337510125d35a1d51a38ddc78db46a2b9b6deff5ec4224d10e93b687a8ab8e1582c3d SHA512 ee50da814b874ab5f3d3835ab7658694d94940eba4e7d58f9dec53c4b8fe4c1a9c98b8f5b61e3d2a1b195d8839d72b046645f0eceb8354f703c350b0a5d92308
 EBUILD cfitsio-3.39.ebuild 1596 BLAKE2B 7a167a2855fdcb796610ac1b3a17701c003bae05d0b64d1e9272ba8541116e2a5df9ebf2ec1be457d840e753a07a39bcab8b5720667d81e8c8c4a1e445d2b290 SHA512 0e2d890700a61a280fd8330679babc890f046e4a7e3cc85c724e4b7a3bea6e5da7f17ecd88ac7f84286ef174aaedce2b483491a7b66b8c423775c51a68c8d395
-EBUILD cfitsio-3.410.ebuild 1596 BLAKE2B 7a167a2855fdcb796610ac1b3a17701c003bae05d0b64d1e9272ba8541116e2a5df9ebf2ec1be457d840e753a07a39bcab8b5720667d81e8c8c4a1e445d2b290 SHA512 0e2d890700a61a280fd8330679babc890f046e4a7e3cc85c724e4b7a3bea6e5da7f17ecd88ac7f84286ef174aaedce2b483491a7b66b8c423775c51a68c8d395
+EBUILD cfitsio-3.410.ebuild 1594 BLAKE2B edac92f214f617c72a80ca8d7ac55840c7be32241c11f29967944c10b42bf3746cbcdb395381f6d63aeac811f323f64493edebc8431490678ed71b953c0da6e2 SHA512 6ade505cd5eceecfaca8d97080c2f6cfe64df58ea8aed5e748a6a780dc480077045456e49dfb4eec99194ac8eaacb42b1fb13b40641cdf2fcd8b47617474c42c
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index e38c68f855f4..b2f891ac2abd 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha ~amd64 ~hppa ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 doc examples fortran static-libs +tools threads"
 
 RDEPEND="
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index f44691548969..5eb4087dd7d2 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -5,5 +5,5 @@ AUX clblas-2.10-fix-pthread-linkage.patch 684 BLAKE2B 6f50b130f57a3a36a202c516bd
 AUX clblas-2.10-use-boost-dynamic-libs.patch 579 BLAKE2B bd7d7913b72baf15dd733a75050a5981c369fd42ea9c4ad2e6edcc084d52476b65a0b7269ce6c6083fc8fd86c2e2df0716cf0db9a645918c55b52e23165aebd1 SHA512 a07163684bcf69dba8c2df69d120a25ca7186104d40c27bf4d0267a21320460f3585d3fb1fb132df5cc5a1bca2905623c0285bffceb125c1f7d89129a3cc4f65
 AUX clblas-2.10-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
 DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
-EBUILD clblas-2.10.ebuild 2360 BLAKE2B ca839af53abcb9b155729f7c1ba3b7d12cd8f7a98cdde20a9736edc0c12ed5b8dbb7b80e3da1993a743cd8759b15ed9a8ea04730620397b7da94c9d3f4974ad8 SHA512 18dd363b3d05ec498c1edcfb86e6c01f0ee1379a21e42ffe6d0a07654c4c3d581cacc94c6a9d6332745fb99f2e04098c96b7e1bd6e2311d56fa53d3a121361bc
+EBUILD clblas-2.10.ebuild 2364 BLAKE2B 774f9f3170026e9480bcd50f0a8f5829a12dfd36a0800e5ddee21ab7a679293815aaa023a84a1ece605bc2e522c82f36bdfcd61a4b8abe08969bc3610cfc3ec7 SHA512 066271bfb93b7dc014a14b8d8b852025d62f84c27ff10b163eef7663b454a61ccab25a78e584463e774633e10e1f2fe394c484fc4191463d70786035e65748d2
 MISC metadata.xml 1029 BLAKE2B 9f21ddf2d9d08fccdf4f40c7324feaa5dc003a8ee0abe35f6158e3d9f507edb593f89216802ea04192486615ef5effb9ce5d70d42d4da5000c246be4db5c4e48 SHA512 62e2f6461060977e68d8f175f40d8de1801f5c4f635e33817ffb04dba9b8a19747bcd99206972e21b8780f5f0499290ff8b0d46bf5bdc1463659a8dd5cebb483
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
index de0b41541ea3..545451a85aeb 100644
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ b/sci-libs/clblas/clblas-2.10.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 FORTRAN_NEEDED=test
 
 inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 6fdd9de9ab33..dda7e23477f2 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,4 +1,4 @@
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD flann-1.9.1.ebuild 2185 BLAKE2B d81b5cc93e470f846c915401b35d7bcdae4c8c9a14c412829035367f85c1f4c9eb690bef0002d24adf78ab655603a06c14969a95670fab826baf04f14b025d2a SHA512 d2b3ee61c1066ca047bfa5ccbad4c37402fc3f10fbe0f4be8ea75580935de055cde09ea7db2a9a51ba4da14e7f069748be8642c63b5cd074d86bffbaaf568650
+EBUILD flann-1.9.1.ebuild 2184 BLAKE2B b30802c31a247f9665be199ed77ffe5dbaf9d5f5d7650b2a8c8cf472af63cebdd1bc7b7a258136d23b43f96c015069c8905fe9300a34a51e4b8dcbba8a331a2b SHA512 eba3ebb2798f06e6785c008077a664136ab4e58fda5d647e411e03778036895d43884838176f0a761b2dd392f09abdb4e5dd91f4ff5ea3b27eb1048d620bf930
 EBUILD flann-9999.ebuild 2121 BLAKE2B 336e31bc0e5ece6c63ca3c82e3b61605fbfa46e76ab111574b3d05303add959c31b2339c60768d7ab32f56e534b7cb08f08c1a29fb15279bf2d048a02d00df06 SHA512 6e3978c5c92f2723eed4615cc292aedd3be146a9afe0fc47cd1922a12fb9fb58d81d2f284f2946d96c5f4c2d235f06c0dc5929b37258ea83bf412d36a0ac1e2e
 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
index af8482936440..48b07167075c 100644
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ b/sci-libs/flann/flann-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 RDEPEND="
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index effd6d3403a8..986193e58ec7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,6 +3,8 @@ AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc3
 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 7556 BLAKE2B e8f07d634b9db3159a282d5e47b48a125ee2048ebb7378ac7e772b46c792fe482f557d408b18c15ca879ecae967c54f835d20c49accaf4434413a6581a3109b3 SHA512 955f994cbf9ac8b3e4ca1fc0f03727aabd93b868ea29d83503efd05d864c044ff4942a365a4e16b38f4f56b8705e0e2b48977e244e6580a29728771828817e40
-EBUILD gdal-2.2.3-r2.ebuild 7607 BLAKE2B cbd3aed4d0c7dc1ae88eff6bed02e2d23aa997d152512a3164bfe3064254aafde2327f9ccf95085b7fd5f01d6ea7b6b8ceec326195ca4b1422a31b24afb01ca5 SHA512 c31835c25043dbddb926549fab3ef7717218c1843740ade90e9785d789f64fb5aa9779f9b0997941154c8af8f97956a2a109bf9f794b5509d445dbf307a5fa45
+DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
+EBUILD gdal-2.2.3-r1.ebuild 7528 BLAKE2B db6fd16c9fa5679cfde4ef85b5ec6ecc161052dbd990da6e6eeae9934f300172bccd020e114067e90ad4ba25714741f24923379246ae29cc1ebdffe69bee0cdc SHA512 444f2a99ca963a4e1359fd888053a7cd8754534c12e4cd28bb4441aeeecc4fe869442eefbc7bcaa23347ee12cff568859f497a6411d0b0de86e3dbc2dd38f9d7
+EBUILD gdal-2.2.3-r2.ebuild 7579 BLAKE2B 3b6d969b924315db0563ba43b1f5b6370f5682c019095b8febdadf8c78807a85a81dd548fafb1826d91b6eddcf694f72f1f873fbfb42ba23a4a0da084e7ad047 SHA512 11f91a0186a6a35d16725894c9f330027eae6124e3903295183f673068c75cfcf08e5c578873bff22017a14a77f67e390c08a7ab75cccc2f154883a624afca12
+EBUILD gdal-2.3.0.ebuild 7549 BLAKE2B 0efb6f7c76c1348d438acd59e85e0c22f6327e438d7dd6279606d517835cf873a1584573822e283a4822267f5c2fe54ff611403f4a9d2cb5bc44cb61ee380a27 SHA512 d4932d98cf92460774d9b9816bb66ce07f9dccbd10c4233a12d8a3f355e8f1e2c70dc6527073c588f5a9d64db4a9050ae344ac6df265b00e3d283ae2d4ed545a
 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 7084e66a8f50..b4bd9eb1ac6b 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -59,7 +59,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
 DEPEND="${COMMON_DEPEND}
-	app-shells/bash-completion
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.7:* )
 	perl? ( dev-lang/swig:0 )
diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
index 9db812294860..723e7ffd8c56 100644
--- a/sci-libs/gdal/gdal-2.2.3-r2.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
@@ -59,7 +59,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
 DEPEND="${COMMON_DEPEND}
-	app-shells/bash-completion
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.7:* )
 	perl? ( dev-lang/swig:0 )
diff --git a/sci-libs/gdal/gdal-2.3.0.ebuild b/sci-libs/gdal/gdal-2.3.0.ebuild
new file mode 100644
index 000000000000..24f395f1b094
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.3.0.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+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 ~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="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:=
+	media-libs/tiff:0=
+	sci-libs/libgeotiff
+	sys-libs/zlib:=[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( >=app-text/poppler-0.24.3:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.7:* )
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
+	"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
+)
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		-i "${S}"/GDALmake.opt.in || die
+
+	# the second sed expression should fix bug 371075
+	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		-i "${S}"/swig/python/GNUmakefile || die
+
+	# Fix spatialite/sqlite include issue
+	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+	# Fix freexl configure check
+	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# updated for newer swig (must specify the path to input files)
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 619148
+	append-cxxflags -std=c++14
+
+	tc-export AR RANLIB
+	local myopts=()
+
+	if use java; then
+		myopts+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myopts+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	#     also that thing is developed by the gdal people
+	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+	# bsb - legal issues
+	# ingres - same story as oracle oci
+	# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+	# podofo - we use poppler instead they are exclusive for each other
+	# tiff is a hard dep
+	ECONF_SOURCE="${S}" econf \
+		--includedir="${EPREFIX}/usr/include/${PN}" \
+		--disable-pdf-plugin \
+		--disable-static \
+		--enable-shared \
+		--with-expat \
+		--with-geotiff \
+		--with-grib \
+		--with-hide-internal-symbols \
+		--with-libjson-c="${EPREFIX}/usr/" \
+		--with-libtiff \
+		--with-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-gnm \
+		--with-cryptopp=no \
+		--without-bsb \
+		--without-dods-root \
+		--without-ecw \
+		--without-epsilon \
+		--without-fme \
+		--without-grass \
+		--without-hdf4 \
+		--without-idb \
+		--without-ingres \
+		--without-jasper \
+		--without-jp2mrsid \
+		--without-kakadu \
+		--without-mrsid \
+		--without-msg \
+		--without-mrf \
+		--without-pcraster \
+		--without-pdfium \
+		--without-sde \
+		--without-sosi \
+		--without-mongocxx \
+		--without-podofo \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_with armadillo) \
+		$(use_with aux_xml pam) \
+		$(use_with curl) \
+		$(use_with fits cfitsio) \
+		$(use_with geos) \
+		$(use_with gif) \
+		$(use_with gml xerces) \
+		$(use_with hdf5) \
+		$(use_with jpeg pcidsk) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjpeg) \
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+		$(use_with netcdf) \
+		$(use_with oracle oci) \
+		$(use_with odbc) \
+		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
+		$(use_with opencl) \
+		$(use_with perl) \
+		$(use_with png) \
+		$(use_with pdf poppler) \
+		$(use_with postgres pg) \
+		$(use_with python) \
+		$(use_with spatialite) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+		$(use_with threads) \
+		$(use_with webp) \
+		$(use_with xls freexl) \
+		${myopts}
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_install
+		popd > /dev/null || die
+		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
+			-i GDALmake.opt || die
+	fi
+
+	use perl && perl_delete_localpod
+
+	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
+	use doc && HTML_DOCS=( html/. )
+
+	default
+
+	python_install() {
+		distutils-r1_python_install
+		python_doscript scripts/*.py
+	}
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.txt README-python.txt
+
+		insinto /usr/share/${PN}/samples
+		doins -r swig/python/samples/
+	fi
+
+	doman "${S}"/man/man*/*
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest
index c4d46471fd35..ff0e9653007f 100644
--- a/sci-libs/grib_api/Manifest
+++ b/sci-libs/grib_api/Manifest
@@ -4,5 +4,5 @@ DIST grib_api-1.11.0.tar.gz 14412684 BLAKE2B 72375400f74f3edba62e781b9dac4c40f39
 DIST grib_api-1.14.5-Source.tar.gz 4530071 BLAKE2B 7d9660e0c244ace011ef53e5a77c8ddc1f9435b210df407d6e90ef111c501cd589db1b34739937d5c78d6e1050b12d7c334b215122467a25b9a513e817a0eb7b SHA512 ad31dc27adcdeeded1aa3c3620181c0d4a5250734724c242443d19332b84f2297b4dea2aa02027627321fa35822c94865a41f24d03eb1143756621da14a59322
 DIST grib_api_test_data.tar.gz 131042849 BLAKE2B 9036d4363b86ae0ad948026dd8ea7371232723942dea9eb6d8cceec466d8e37ebbe6a8e4eadb4cd413ab40601d8ea01c91bef0265310aac9ea3773a9bc252868 SHA512 25b37c3e725f7a2c18979d96e7d512111ba54f4e448c57e6a8ae913b7f13be25d9e643edb45ebc714daf6de51d85e9a7d252e735299affc562b9911e53a95058
 EBUILD grib_api-1.11.0.ebuild 2060 BLAKE2B 57e34020950d5cdbf9eda47266d09a23b05bbc2cf8d19306b58d84a9ba8fbdb48dc6f6644befcfa513d04b12cb2bede34b1a6c04206abfdf88b514d20f8c0e39 SHA512 c58373e3399a3a4f43f5d791036e5011ecc07e38f70f248dcafbd1263dfc8a2fa621cf33936de03bffc3438d35ef68bf54897717d2577cf184a9acf0a6e237b8
-EBUILD grib_api-1.14.5.ebuild 2464 BLAKE2B ae5a204ac30d28c76471890ba88f003fa5389196bb1b5d980a100188fc16156704c5afade319d2ec63f49cd3e3125806d02d05443f5d7bae0a6defc1e25db727 SHA512 663c71c042d0899212990f4d24f95f37a7b432c34c70fada67977579f11cb8d9c004cdf7a4a9cc252a476b3869d36ff985648f75786fb1a1e029ab046af773c5
+EBUILD grib_api-1.14.5.ebuild 2468 BLAKE2B 09926caeb1da2df9f63fac295457b8af5c40a603197d54de2417c32ca1b3c6b8ad37adffaea463696a9fdf1ad478a53a8f68e9382fbb07f33ac512716edddf9a SHA512 6d6c4f752b7f42b33d15a54f87f40c9385277ae02e5bd7641b6d14567471a8913ec13d19ccf8782a021ca12d23b289ee5445d421582e1b16cd2e44604cb60bc1
 MISC metadata.xml 890 BLAKE2B 6a02ae5a83a54569ff02b5f2d30c4be7b765bc148772ec0360cff70ecf2d0a481642a2a01cdeff9a494a4c173ef120f6af14ee8624c076da6b0c7acd3355f5b3 SHA512 7e1ceccaf41783414b3fd3e3b00db274aa8df748d66e9f83617d4528f84d674ce313568a130cc5bac53eec5fc94cf03c9a35e9bf1f46a25851992f5c44f1bcd0
diff --git a/sci-libs/grib_api/grib_api-1.14.5.ebuild b/sci-libs/grib_api/grib_api-1.14.5.ebuild
index 8f1103676741..8db77fb1c266 100644
--- a/sci-libs/grib_api/grib_api-1.14.5.ebuild
+++ b/sci-libs/grib_api/grib_api-1.14.5.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=6
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit cmake-utils toolchain-funcs fortran-2 python-single-r1
 
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index a2bc673822df..88a153e63d7d 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -3,6 +3,6 @@ DIST libcerf-1.3.tgz 385600 BLAKE2B ffc0671cd86866c3bc7c488251a60ce1339064954a24
 DIST libcerf-1.4.tgz 386065 BLAKE2B dc33523ba37133dd210e9aeb2ebaf75b630032ff7acfabc4e4c81f04ea27063929dd9a5793b4160d8a33efb34333011c0ce72e1713a884d64103a01a0745e7ef SHA512 93d7b03898c0f88e436947b204db7fb5097dc901928aedde48bf0a04552e1c041fdfcdbe6318fdc21508e1349b6c205f557660550e72d6e86b078d9d0dde0faa
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
 EBUILD libcerf-1.3.ebuild 620 BLAKE2B 261a0d3b341ba163968d3139272c334b3d9014cab43edcb31d19052c6411ee1d1809f238b9449f19adb2d25f081f8f140e68d2f172a68970fe032d05b743b704 SHA512 f2911dde75cc0e1450d3099e50efcd4454056f778f67dbad83bc98c93efbcfeecc4b08003790db7690c56c12d41be3ae89729b0b251e978d1c79422384be3fd7
-EBUILD libcerf-1.4.ebuild 714 BLAKE2B 2cbbaed958231660350ecd969d5801f23bb664a7c7d9644f1a9e4065455a90ccc486a91d6dc8467d01693631f092c905418a22aa49441e54bd08324867b1907f SHA512 40f624c2ec77adcc602ba80205418db80ec4a50baf7538ce871e0f4b73d403bda660d36accf0ed9a4758ecddf72aed96144a81d97c7863cdbdcf1df258fe6eba
-EBUILD libcerf-1.5.ebuild 798 BLAKE2B 2f88e09285760980785d131e71670875fb9390a852023b3473f67570e9bb4141044dd534cc4dfe0d021ee7bd094a430c9759714b5bdc1cc0b844b1d374ba3563 SHA512 69f3428a87675a6d8e703d3e19a0dcd0c30d5134a70ac9482eae22a4f83dc9488b1fc52b5e3a6ff2d987e8a54287c7ad0dd28b4c3e98fe050d7a132f7aa73dc4
+EBUILD libcerf-1.4.ebuild 719 BLAKE2B b44629ab4c27e2a6d04a7c7144e5d933f997f8402490078541094e67576350c6bd8b6ce4f383fa034000e10ef9b3f44afce5bdf5aed59e0e99811b0d2eeab729 SHA512 073b66a02b7d8358905cb6a9b6f6bfc3b52e0c2a5453ac403ae8839dc6ef4a83c6376232fd00fba48d6625a5df0c49cffe1f3e693dac8366c56e8620b3e8a8b2
+EBUILD libcerf-1.5.ebuild 804 BLAKE2B 69c58fedf460c869985bcf4f136244cd7b12146f83a04b0e98096e0f46fb98210f872f9cdd18e206dfb2508927413f35ded82b8bdd1838ff64893f9abc25312d SHA512 21d58649a22a8989bce795494f6f13ea536b3e3241bcbde520db15c0bcfa6a6d0e5682840f54fb3a123e8d98e7aba89eb32ca8c7cc1276b3e7841e3fa701ce7b
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
index ccd7129f576e..ea2fb0f59b84 100644
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ b/sci-libs/libcerf/libcerf-1.4.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
@@ -11,7 +11,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_install() {
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 02ad27011f10..7834c232f530 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.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
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_configure() {
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 4578fcc04f04..c3630236bd3d 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -3,5 +3,5 @@ AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d4025
 DIST libsvm-3.21.tar.gz 847291 BLAKE2B 49790de8efd1f30b5009ba1d1a03c85e99b3ae78cfff83362146a19fbb93c8fe018e453478ca13ede8ae54836b422c5cab176ac8c53f7a63afc97fecbdfbcaf6 SHA512 697a7505100e48746a87e3e4ab025524fa581856320da3a187ac501138ce0a5bc7885ff37454ae5e75d6b0eab94e368b6bcd36601ad18db3b2fb35d2f360520a
 DIST libsvm-3.22.tar.gz 850563 BLAKE2B 824451dd2cafb7f2546d510d2c516dee67c27e586d5b16557a3c23e0c372cd577af5a322e24f70df6cda66e0a58f2e4d70017e6155a1d211ad3c728f840bfa2b SHA512 80a22fd2c2a82f70b8279fa5d8c5a2838b10ee439cf6d725816d608f8e45990ba1780ae6750cad78b25c1c18daf2c2315b342b9e329affbd5729d6fd7da87f7a
 EBUILD libsvm-3.21.ebuild 2679 BLAKE2B ef210e95003e4296b41ef4a4cf4e5ba87be396e9d5b3d22cc5f7290dd18a80db8b459e03f97be838ff7b175a35bc2237b00ce4c3795801515fe8cd4fccabf61f SHA512 e7d1c25b2d2c612d74df82fdef451ca0a01ffcb28cb3126fbf2cf9ab2838de0930890a710687e5788182c87524f1756446f67e56f970c2d8f11fd524d19602aa
-EBUILD libsvm-3.22.ebuild 2689 BLAKE2B 21f2486149d341c9342449f07a831ff4360b45095ed7637f9fe5636f0f523060b3e60c30804f114f8b2871d291e8d07f10394aa4ad0047d7cbdfccae72ca700f SHA512 4f65603f1dd5f0dd123772d0157a0a4c44250e99cba493cce578421901d442431c0da4a231acccf96fb223fdb9c013fdd0dc806cb77f97b815849fb5ecc26b06
+EBUILD libsvm-3.22.ebuild 2685 BLAKE2B c7389287ed396e7dabcbb06b2311d46b837def5074947b44c2b7aa61ec3d743a0ae020d27c905d6add1a0475f198e8b2aed0defa5dd19d38df1923704b103d47 SHA512 df22db45fe3c87ea2b5e700c165c093f46a7c52ba2bc317f9fdac0bfc3084b43fed99cd6ff0d98fb37a52ef263b25f2b3518e4a9ce6e7033e8d12be48f6aae18
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.22.ebuild b/sci-libs/libsvm/libsvm-3.22.ebuild
index 25c71ee18fa3..8c0952f1a051 100644
--- a/sci-libs/libsvm/libsvm-3.22.ebuild
+++ b/sci-libs/libsvm/libsvm-3.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 3f6e2049faa7..f938da1b70d1 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -18,8 +18,8 @@ DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b6
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 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 4192 BLAKE2B aafd6baf4cd291920f505860421d1f8c3976aec99eaa66234e314a7fb8442fc8cf0f2c049a0a5524d0db8acabb2414d81980ffb6c78c982202faf6a1b2a0c4e7 SHA512 3c23790d43940e5d8011abedd4e4035359a8d665d4ecc83a92542498af2f5214f8654cd05eb0c1fefde85aafcd208df05292ede0604fc246210a096a649b57ca
-EBUILD scipy-1.0.0.ebuild 3978 BLAKE2B 71dee72bb5508a1eb06e729e7040c9bed83aa7d09c329e32f0d6e67fe9ca7e7bbce28a796e688215e48185dd921b324ce2b4df32fd90d0d5b2a52da0247a11e9 SHA512 62a0364cf6a67f1342aa5f906d31527033e06ac1f8daf5378a459d7d2487b7d0d2860e1560e0c7f3698eafec1a2abcf14159f89041b3068e5f33bfd7ba7ebef3
-EBUILD scipy-1.1.0.ebuild 3978 BLAKE2B cd7dc524ac127f6bb0e11644d6b23c644e38651c03df0ef7c5069987d92d5de34a549d8577588433c515f0cc70ad136d28a47209a6d8fdb67553f2c6e8d6bcb6 SHA512 416f80d36a83bb8a300e16b2543313782de6a16dfbe75c96cf148390aee2d886454ca90d8bde13f11b40131236889e45dcc4137e01f636d074bd66b1bee6233f
+EBUILD scipy-0.19.1.ebuild 4247 BLAKE2B 98a7b7152c422cd5540aee58ad2c400471954396ad680c6bb642ceaba7715c93b1ee19772fa001b40b94b4d0a855265af61575c6f65afd51b8c77a965e380f45 SHA512 fcb4dfa545cf24913f402261a8ccbd8ea9e7ac70aa6ae0d1eb66f3e0187d4459394f40a7a864c24dcf8c1802ee191701bbb01b6f72f4c9a03dcee3296136edc5
+EBUILD scipy-1.0.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
+EBUILD scipy-1.1.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
 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 5e43cbe818ca..c12cc341cc76 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -102,9 +102,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild b/sci-libs/scipy/scipy-1.0.0.ebuild
index 3ed2ec72b0e8..0db065d7043a 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.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
@@ -105,9 +105,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index 789041b2c35b..0db065d7043a 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -105,9 +105,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index 41f81c3a0369..317c32ad7901 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088
 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0.ebuild 3862 BLAKE2B 867685b94d16e7b08f210a1c45a6da3fffaba9d6f340c1f1903557167c81a35e56b3cdfb2eb05488e61e160d5c166011949764115e18dc7e4b49850b61f7f3fc SHA512 062ca56de5c9c1f2967f73fc758c7b47946aa04a73724b359b97a066178f747893d322301731edf84110ccd15f0a25423e9da13f96fcc21002b7f2ba1212430d
+EBUILD shogun-5.0.0.ebuild 3864 BLAKE2B 3679f9db1129ac6e9f66ff5c180ec9a2a9fe9816d1b29a12f990fe9fe936360ba45db613b03c2bf4278bc56b84d08bfb05aaefa4175e1a9f9954073a860cad72 SHA512 9fc06713201d2877a59d9bfdb68a45baf6ee8201f90c5a9b2e5b3703ff709e736ee0aa7abef31568b9d1d855730a9adcb437cece7089712d26e7ce72ea20d771
 MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild b/sci-libs/shogun/shogun-5.0.0.ebuild
index 78fb3ea3a38d..2b063b28ba2d 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
 
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 7cfdba370530..77d6c0dbcb12 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -39,6 +39,7 @@ DIST llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz 39754833 BLAKE2B 30fe6
 DIST mkl_dnn-v0.12.tar.gz 759597 BLAKE2B ad790db940ca5353bc20db9e012356761e5a87d6646eeae983880881e1df271a0a4deb3b6810546fa8cf6f2c35c45509c57630cf8d493d72d557d33864f780f3 SHA512 e6a257679b872d16e320556ca2c1ddb5c04a949ee8b8d6b4de350c46ad4ea79749d5d9f92940c592706719490ad837210335027f782a8df46da1a2029ae5adcc
 DIST nasm-2.12.02.tar.bz2 961257 BLAKE2B f45c35571fa1254ccc01ed59de8a46cb480300404c701b444a7a751d077d23f64a7dbeeeb044d7daed8a6f895b1100f76f2db75ced6417ab56cb83b9494eece1 SHA512 7744a078647861382212de798d200b683cc4044881474fc1931acb14dfa0340ce026d1b3f64ac1ece87878ccd0ddcb69b8c0c850415313f47e01f0332e56a8f8
 DIST nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz 151680 BLAKE2B 280f8800e8674fbab90d15c09ab7e260b3230bfcf0fb44c998955c9bd4aaf07b4a9073a74479c8879811c56863d4c28693e408a4b205e5b5d9c801bb82159216 SHA512 ef61f9f0b12cf1252840966243ef4b4a0cc18afde7eddedb7e3f6ea31fa8a89da5570cfe6be536d721e4b7593249d05bb1c60372f6668635ad8bcde78bfc8dee
+DIST nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz 47849 BLAKE2B fb2a6fc1e45057c4150c1dae2a5058a12d8641b3f5dfdd982661b4351ec9df39ac3aefaf4dfa9c8606ddf7fd1c4a8b35683e5e5eddd74cbc63ee025b33d4b731 SHA512 eb555030e9d60d68c4094e85f16e0b74de7f61602c742d57bc2029d12c719084a2fd1214c13467ff262f6f3932508754159af5f014e6f16d279d14e1fafa9b8a
 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST pcre-8.39.tar.gz 2062258 BLAKE2B 1bc2b7b822383ba67b3e9707178fd100a13370a3a4ce8e6527fe0356f7d3e604a9ece11cef5e9e85925fc309698887389e67759d820b8b7a99703cc1cd3ccc88 SHA512 1724b2d6d8575af19fc20a13e50d71cb8024a66458d63cbc006b5bca01230845730535f3446d3850ddd580c93031f38c3ebf547adce0d279dfd18101677403da
 DIST protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz 4803167 BLAKE2B 466db7931c46df5f05018f4ebee0f1061a416b43486dce1fb4953a677f73138c74cbb97f333447862a571bcefe34dd0be3aac18e51b24f9921cb344e4e033af9 SHA512 5af4ebdd8a86a5e50c14c18590e372ea9454cadb101555e00008ebffe448acbaa8c57eeae857a53f20c64c0174ffe0a4d19ba393e2ca53beebad61d5b1db06c1
@@ -49,12 +50,12 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f
 DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
 DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
 DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
-DIST tensorflow-1.9.0_rc0.tar.gz 23632522 BLAKE2B 2049f97edb18fe34963c2706dc7249102204bacbd568c7a1ae880d9d94ba2a24b47f577ef71b6bf40e55b4c42537a2184e0ab2ad8e27cdbfcc9508cfa70515a8 SHA512 55b165882ce965c8b46ebb91e26b5828c3b71d6c07b8d5a321e890e9b5c00e896de511fc1d9e9b2f7f4f33311da6add32c7f7b55631eab8fedcc2167186649e3
 DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
+DIST tensorflow-patches-1.9.0_rc1-r2.tar.bz2 9372 BLAKE2B fe6d33deff5cdf1158319f2e30c7c79130c555d8d8c5f8fa719c7760e1edcc1083118fcff04c0e8aedd089dd95641e19240d14d6d10e28d2dd6ae9f4ec75f185 SHA512 fc904e2396e4a0e98baa463d1bdfc421402a5e17609fe7d4ec30f6c3e5692a432f5db36ba7fa9083e9eebf4dba29b48865102fb24429bde072c738c76478d377
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
-EBUILD tensorflow-1.9.0_rc0.ebuild 13456 BLAKE2B af490ef87277a17569d2f24fee316ff111c06db7193b04fce3b568421e38807de4300dcf8f7acab64353962a944b11b045e371a93bf2af00ef8dbf0e7eb1f939 SHA512 f9e497ac6f4fa9032918d57b329476ee6e428745af6e8d35eacfa1016147b1926a67563cce42284835bbed8c07b9b7c6ac4a4b890d1214c7e29f693fcd1525f8
-EBUILD tensorflow-1.9.0_rc1.ebuild 13585 BLAKE2B 0791608a2ed5f15dc8539cdaf67b6d92934f6c61c98ad9124ec52819c8858771b4fb67a59e2ab48ab17f1431640790c6cef30389b9d9198020a3eb856162c348 SHA512 dcc8998e2c722304f7e50d66777503d0e38f5e1b27f6f9d4671e4723aa8d75353672e2cffc189280d0424b11d5dd748278fadd21a49f3034468e1137d2cb2802
-MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
+EBUILD tensorflow-1.9.0_rc1-r1.ebuild 14203 BLAKE2B b917672bd1af89c78f04f0494005d7f060633ccf5f98fe69ff3b747420d7c43a6820206d73cf97fa970a6ff888c1da8f5879afac5de817f2693b538ce9f76f57 SHA512 3d65dbc8ab6ab91ecfde615a73d4bb3671f8b2ad0fee2477f82b1b9b2839f9acf4e9285e870bccc7adea788c0fc80fd291ae5eaf1e7102d545fcc7749eecb692
+EBUILD tensorflow-1.9.0_rc1-r2.ebuild 15253 BLAKE2B b5e9ed0a73d8baaf7cea580424300104f21c2a1a6274f529ef9e6f88260b59f507d01d9f9f988a388a112f85abbf3fe5190150210ce96a77e63cc2a55d286977 SHA512 1490ccd3332dd31c99dfba4af61e433953d582370273192cc50f7b3c26e52962eda9aee5a0746d529ac50e472730345b3e07824e0042fbc7247392991856a657
+MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index d6a68a59e703..5fc9f21f4638 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
 		<flag name="mpi">Enable support for MPI</flag>
 		<flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
+		<flag name="system-libs">Link with system instead of bundled libraries</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">tensorflow/tensorflow</remote-id>
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
index 207901b88346..cdd7f2db1800 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
@@ -111,8 +111,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
 
 bazel-get-cpu-flags() {
 	local i f=()
@@ -304,6 +302,7 @@ src_compile() {
 }
 
 src_install() {
+	local i j
 	do_install() {
 		einfo "Installing ${EPYTHON} files"
 		local srcdir="${T}/src-${EPYTHON/./_}"
@@ -338,6 +337,9 @@ src_install() {
 		cd "${S}-${MULTIBUILD_VARIANT}" || die
 	fi
 
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+
 	einfo "Installing headers"
 	# Install c c++ and core header files
 	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
@@ -345,9 +347,23 @@ src_install() {
 		doins ${i}
 	done
 
-	# Eigen headers
-	insinto /usr/include/${PN}/third_party/eigen3/Eigen/
-	doins third_party/eigen3/Eigen/*
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	insinto /usr/include/${PN}/third_party/eigen3/
+	doins -r third_party/eigen3/Eigen
+	insinto /usr/include/${PN}/third_party/eigen3/unsupported/
+	doins -r third_party/eigen3/unsupported/Eigen
+
+	insinto /usr/include/${PN}/
+	doins -r "$output_base"/external/eigen_archive/Eigen
+	insinto /usr/include/${PN}/unsupported/
+	doins -r "$output_base"/external/eigen_archive/unsupported/Eigen
 
 	einfo "Installing libs"
 	# Generate pkg-config file
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
index 77831fe28628..05a156e3a00f 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
-inherit distutils-r1 multiprocessing toolchain-funcs
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
 
 DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
 HOMEPAGE="https://www.tensorflow.org/"
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.tensorflow.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python"
+IUSE="cuda jemalloc mpi +python system-libs"
 CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
 for i in $CPU_USE_FLAGS_X86; do
 	IUSE+=" cpu_flags_x86_$i"
@@ -24,95 +24,111 @@ done
 
 # distfiles that bazel uses for the workspace, will be copied to basel-distdir
 bazel_external_uris="
-	http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
-	http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
 	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
 	https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz -> eigen-6913f0cf7d06.tar.gz
-	https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
 	https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
 	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-	https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
 	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
 	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
 	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
 	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
 	https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
 	https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
-	https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
-	https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
-	https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
-	https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
 	https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
-	https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
-	https://zlib.net/zlib-1.2.11.tar.gz
 	https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
+	cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz )
 	python? (
-		http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
-		http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
-		https://curl.haxx.se/download/curl-7.49.1.tar.gz
 		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
 		https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
 		https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
-		https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
 		https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz
 		https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-		https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
 		https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz
 		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
 		https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
 		https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz -> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz
 		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
 		https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
-		https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
 		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-		https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
-		https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+		!system-libs? (
+			http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
+			http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
+			https://curl.haxx.se/download/curl-7.49.1.tar.gz
+			https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
+			https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
+			https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+			https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
+			https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
+		)
+	)
+	!system-libs? (
+		http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
+		http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
+		https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
+		https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
+		https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
+		https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
+		https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
+		https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
+		https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
+		https://zlib.net/zlib-1.2.11.tar.gz
 	)"
 
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
 		${bazel_external_uris}"
 
 RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/libpcre
-	dev-libs/protobuf
-	dev-libs/protobuf-c
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libpng:0
-	net-libs/grpc[${PYTHON_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler] >=dev-libs/cudnn-6.0 )
-	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
 	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
+	system-libs? (
+		app-arch/snappy
+		dev-db/lmdb
+		dev-db/sqlite
+		>=dev-libs/flatbuffers-1.8.0
+		>=dev-libs/jsoncpp-1.8.4
+		dev-libs/libpcre
+		dev-libs/protobuf
+		dev-libs/protobuf-c
+		>=dev-libs/re2-0.2018.04.01
+		media-libs/giflib
+		media-libs/libjpeg-turbo
+		media-libs/libpng:0
+		>=net-libs/grpc-1.12.1[${PYTHON_USEDEP}]
+		net-misc/curl
+		sys-libs/zlib
+		jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+		python? (
+			${PYTHON_DEPS}
+			dev-python/absl-py[${PYTHON_USEDEP}]
+			dev-python/astor[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/termcolor[${PYTHON_USEDEP}]
+		)
 	)"
 DEPEND="${RDEPEND}
 	!python? ( dev-lang/python )
 	app-arch/unzip
 	>=dev-util/bazel-0.14.0
 	dev-java/java-config
-	dev-lang/nasm
-	dev-lang/swig
-	dev-python/cython
-	dev-python/mock"
+	dev-python/mock
+	system-libs? (
+		dev-lang/nasm
+		dev-lang/swig
+		dev-python/cython
+	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
 
 bazel-get-cpu-flags() {
 	local i f=()
@@ -196,6 +212,10 @@ ebazel() {
 
 load_distfiles() {
 	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
 	local src dst uri rename
 
 	while read uri rename dst; do
@@ -213,32 +233,39 @@ load_distfiles() {
 			einfo "Copying $dst to bazel distdir ..."
 		fi
 		cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
-	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//' <<< "${bazel_external_uris}")"
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
 }
 
 pkg_setup() {
 	export JAVA_HOME=$(java-config --jre-home)
+	check-reqs_pkg_setup
 }
 
 src_unpack() {
 	# Only unpack the main distfile
 	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
 }
 
 src_prepare() {
-	BAZEL_OUTPUT_BASE="${WORKDIR}/bazel-base"
-	mkdir -p "${BAZEL_OUTPUT_BASE}" || die
 	setup_bazelrc
 	load_distfiles
 
+	eapply "${WORKDIR}"/patches/*.patch
+
 	default
 	use python && python_copy_sources
+
+	if use cuda; then
+		for i in /dev/nvidia*; do
+			addpredict $i
+		done
+	fi
 }
 
 src_configure() {
 	do_configure() {
 		export CC_OPT_FLAGS=""
-		export GCC_HOST_COMPILER_PATH=$(which $(tc-getCC))
 		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
 		export TF_NEED_GCP=0
 		export TF_NEED_HDFS=0
@@ -252,8 +279,6 @@ src_configure() {
 		export TF_NEED_COMPUTECPP=0
 		export TF_NEED_MKL=0
 		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_NEED_CUDA=$(usex cuda 1 0)
 		export TF_SET_ANDROID_WORKSPACE=0
 
 		if use python; then
@@ -265,6 +290,27 @@ src_configure() {
 			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
 		fi
 
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+
+			TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+			TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+			export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+			TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+			TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+			export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
 		# Only one bazelrc is read, import our one before configure sets its options
 		echo "import ${T}/bazelrc" >> ./.bazelrc
 
@@ -272,6 +318,10 @@ src_configure() {
 		./configure || die
 
 		sed -i '/strip=always/d' .tf_configure.bazelrc || die
+
+		if use system-libs; then
+			echo 'build --action_env TF_SYSTEM_LIBS="com_googlesource_code_re2,nasm,jpeg,png_archive,org_sqlite,gif_archive,six_archive,astor_archive,termcolor_archive,pcre,swig,curl,grpc,lmdb,zlib_archive,snappy,flatbuffers,cython,jemalloc"' >> .tf_configure.bazelrc || die
+		fi
 	}
 	if use python; then
 		python_foreach_impl run_in_build_dir do_configure
@@ -288,33 +338,26 @@ src_compile() {
 	fi
 
 	ebazel build \
-		$(usex cuda --config=cuda '') \
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so
 
 	do_compile() {
-		ebazel build \
-			$(usex cuda --config=cuda '') \
-			//tensorflow/tools/pip_package:build_pip_package
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
 	}
 	use python && python_foreach_impl run_in_build_dir do_compile
 }
 
 src_install() {
+	local i j
 	do_install() {
 		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${EPYTHON/./_}"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
 		mkdir -p "${srcdir}" || die
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
 		cd "${srcdir}" || die
 		esetup.py install
 
-		# It installs site-packages/external but shouldnt
-		python_export PYTHON_SITEDIR
-		rm -rf "${D}/${PYTHON_SITEDIR}/external" || die
-		sed -i '/^external/d' "${D}/${PYTHON_SITEDIR}"/${P/_rc/rc}-*.egg-info/{SOURCES,top_level}.txt || die
-
 		# Symlink to the main .so file
 		rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
 		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
@@ -343,9 +386,18 @@ src_install() {
 		doins ${i}
 	done
 
-	# Eigen headers
-	insinto /usr/include/${PN}/third_party/eigen3/Eigen/
-	doins third_party/eigen3/Eigen/*
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	ebazel build //third_party/eigen3:install_eigen_headers
+
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/third_party/eigen3/include/*
 
 	einfo "Installing libs"
 	# Generate pkg-config file
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 5bead8b80388..b8184a3c48c9 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,6 +1,6 @@
 DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6184d65e50e95be3768678a2d006b75e487dbe3df5d44be4b5ba3899aeeb01ed63b51755bd46b546b017ccc0406d38 SHA512 19165be7c9903cb664051a6556f9fd689b02af71156f040960008e8d74e4a32adfe283c67eb7b53c8bdc6ae6f72516ad0b674d9f2b3354ca50f082b1651dafef
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
-EBUILD votca-tools-1.4.1.ebuild 1186 BLAKE2B 08117476d4a2bfd26146756dd177a9f48e26c574c0eb6aa464d1763e2b9d1b83073e76bc3178d10ef3a5d9138d7abf70de3ae40148f72e193c655b0d5ae172f2 SHA512 68a58033de0e7867aa7e4e220c0e9f21ed90e67b3e2e45f84eb3ec3f31d151831a3d6d44af8260e9e4a84e8187ede9fc4034ac737b2bf70ac7f2f53a7e509e67
+EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-9999.ebuild 1175 BLAKE2B 9bf966f68d850c88d6d5e800367436973b2f3ea12d3b7560d368e541d769e6dd9553e9a11e7c5ccf6bdb187f409b271d098e51ce3904df4b98672829ef2da2cc SHA512 c7ff0252fda8b21d7f1f00a4cf01bf6065a880ac4af1d7986cc042ca26de6c439702e3704e81c2276cd4672f277644076394575f8ed76ae5c4af07407aba3617
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
index 2a2c4d6860c4..182893347bc4 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.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
@@ -40,7 +40,7 @@ DOCS=( NOTICE )
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_GSL=$(usex gsl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GSL=$(usex '!gsl')
 		-DWITH_FFTW=$(usex fftw)
 		-DWITH_SQLITE3=$(usex sqlite)
 		-DWITH_RC_FILES=OFF