gentoo resync : 21.07.2018

34 files changed, 519 insertions, 1357 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 44dfbce86655..2024a2fe38dc 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/nmrdepaker/Manifest b/sci-chemistry/nmrdepaker/Manifest
new file mode 100644
index 000000000000..bc0f06db9c2d
--- /dev/null
+++ b/sci-chemistry/nmrdepaker/Manifest
@@ -0,0 +1,3 @@
+DIST nmrdepaker-1.0.tar.gz 2233765 BLAKE2B 9b638a36fc50d7c020d56833b6ca78d7079ad357f42431088c4c0735b7e9ce63a0e6318915ec751b42e6628c0da76b93ca16ffea1ffe6b311480e8d278ce1a1a SHA512 9d1a9048a85f85eacaeeb582c5550345efa673b1f517dad121e2b2e19125f93e71a26f2f8240ea9b8a06489814eb833e7b3653f882a46bad699b01fd1aa4299f
+EBUILD nmrdepaker-1.0.ebuild 794 BLAKE2B 3dc1817313f90d1e232fba5839917ee64f78cf97bb8c094e28dfe4d656a91db31d16618637e1897729a944e3fc6a1c9de95530bea53a6c0666bbeeabd32d1dc8 SHA512 48e4de3f0c960e33057d252c2fc0dc48dfc45b7973f5989da5b22bec5f35a802ffced2c871ac5fd6d4880d4eb662783935279036093b0b06d7738e397690397f
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sci-chemistry/nmrdepaker/metadata.xml b/sci-chemistry/nmrdepaker/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/sci-chemistry/nmrdepaker/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild b/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild
new file mode 100644
index 000000000000..5ccd2c4508b6
--- /dev/null
+++ b/sci-chemistry/nmrdepaker/nmrdepaker-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="Program to perform NMR spectra 'De-Pake-ing' and moment calculation"
+HOMEPAGE="https://launchpad.net/nmrdepaker"
+SRC_URI="https://launchpad.net/${PN}/${PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/matplotlib-0.98.5[gtk2,${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nmrdpaker-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	newicon lib/data/images/unused/nmrfriend-buddy.svg ${PN}.svg
+	make_desktop_entry ${PN}
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index c9a339e6fed1..6db09871c931 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 286105729758..1bfdc876c8a7 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -2,6 +2,8 @@ AUX ffmpeg4.patch 1301 BLAKE2B 7ce55736e3a6fd4b9e0ebc8515305a666cc042c8063eb86aa
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
 DIST gazebo-9.1.1.tar.bz2 52978923 BLAKE2B 46ddcc0928b3f591356379e20fa5478e385046f8ef2295730b5cb69e07636928226e423db654697a32bcab14846cd13dfe6248017fe1f410d4060f372154ae69 SHA512 1892a3f09d98b75cfdd30b020eb335b4e267db161850eba58153c5be4beb1c2053843f336d63fe638e3ba6466a9d746210a8e7cf3e2d577cc380ce4904576b3c
+DIST gazebo-9.2.0.tar.bz2 52929158 BLAKE2B 208b911551d4a16f5ab2e37b033e0f132bfbf4cdf01129fa4849d67ea9d2e092e00c3382e925a437d67916ddbaaf8ac499b21231ebdc5bd2302865476b9773df SHA512 4c91c66ce4b5d63cb97d948de5f9d5ae9dcb88de8f5e650a6f6dee085cd7539454a25871691a1bdb38a3c65fa52c5ea1b94fbd3a618a77cb234579f2f268a017
 EBUILD gazebo-9.0.0-r1.ebuild 1867 BLAKE2B 9f6e396063a4a72e5938ff0ad400fe03e4690906da37b6c1531908e8deddcd1809ea3a17e3e37c9f08243e4b3f70b50ebd6a3f9291bd0b8afc4cc515803145ec SHA512 a637fcb10a4f193c8fdb724e73b93d5de549e9fa6651d3ded7a59a6e99f2ca39528a1521e315e290b4129f0bd3cec7a061e36a68a113554b6a5e5566bcb99217
 EBUILD gazebo-9.1.1-r1.ebuild 1863 BLAKE2B fdc678548a0cfc8af2959b043562dabdc1b55bb1b38d68c10bed909977a66c03acb95c5ba403db3f2025c5abcf1abc772ef2efb3d0434bc461b2f2419207d604 SHA512 a66748b7ead2b075e0e4dc5b24ac1cb27413eaa75e47920cedae3e658286d45a8bd8a3507efce4bb0b16a3aa40fd2d6ea23cf03f70942cf2d92a968a5c77ba19
+EBUILD gazebo-9.2.0.ebuild 1863 BLAKE2B fdc678548a0cfc8af2959b043562dabdc1b55bb1b38d68c10bed909977a66c03acb95c5ba403db3f2025c5abcf1abc772ef2efb3d0434bc461b2f2419207d604 SHA512 a66748b7ead2b075e0e4dc5b24ac1cb27413eaa75e47920cedae3e658286d45a8bd8a3507efce4bb0b16a3aa40fd2d6ea23cf03f70942cf2d92a968a5c77ba19
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-9.2.0.ebuild b/sci-electronics/gazebo/gazebo-9.2.0.ebuild
new file mode 100644
index 000000000000..a1bfd2b1d31f
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-9.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils versionator vcs-snapshot flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 libav test"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	libav? ( >=media-video/libav-9:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	sci-libs/gts
+	>=sci-physics/bullet-2.82
+	>=dev-libs/sdformat-6.0:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=[threads]
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	media-gfx/graphviz
+	net-libs/ignition-msgs:1=
+	sci-libs/ignition-math:4=
+	net-libs/ignition-transport:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/qwt.patch" )
+
+src_configure() {
+	# doesnt build without it
+	append-cxxflags "-std=c++11"
+	# doesnt build with as-needed either
+	append-ldflags "-Wl,--no-as-needed"
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-electronics/gresistor/Manifest b/sci-electronics/gresistor/Manifest
index a0cdf007a771..826eb654a445 100644
--- a/sci-electronics/gresistor/Manifest
+++ b/sci-electronics/gresistor/Manifest
@@ -1,4 +1,4 @@
 AUX SimpleGladeApp.py 11794 BLAKE2B 5b6fb7dbd376031fd551eb7762d7f12a8b4451bbc710310f51c21f0ddca20d5c5b78d04329a70b65fdfdd2d8e4c2956273857c82a8091fb858699f40b0b162fe SHA512 d6eb78b2e138d5b0813b993177106bc3713172ca65a7561584eea314053bc49e27fa784465ca87fa678d65382252bffda733a4c3e846f6161bd4dffa01e83d36
 DIST gresistor-0.0.2.tar.gz 10240 BLAKE2B d3b624c7e7abdbbe40d978b507f0b66d464aa6836e96d1b1c78a37b8365dfda451cf5051192fd2f3fd15a75d092c4bfb81fe0e6c0f087dc4a175603da6df47a3 SHA512 263483f5712a48f2095bddf620520233e2843c64c1a03a7924cecb856de8fdcac601100cda4dc9f1943ff7753ffaaab04e25032416dd9438fe3f17d7d6681072
 EBUILD gresistor-0.0.2.ebuild 798 BLAKE2B 524612c627280f61fb90b86a4854a060ae5321b09eb40a2699e231509fb91ea2564e7da799e5ae006525053182393fe7c6b94a466ff7f30941f2c3bb2b504e70 SHA512 efddc7d7db534f820c5cf193c976652dd5ae01707877908d730356a0f0dceca690ad45263e946c37bc52e3d611529d203b03e5e47cf4954cca75a17a28d8e66c
-MISC metadata.xml 329 BLAKE2B 6345d8911775a79b8c41d64c55a3d4dde52ec1b89eee5c56dbd90350f00dea34be8d46650ac7c29d23be959a9fd34b2bc0de831445130271e4ab7c483e60f439 SHA512 77eb3320109727b2c65e077b45bb8969218c9912d0f37e866d72f941555984d7974a711b549b485c9874dd88a65256aba7549a43bf93f168b7acada6999b99c7
+MISC metadata.xml 246 BLAKE2B d696d8b94de8a32ca51bbce05b1aad9b9fb3b14355f8b2a6560ee719e21bcaa9cd32e764911bf652224bd2a7009c1ac4a5ad948b88cc4e1e5c01d0889a668151 SHA512 b0fee99b0b02e57eca1c4f80ac656743e02b333842779dbc3ce8a988d2d0fea788a867aa55a9b7fc49f8724594848e5d164b7f41edc8bb2e9d178c3b52792667
diff --git a/sci-electronics/gresistor/metadata.xml b/sci-electronics/gresistor/metadata.xml
index 987b979d3fc8..7361a73ad6e7 100644
--- a/sci-electronics/gresistor/metadata.xml
+++ b/sci-electronics/gresistor/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gresistor</remote-id>
 	</upstream>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3ed75776d302..3bc53c08368f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 986193e58ec7..7b5e2dbf96ea 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,5 +6,5 @@ DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45
 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
+EBUILD gdal-2.3.0-r1.ebuild 7873 BLAKE2B cd6aca7f5a96e9144869ff4b03c90ee2e74be61218a5cb3f4f484ecf01ee0eb4fab0d0f54c779e6af47d0e54abdd6ab50c7a40df123e47455276cd4068e6a807 SHA512 132d808875ed202bffb7d6021d90993e9b399772c6bf65c0dbd06e21ee1ea1335a7aa21c6b8c95577af997a7eb72a8c87fd12d955cbf511ac64a8e5b8db42210
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.3.0.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
index 24f395f1b094..8aacbcb83c78 100644
--- a/sci-libs/gdal/gdal-2.3.0.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild
@@ -13,10 +13,10 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR
 HOMEPAGE="http://www.gdal.org/"
 SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
-SLOT="0/2.2"
+SLOT="0/2.3"
 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"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
 	dev-libs/expat
@@ -33,8 +33,12 @@ COMMON_DEPEND="
 	gif? ( media-libs/giflib:= )
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( virtual/jpeg:0= )
 	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
 	mdb? ( dev-java/jackcess:1 )
 	mysql? ( virtual/mysql )
 	netcdf? ( sci-libs/netcdf:= )
@@ -112,6 +116,7 @@ src_prepare() {
 		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
 
 	default
+
 	eautoreconf
 }
 
@@ -119,97 +124,115 @@ src_configure() {
 	# bug 619148
 	append-cxxflags -std=c++14
 
+	local myconf=(
+		# 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
+		--includedir="${EPREFIX}/usr/include/${PN}"
+		--disable-pdf-plugin
+		--disable-static
+		--enable-shared
+		--with-expat
+		--with-cryptopp=no
+		--with-geotiff
+		--with-grib
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}/usr/"
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}/usr/"
+		--with-gnm
+		--without-bsb
+		--without-dods-root
+		--without-ecw
+		--without-epsilon
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-mrf
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-php
+		--without-podofo
+		--without-qhull
+		--without-sde
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		--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) # pcidsk is internal, because there is no such library yreleased developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(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 pdf poppler)
+		$(use_with perl)
+		$(use_with png)
+		$(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) )
+
 	tc-export AR RANLIB
-	local myopts=()
 
 	if use java; then
-		myopts+=(
+		myconf+=(
 			--with-java=$(java-config --jdk-home 2>/dev/null)
 			--with-jvm-lib=dlopen
 			$(use_with mdb)
 		)
 	else
-		myopts+=( --without-java --without-mdb )
+		myconf+=( --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}
+	# bug #632660
+	if use ogdi; then
+		tc-export PKG_CONFIG
+		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
+		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
 	# mysql-config puts this in (and boy is it a PITA to get it out)
 	if use mysql; then
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 33d3892bc563..19617b4cd0b0 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 725 BLAKE2B c3758ab6b092d8a29745f1bc46bf90129f60900caec4ed94104a21d3e385037cc7dd5c1205064097a7b3d889788c89eecbc32724b090b3619dbf222a57a93be2 SHA512 7a9bdfab3dfbcaba184fb7cb6fbd235005606df093eef6210fab0944b9560134c83c71668e983db536c03d48aae01aada82eb41f0bfda87648a43549060997fa
+EBUILD szip-2.1-r2.ebuild 724 BLAKE2B de732019cd35f3f559031dc665b4af439488965e30133aa5a434ad2388b0822c2d4eea7604292d821d2105e8c99298686a2079a14cf00ebbe4dc707730f82e69 SHA512 ec187345f78d7a0ba619e71cd2519d97bc7b533bb81528fb4f56859bac086bd1d0602418cda91b5c8d28f833c32c9949aa27e1c1059b1b035a0423c679f40195
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 603af0c3cff4..a92764525e70 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index cf1d427ad18c..fefda1061e24 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -2,10 +2,8 @@ AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 5995 BLAKE2B
 AUX tensorflow-1.8.0-0002-dont-strip.patch 1181 BLAKE2B 98d25909f9b7a40e2f140dc47a6a1b79d332eba465e09c67c1088ca07301144f0fdc83d9a5b88b480bc2f4ec360da8011d281fa6b00f992f1f65b5861d4a0983 SHA512 af2311856f2efe3ea6ecf84aef4446f2a5dd79238fee26737b7ae9c1af861d8e95128046750f403c05be1c6c2a25129013f74f9d21f4204283938b50e1fc4356
 DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
-DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4cafbca71446681a615884e82ae7fcdd4d8d6fdfa8e409a646115c3577972cdfcee8d792af0a1d82a8efbbd1 SHA512 49afca13b9683ed571c274380bb5e111236903b12d19bcb8781d6bbc00f711766b0d62de0b36536c85309cc9ff9e9d0aaa708e27bae9be6cfcaed8ba91e5545d
 DIST abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz 875263 BLAKE2B f11af5582ef3e00155361de2185b703fc9edde1b6cbefce62224da7b13e1beae219076f144b7b8d4bf63d1b21a73beb77fbb437e6d91e6d59a233846d91c1a99 SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
 DIST abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz 189090 BLAKE2B ac4e7ffffb6dc2ad922d03cbfee1858335728fffe5721761fb0207b242ccf0f8d9739bed29987c8cc718f7cc3c297e05bf7506b36f31a06b9019be8215f842a7 SHA512 faf00229a062dcf71d9147bc76538dd4ee3adcb76b7e46943663eb43e3023587c68819d1ca157709c3f071e5796bbcf8e10277ccca1f5b83f33fb0025520d373
-DIST abseil-py-pypi-v0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
 DIST abseil_cpp-720c017e30339fd1786ce4aac68bc8559736e53f.tar.gz 529637 BLAKE2B fea7eceda492764613ffe944331e6b08af33d600036e9b2453f4c09e892f22f79a95b00a29a9bdf9e705d11502027d88659e19aa484cf4a02158209b058cec13 SHA512 3ac70cb924518627dfc6ec2eb5f65bc0e1235898eefebb0d0410867270065aa745d21456f1212b916e732b3f5dada18b03e526e02d09a09f445531798219006e
 DIST abseil_py-acec853355ef987eae48a8d87a79351c15dff593.tar.gz 175877 BLAKE2B f3c9b36101321f1e72c4eb2cbf11b42e36dc95bb1682b124b77652d2a2bee912459fa92f40718c80aa22f18611c77d13ad08e2888b20ae8895c115191e2b7397 SHA512 154056acee09b8c193d0bc8c64dd98bab87bfd779b04f81b1da7ace3004fcdf780f3ed0066ca3204850c2b80a6b1185e5e435ed852b73af85a6d899addc1c8bc
 DIST astor-0.6.2.tar.gz 29494 BLAKE2B aec99ed7702da3125f7a8666b0e432ca7f32511451b0922a7c7b2239414674be205f555ba4d1672f3d44f9140c0690d17e0374d339b2bbcd40737d69d748e95a SHA512 a6df0e65f429025caa0fbdd95f119fff94867709c10ade99fdc681a9886e916b67411384bf6ca37ceea478c65add5dc0a74585e17aafc706c8f0363e3c8585a4
@@ -16,16 +14,13 @@ DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 43
 DIST boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz 22702000 BLAKE2B d54e52832ea2655590ee6d3c9063f684cd1ac1efacc6e6c60fe3177f799eaae6cf3d6fbb1a616e98514dd0bdc84ee35731bd9e285b5cd7a91a19b9493f694582 SHA512 879a48626fb58263d117f8a8b1c5b69fa99e1f06e71d5321620b16c107011c1f22d3e3443b5ad6a908ca139fcc55bdfc36fb80e884fe4490fc4dd982b668f128
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
 DIST curl-7.49.1.tar.gz 8885826 BLAKE2B 89bcc9f775bd26ac2f7f38097c8e506a5098f22264aab1d0db9f474bd1161d434264faaf4829882cb9df8817e680d314fb2e1288fcaba3df73b6d569eba2eefe SHA512 eb7cf0d34130b7085f342d2fd44457479e6e9d55e9fc4c46b6c5631d8c792eb376275501a89867b64ef1134084ffc7cd6e91f732a2265c331dc1d405dd65d1a3
-DIST curl-7.60.0.tar.gz 3949173 BLAKE2B 5cb206174a11612400eaa379ded71cb94c4d9a1d5b71c5894a2be8253a28d9d5c37bbccea2803fd6244ee2a173e05f90c748be593cda901062e65b2711f65226 SHA512 f25c8d79be87bfbcae93cd200b319f664efd62aea8f1a94bb441407a9e1489bd935943cfd1347f3b252f94b9a0286da8aeb04b407a2ba95ebfa717dff80e891b
 DIST cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz 1796107 BLAKE2B 65cd3ec2e83cfdaec2998091eed6506071a8b28a1bf41d9f59ed8ab05a0559355e831d1c6b550aa3fcc65959e29f6c531c30bf6869a5fd968a351d3f4f8eeef8 SHA512 556377644ebe111a36061768560a06d70484749cc78be0b53a9ad4dd9d40fb7c3aac4ad09af1cf7a5e8274e7289ac540f58c3026522ff5e251ddddaf840ef955
 DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
 DIST eigen-6913f0cf7d06.tar.gz 2296773 BLAKE2B f3d4ed1577abc7f722fb600e79bcb1294ae5d6a4499668df05a8b9014bfafb576e6d15d3e311080e6e6ed3afd00e60ccd0c1092161a218d200a32668bef83ea2 SHA512 e1cbd55edfc128ee5c2d0bc08a7fec051efb5713f78e2d323ce49074bf1b86d63e7fcc06c01e469c01d2476dd369e4159ecb306f6d28371a3274402d0ea25e87
-DIST eigen-e5e305a158a0.tar.gz 2312776 BLAKE2B 268419895e1c49963bd15b6e9142775d782f8d7e6aa88f55eaa7b5dd42ce11456c8687235ff2478bedaf232b7df71832fdbaed62026f7880501c0403cfcf6d4d SHA512 f6070e2cec18c059f296857405c90e06566f643a4e3499a6eceaab8682597c192f8b9b91bdbbfa53aa654969a2269cda6a1c044b92e4a9f8362e8831e773daf8
 DIST eigen-fd6845384b86.tar.gz 2312810 BLAKE2B aae02b053e9b22b0c063d1173b28fd7d71cdec6b6e6702624b8fdeb707ada24e5415079f1a1c7b8fe108c7e632c6c736e13cfbdc101270742565b7045a57616a SHA512 b999e60236abf7a6a5062aa55b0aeefe9254b204416092649d4a88d42fef7c571e3ba563bbbf94033093f789511793d614c1ce94a0a0f3eb4b18df466b6345a5
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST fft.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz 613854 BLAKE2B 982142b7dd81791f221d7f3cbbecf6539549c86c436e0cf3ae0c57bd7535b90083c7d2709abc811abcf3b6fee417a16b1d8dcdedcce58fd8715db7ae785a7bff SHA512 01ffc047483edaaccc13bf256d59eef0c4cb7488618f1e908c74e0dcc599f00856d052d209a079d35e385bef973a4c6daf401107c4be85bba46dcc3b4f453b26
-DIST flatbuffers-v1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
 DIST gast-0.2.0.tar.gz 9400 BLAKE2B 1392b9ef3a007d89b6b7af5ca49f3dcaa0689e166845ea25c2e544578f65915114d763b54503825dc2b6958a71ac284ec7ae2cc2cfa861494da28df786d679b4 SHA512 651719c3035d21e02e39cd83fd54212a12c39addf69f7c9e8810ccb7bb9aae7828e176ad0adf55182f0628f18d76cb1e286e498a9665ddb12e91a51dc2303381
 DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
 DIST gemmlowp-7c7c744640ddc3d0af18fb245b4d23228813a71b.zip 903072 BLAKE2B 26e49a36f7af265ba4fd720864fd148055e9491d0c0100988b474c41920a0b9d698c634a59280f458941a21af15017966bbb2f65e3b399bbcbf836e1232b9d7e SHA512 b754e9b4fb28884e5fbca56bf0fd59d8bbfa3e01900bf6860a2ee24047b21c71cd076ac27d5cc5b3f44c325fb6fb516529dfdcf720fecdb27e7fef38a4f6da13
@@ -37,28 +32,21 @@ DIST grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz 13432340 BLAKE2B 68a0d
 DIST highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz 121307 BLAKE2B 73402228c12dd0044960db0a2366d63dc6aaa3b8b093bfed7a1f32dfe063499913094beb4d93d67e1926b6854625bafc2f3e279e84e01220b279a3afd1cc3300 SHA512 235ede2ca52e22aa335e31969d2318fd0e413f07492d599bfc0a605ad53090731fe1285be177e2c66b6eb8379e98cbb8389f4d1c7b2bae20d3808bbcf5ecfb51
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST jemalloc-4.4.0.tar.gz 444180 BLAKE2B fde0ce34e56deab10e01387aeeb3ec1c5c01a21324c2144a3dfd5c96798aa38fdd4320a91a3b4cdd0ccc956adc107f8db893a1c129a83721ec19f014cea6e638 SHA512 77ee7554e8c4621d1c8ef65402213044718137c513c4c44249929f2df7e89029ea710dec3e67b9068feeb89a87634fa5c2093cd875b8aed98153c7fb5a9d999f
-DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 DIST jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz 164140 BLAKE2B 17a50cbbfa95c84b746a9168670ab755424a93d60b535414d4a744631cf012499b5b0c4b33198c3744210a62bbfe5c3269aee955eb1b055076c0df748a48cb90 SHA512 8b99c55fa76661d3c37b23b3a6035b3bf1f98ef6fe336536e49ac50a92563657066677e32c6cdffff6f04848e86417144236111ce2b37fd5a84ab24754380a18
 DIST libjpeg_turbo-1.5.1.tar.gz 1204374 BLAKE2B 22463c083f1255c059e6376ea104a9eb54a18aba6c66a563dcd1173eb2a271eb1d040eb21cd1d7623d04aa99a3b1eda36de4aed6502d6a8a2d5fba93b3773383 SHA512 5dc11da0d1008dc8e288e9e3242a68c2bc6700b0dcff818d3774815ca255441e8c60eb46df6934e578383b5530e9ebdfebad47c55137ca57a109e8d2ebc66c40
 DIST libjpeg_turbo-1.5.3.tar.gz 1218419 BLAKE2B 58c0636cb4a3874eba31be66e3206c491cf608aa1c5cecf87566a6a890f1d9470260c5d72cb48a572c555247fff0b9f5f80025508b898720499dfcf27864efb1 SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7
 DIST libpng-v1.6.34.tar.gz 1146972 BLAKE2B 5d9c1e38cf5170b8b86a9b8bde380e735cd765bbac339cbe17269a116d64fa9e9c3b99b04e483f725b6cb1fdf778128278f1670062ecaa2565c91db59d4d2b03 SHA512 23b6112a1d16a34c8037d5c5812944d4385fc96ed819a22172776bdd5acd3a34e55f073b46087b77d1c12cecc68f9e8ba7754c86b5ab6ed3016063e1c795de7a
 DIST librdkafka-v0.11.1.tar.gz 859238 BLAKE2B bc53f358320aa40d1acb209daa2594f18421bb6913bad7ba08a5612dfd6683e65489dc31ed67adc9df090d719ea6ab1031f46e524f055c61cab3f1f941a7163b SHA512 24aba6cfbd5df6a010a735fde455a9272c85b26055b172893b8e5259c2d6a7f2adc9637699f7f3b7270200a280cd95d52779a8f89fbb6af5fc035488ff54310e
-DIST librdkafka-v0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST libxsmm-1.8.1.tar.gz 893332 BLAKE2B b09879ef45a8d3007846361aaad8536dac526297583d29f28378a91c05fdd3a4c51e399d7d5b05dd4456268d5fd3e7014d889a41be61c1d99425dd7234b0dd6e SHA512 30388de1edf46ae40b2ccdf224bd9febd1ffbb91f8250c89c03044fe1ea75754ce5155107ec9d027fe2e08963f1ac9d2e526ea84618d2cf50c2d5dfe8a1e074d
-DIST libxsmm-1.9.tar.gz 1881825 BLAKE2B fb227b80f53335c100fd3562e852e3657dc020e8e57b0b8ae9fe61ce9fc72749ae33684fe33f4921deef6c6eabd6696d74f216e1193ccf2e678c186ebc1d5577 SHA512 fb0e1dc5ab7f32caf3e225a5bea14666af38ce35fb593a80f6d5fa4936383266458d8db37c25f70985c635f1bd04e69281f7b6875a774ec133691ad277c1ed4f
 DIST llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz 39754833 BLAKE2B 30fe6c9267b89c9e0f046082af114c9eb9c32baeb13ab1f12b6c9c9ce7e8f83643635879fda4b3a82f5039b1aa6ff63f67546806cc7e6834e8e5399fa1d1f2d6 SHA512 b1ccaa3f39ad38946a2c177e08692719469b0747fbb63afa3054e161d24a61b5223a0c35eb0c5cc226d08416accda34035fa538803da320de205a4eb114b4f02
-DIST llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz 41625322 BLAKE2B 1dbd96a8b1257d90a2ee3aefb23af615340350164c1e3bc3301cd285ca0e639c9d2881b0627bfad11bc6ff1df2e049a9885f629f2991123a189171fcdc4cb185 SHA512 6f99f334464b69559c254e2dc2255ded97a435c8abe987e770c926b36780937a1f9d24dfaf7babaa01245f51706f079b98d2dbf03e7663196b87dbbed8ce7392
+DIST llvm-bf13d093f13a295d71080614c3036ada591201d5.tar.gz 41052612 BLAKE2B 61ff782a51bbed46ece6cdb7ea2a7bc4e28ffce22d1673444f96fb22373196e1f9851bc1fe98903d78bdeebbaa2de654d355ec91c14c3184bcf5b51657f3400c SHA512 3ebf854611b06889400e004a12478490ba43219202d1086fb4401bae9a6f4e74880f53bf3d3de9110027682a327216ac3016d6d7ec6b23ac288ca2836d615b2c
 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 nsync-1.20.0.tar.gz 153026 BLAKE2B 65c6d8d5c2998b4c3edc3500d2a97e649073935bc85cbdddc9e4bf97ccf3d66fc4f4e3396f8393a7f89609f2900f6fc4e692c7bdeb89bf3423f16870c944fa42 SHA512 a50ab4e2312c384819ceef77b5261afaf6cac37f1b33ebf2df802737a8a1694961e2040331d2c1a89c90dae89bfad8cf9488cd8f1943b8dd017f6971d32c4d7d
 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 pcre-8.42.tar.gz 2081413 BLAKE2B a1ff306e213122bdb0fcd83fab3d4cdea7e9e273c0311446de2a5b49b937e0bd7d2e7f233e3e60a3be7b8e3731a0a52fede8c4170f20d5aba1c2e5630c268c0d SHA512 db28b6efef64127f247898208bbf4ac3d6f50d222b84a857b7d45a0c24eaa4522262a305211cd59fb023b9d05e7d3b5b2add4662b8e95ed8c775a6735bd4e69b
-DIST protobuf-3.6.0.tar.gz 4483224 BLAKE2B b6716d33c14ab98a05676a3369b4762179df88ed3e8c34b93075c12edc10213bf1c427a59a8840bc64b53365264021b8075a02a44478c998062cf04da95c0075 SHA512 46df0187e5c9e7d213930d916f6c89e7a41eca1aaac228d8f56e3f784598a9f323d7cc2d3cf20668ceb776d3237c4eccf685ef8d7808f09107fa8e441f9899f4
 DIST protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz 4803167 BLAKE2B 466db7931c46df5f05018f4ebee0f1061a416b43486dce1fb4953a677f73138c74cbb97f333447862a571bcefe34dd0be3aac18e51b24f9921cb344e4e033af9 SHA512 5af4ebdd8a86a5e50c14c18590e372ea9454cadb101555e00008ebffe448acbaa8c57eeae857a53f20c64c0174ffe0a4d19ba393e2ca53beebad61d5b1db06c1
-DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
 DIST re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz 387722 BLAKE2B 122b9f30ec2534877580227fadfce6da6db00e9a3ec29140082580d71e6c4c510d5b6b7400633987d9cb546f88d26726ea6cbc7944aa925272a6dfccfbf728c9 SHA512 cbc81a948c8150416ba437f9fd7248d4e15c03160635d41702c79b981f05092dc052c5c0ee89a9fb7e163dffe148585c652207d9707214488c30bfd3aaaec18d
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
@@ -67,17 +55,10 @@ DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466d
 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.tar.gz 23571524 BLAKE2B 2961ef5a35d3271512999478f6e260c90c48537e251b41d60ae9e033386c0dd9e1337af85c5441afca1b8cf5b3726349ba0e56cccdfa95fdf1c5e9e4d4db8af5 SHA512 eb25dafccf2ec600c4ca28612362c8317b8b9160610ca9fb60f265815651c155b19ae5be3f213a0d9e716d9e25637d6502164433955247cf6fa5d75408b7ac84
-DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
-DIST tensorflow-1.9.0_rc2.tar.gz 24167723 BLAKE2B b676c8d521a060487fb5d31b75beda2e7c301396ceaa887776e368a16541ed0be0ad85c92901a45d8df324a857a324b706a6d0f38c91a2d991dcd7c40d3ecb3a SHA512 e8544b56a040b0b1a65c92455e002ea33e65d1fcd5f7eb94b4abcae74e0d8aa6982624c0133e9bdda6e57f52f410861977e866112fc1fc28ba9b4c836836a11a
 DIST tensorflow-patches-1.9.0.tar.bz2 8588 BLAKE2B 7fbdaa680b3bc372c760861709776cf333d587398297fb596332bb7394a7747c86cdc87615ae6f74e81d4e6b39a34aa3a9b6ee7cab95237316f20a315773b12b SHA512 35d56a1e71e500f41e423a2b58d58d210737afd2d9cd955aed227036a066506be1b39e7809f71d82c80f055ed43dfe1813213975acfb8d86be38baf24510e0f3
-DIST tensorflow-patches-1.9.0_rc1-r2.tar.bz2 9372 BLAKE2B fe6d33deff5cdf1158319f2e30c7c79130c555d8d8c5f8fa719c7760e1edcc1083118fcff04c0e8aedd089dd95641e19240d14d6d10e28d2dd6ae9f4ec75f185 SHA512 fc904e2396e4a0e98baa463d1bdfc421402a5e17609fe7d4ec30f6c3e5692a432f5db36ba7fa9083e9eebf4dba29b48865102fb24429bde072c738c76478d377
-DIST tensorflow-patches-1.9.0_rc2.tar.bz2 8038 BLAKE2B b416abcd1aaf3fa221eecd8e5e13bece47e13b42666c754388acf93fef4ca9f1e6a178027053402dfcabc8c9b220867fe63a73d97f56b62ec51def537d2706c4 SHA512 e6d7e8771bb9f27e5c5099b6d33f7f44bc4a2e40df1e3996e1fd7473eb836f33348c31931a28ab5d46771219b90b2eebc57d78471ee77d0ccb49fb437cd96a07
 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.ebuild 15867 BLAKE2B aecea66f13473f900ea978df0c53cb0f0f6785d9919eeeb138bcb50a6b43f7c990a6718e4f2d0e808097c681580a02891a6bdd9fc6111ec399581f9b5b9434a7 SHA512 8a7d4f14c0a6f9fa3ffd2d0adcfd00a5a19b3c7f70af8fd4c669ce0759e58d8d3d65c57f78c423dae355955f66243ce432b6a77b2058bf3d97701b3189e07134
-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
-EBUILD tensorflow-1.9.0_rc2.ebuild 15341 BLAKE2B 8e451a6dcd55465d7f86a14cfcde3f5f9f1db8734286f3133cdf9be164d50b20ed28cfd15f9551f6646e0eda814b4117a942b9e255d54053daf8006ea67108eb SHA512 db12768b2429f8fb977f227052e27cde31032c25d04517f8593bc03b3bcf691394d0e1783481d2d8d7d6af0fa43e81fac2dc9252fd0dea4e73e603217bbe2f81
+EBUILD tensorflow-1.9.0.ebuild 15995 BLAKE2B 552de5111ab960c60666937e38a9b7f3d541072f2ae00359c448a6833dd5433d798ecf4500d955c96f2dc7177f573b714e305cde9aad90ae1e4abc092aed500a SHA512 5342ec10168105c950d8de266bfa0addaf3a3349577dbac2e60939a18314bae79b33d71724df152d9bead14a03a18f965bd41d0b413a6a971525a99a4b1514ad
 MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
index 824e9cc079ef..696d6345d09b 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
@@ -48,27 +48,27 @@ bazel_external_uris="
 		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/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz
+		https://github.com/llvm-mirror/llvm/archive/bf13d093f13a295d71080614c3036ada591201d5.tar.gz -> llvm-bf13d093f13a295d71080614c3036ada591201d5.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/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
 		!system-libs? (
-			http://ftp.exim.org/pub/pcre/pcre-8.42.tar.gz
+			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.60.0.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/v1.9.0.tar.gz -> flatbuffers-v1.9.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.22.tar.gz
+		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/2018-04-01.tar.gz -> re2-2018-04-01.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
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
deleted file mode 100644
index cdd7f2db1800..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit distutils-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python"
-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"
-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
-	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
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		${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 )
-	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}]
-	)"
-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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-
-bazel-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-setup_bazelrc() {
-	if [[ -f "${T}/bazelrc" ]]; then
-		return
-	fi
-
-	# F: fopen_wr
-	# P: /proc/self/setgroups
-	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
-	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
-	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
-	addpredict /proc
-
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-
-	cat > "${T}/bazelrc" <<-EOF
-	startup --batch
-
-	# dont strip HOME, portage sets a temp per-package dir
-	build --action_env HOME
-
-	# make bazel respect MAKEOPTS
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-	build --compilation_mode=opt --host_compilation_mode=opt
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --strip=never
-	build --verbose_failures --noshow_loading_progress
-	test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
-	# make bazel only fetch distfiles from the cache
-	fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	EOF
-}
-
-ebazel() {
-	setup_bazelrc
-
-	# Use different build folders for each multibuild variant.
-	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
-	local output_base="${WORKDIR}/bazel-base${base_suffix}"
-	mkdir -p "${output_base}" || die
-
-	einfo Running: bazel --output_base="${output_base}" "$@"
-	bazel --output_base="${output_base}" $@ || die
-}
-
-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
-		src="${uri##*/}"
-		[[ -z $src ]] && continue
-		if [[ "$rename" != "->" ]]; then
-			dst="${src}"
-		fi
-
-		[[ ${A} =~ ${dst} ]] || continue
-
-		if [[ "$dst" == "$src" ]]; then
-			einfo "Copying $dst to bazel distdir $src ..."
-		else
-			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}")"
-}
-
-pkg_setup() {
-	export JAVA_HOME=$(java-config --jre-home)
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-}
-
-src_prepare() {
-	setup_bazelrc
-	load_distfiles
-
-	default
-	use python && python_copy_sources
-}
-
-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
-		export TF_NEED_S3=0
-		export TF_NEED_KAFKA=0
-		export TF_ENABLE_XLA=0
-		export TF_NEED_GDR=0
-		export TF_NEED_VERBS=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		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
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		# Only one bazelrc is read, import our one before configure sets its options
-		echo "import ${T}/bazelrc" >> ./.bazelrc
-
-		# This is not autoconf
-		./configure || die
-
-		sed -i '/strip=always/d' .tf_configure.bazelrc || die
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	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
-	}
-	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/./_}"
-		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
-
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${D}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
-		done
-
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		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
-		insinto /usr/include/${PN}/${i%/*}
-		doins ${i}
-	done
-
-	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
-	${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
deleted file mode 100644
index 05a156e3a00f..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-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/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-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"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	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/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/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/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.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? (
-		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/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/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/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.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="
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-9.0[profiler]
-		>=dev-libs/cudnn-6.0
-	)
-	mpi? ( virtual/mpi )
-	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-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 )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-bazel-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-setup_bazelrc() {
-	if [[ -f "${T}/bazelrc" ]]; then
-		return
-	fi
-
-	# F: fopen_wr
-	# P: /proc/self/setgroups
-	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
-	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
-	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
-	addpredict /proc
-
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-
-	cat > "${T}/bazelrc" <<-EOF
-	startup --batch
-
-	# dont strip HOME, portage sets a temp per-package dir
-	build --action_env HOME
-
-	# make bazel respect MAKEOPTS
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-	build --compilation_mode=opt --host_compilation_mode=opt
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --strip=never
-	build --verbose_failures --noshow_loading_progress
-	test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
-	# make bazel only fetch distfiles from the cache
-	fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	EOF
-}
-
-ebazel() {
-	setup_bazelrc
-
-	# Use different build folders for each multibuild variant.
-	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
-	local output_base="${WORKDIR}/bazel-base${base_suffix}"
-	mkdir -p "${output_base}" || die
-
-	einfo Running: bazel --output_base="${output_base}" "$@"
-	bazel --output_base="${output_base}" $@ || die
-}
-
-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
-		src="${uri##*/}"
-		[[ -z $src ]] && continue
-		if [[ "$rename" != "->" ]]; then
-			dst="${src}"
-		fi
-
-		[[ ${A} =~ ${dst} ]] || continue
-
-		if [[ "$dst" == "$src" ]]; then
-			einfo "Copying $dst to bazel distdir $src ..."
-		else
-			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+\)//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() {
-	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 TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
-		export TF_NEED_GCP=0
-		export TF_NEED_HDFS=0
-		export TF_NEED_S3=0
-		export TF_NEED_KAFKA=0
-		export TF_ENABLE_XLA=0
-		export TF_NEED_GDR=0
-		export TF_NEED_VERBS=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_MKL=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			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
-
-		# This is not autoconf
-		./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
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		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-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# 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
-
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${D}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
-		done
-
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	einfo "Installing headers"
-	# Install c c++ and core header files
-	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
-		insinto /usr/include/${PN}/${i%/*}
-		doins ${i}
-	done
-
-	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
-	${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild
deleted file mode 100644
index 8729b2afbc39..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc2.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-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/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-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"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/e5e305a158a0.tar.gz -> eigen-e5e305a158a0.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/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/1.20.0.tar.gz -> nsync-1.20.0.tar.gz
-	https://github.com/google/protobuf/archive/v3.6.0.tar.gz -> protobuf-3.6.0.tar.gz
-	https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.4.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? (
-		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-		https://github.com/abseil/abseil-py/archive/pypi-v0.2.2.tar.gz -> abseil-py-pypi-v0.2.2.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/edenhill/librdkafka/archive/v0.11.4.tar.gz -> librdkafka-v0.11.4.tar.gz
-		https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-		https://github.com/googleapis/googleapis/archive/f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip -> googleapis-f81082ea1e2f85c43649bee26e0d9871d4b41cdb.zip
-		https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/53f822805e77ea7715f5b52c592a162c515c7219.tar.gz -> google-cloud-cpp-53f822805e77ea7715f5b52c592a162c515c7219.tar.gz
-		https://github.com/hfp/libxsmm/archive/1.9.tar.gz -> libxsmm-1.9.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/fe1e7736763a8577ac081eca525e05d3b52de414.tar.gz -> llvm-fe1e7736763a8577ac081eca525e05d3b52de414.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/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-		!system-libs? (
-			http://ftp.exim.org/pub/pcre/pcre-8.42.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.60.0.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/v1.9.0.tar.gz -> flatbuffers-v1.9.0.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.22.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/2018-04-01.tar.gz -> re2-2018-04-01.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="
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
-		>=dev-libs/cudnn-6.0
-	)
-	mpi? ( virtual/mpi )
-	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-3.6.0
-		>=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-3.6.0[${PYTHON_USEDEP}]
-			dev-python/six[${PYTHON_USEDEP}]
-			dev-python/termcolor[${PYTHON_USEDEP}]
-			virtual/python-enum34[${PYTHON_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	!python? ( dev-lang/python )
-	app-arch/unzip
-	>=dev-util/bazel-0.14.0
-	dev-java/java-config
-	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 )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-bazel-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-setup_bazelrc() {
-	if [[ -f "${T}/bazelrc" ]]; then
-		return
-	fi
-
-	# F: fopen_wr
-	# P: /proc/self/setgroups
-	# Even with standalone enabled, the Bazel sandbox binary is run for feature test:
-	# https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
-	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
-	addpredict /proc
-
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-
-	cat > "${T}/bazelrc" <<-EOF
-	startup --batch
-
-	# dont strip HOME, portage sets a temp per-package dir
-	build --action_env HOME
-
-	# make bazel respect MAKEOPTS
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-	build --compilation_mode=opt --host_compilation_mode=opt
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --strip=never
-	build --verbose_failures --noshow_loading_progress
-	test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
-	# make bazel only fetch distfiles from the cache
-	fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
-	EOF
-}
-
-ebazel() {
-	setup_bazelrc
-
-	# Use different build folders for each multibuild variant.
-	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
-	local output_base="${WORKDIR}/bazel-base${base_suffix}"
-	mkdir -p "${output_base}" || die
-
-	einfo Running: bazel --output_base="${output_base}" "$@"
-	bazel --output_base="${output_base}" $@ || die
-}
-
-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
-		src="${uri##*/}"
-		[[ -z $src ]] && continue
-		if [[ "$rename" != "->" ]]; then
-			dst="${src}"
-		fi
-
-		[[ ${A} =~ ${dst} ]] || continue
-
-		if [[ "$dst" == "$src" ]]; then
-			einfo "Copying $dst to bazel distdir $src ..."
-		else
-			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+\)//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() {
-	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 TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
-		export TF_NEED_GCP=0
-		export TF_NEED_HDFS=0
-		export TF_NEED_S3=0
-		export TF_NEED_AWS=0
-		export TF_NEED_KAFKA=0
-		export TF_ENABLE_XLA=0
-		export TF_NEED_GDR=0
-		export TF_NEED_VERBS=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_MKL=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			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
-
-		# This is not autoconf
-		./configure || die
-
-		sed -i '/strip=always/d' .tf_configure.bazelrc || die
-
-		if use system-libs; then
-			echo 'build --action_env TF_SYSTEM_LIBS="astor_archive,com_googlesource_code_re2,curl,cython,flatbuffers,gif_archive,grpc,jemalloc,jpeg,lmdb,nasm,org_sqlite,pcre,png_archive,six_archive,snappy,swig,termcolor_archive,zlib_archive"' >> .tf_configure.bazelrc || die
-		fi
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		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-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# 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
-
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
-
-		# Symlink to python-exec scripts
-		for i in "${D}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
-		done
-
-		python_setup
-		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
-		cd "${S}-${MULTIBUILD_VARIANT}" || die
-	fi
-
-	einfo "Installing headers"
-	# Install c c++ and core header files
-	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
-		insinto /usr/include/${PN}/${i%/*}
-		doins ${i}
-	done
-
-	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
-	${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7c4ec3675d15..26265aaa42e2 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
new file mode 100644
index 000000000000..364d3cb09511
--- /dev/null
+++ b/sci-mathematics/cvc4/Manifest
@@ -0,0 +1,3 @@
+DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
+EBUILD cvc4-1.6.ebuild 556 BLAKE2B 2943590af801614ea64b26ff72ee9d445c544dacc62b93428c60e8e80a8fea9884f646d3d3680c89d246c34f42215998aadbc39618ee5334d5ee3503e179543b SHA512 bd9ed1c3e2c635ba47667d77fb0929a2681ec6bc09570e74b0e093b76208746e804b7dd04852bb00c44d3b69f31385346ab838ef8e058d701eaf2dd5aabe4d17
+MISC metadata.xml 635 BLAKE2B 96c8a55b5e69e6f52bb5b66ac46361b07bee92c72216d73837a4644ea139b3fc9375f8e8ca68db04975675d6520d7275c02c0cfd27957c77b3506e90b332cc8d SHA512 166da2a33b4d8d33ee237d6175973e382399e1864317fd585395f1f3c78b1487ef4e95c866bfc8e9928fc10f648c45b6f95d0803b608cd8a8b9040c1054f2538
diff --git a/sci-mathematics/cvc4/cvc4-1.6.ebuild b/sci-mathematics/cvc4/cvc4-1.6.ebuild
new file mode 100644
index 000000000000..1500f9d338da
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
+SRC_URI="http://cvc4.cs.stanford.edu/downloads/builds/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln"
+
+RDEPEND="dev-libs/antlr-c
+	dev-libs/boost
+	cln? ( sci-libs/cln )
+	!cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+
+src_configure () {
+	econf --enable-gpl \
+		$(use_with cln)
+}
diff --git a/sci-mathematics/cvc4/metadata.xml b/sci-mathematics/cvc4/metadata.xml
new file mode 100644
index 000000000000..d1a299673f89
--- /dev/null
+++ b/sci-mathematics/cvc4/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<use>
+		<flag name="cln">Use sci-libs/cln</flag>
+	</use>
+	<longdescription lang="en">
+		CVC4 is an efficient open-source automatic theorem prover for
+		satisfiability modulo theories (SMT) problems. It can be used to prove
+		the validity (or, dually, the satisfiability) of first-order formulas
+		in a large number of built-in logical theories and their combination.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 12466c114d0b..78be73a5e22a 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -12,6 +12,6 @@ AUX octave-4.4.0-qt-5.11.patch 346 BLAKE2B 0e9d5a2701ca789abaf9b396e5716226ce786
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
-EBUILD octave-4.2.2.ebuild 5023 BLAKE2B 693ffa10fad508244db33ce1cd85d13a24653f119fae4562d279b3db0a81c6c47d5bff4cd8fd674f98479532ad952be95267333cc0b71e28bf5670763983f778 SHA512 d06c9fbe42c3bde1ef3df4c2d603968401faeb2c79503d775981ff8759007109853e7fe77c83797524276a38e64a6714b92e60735bfbb4cdc9202ced1401b759
-EBUILD octave-4.4.0.ebuild 5138 BLAKE2B 696f725740b8c752ac97c5abe396d6f002ff985c3cc59c0d6d7fd072ec1c1b022004eb1d025bd1a3c220ce719923e578746e02d374538ba2d8450175caefc1ba SHA512 601b5f650cf97d202018f4b07573953bfd2d9a1a6e4f4de474125b082174acb323e0e16c3b124e93c836846688cfae2342457385e4dd413ab834aeb68312f9ef
+EBUILD octave-4.2.2.ebuild 4977 BLAKE2B 7731031afe7718a0e3e4441be0ffe2813d7dd8087300fe994abde88a07692bfec4efc09b5dfe9aabd0c77d4d83a35a80588f1d6846d316986973e0c81e6f74a8 SHA512 220ff00f3399df1b10f38c7feae36af99bfd06e4a36a11d46d8f9a2286b67464ec0f5aa11fb1308d98431aa1c1884d5ab027f1fb2c4d1cb2bd4c0e9e4eda9167
+EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index cc87a36b369d..da55163918a9 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
+		dev-texlive/texlive-plaingeneric
 		dev-texlive/texlive-metapost
 		virtual/latex-base
 	)
diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild
index 45ac0d9b327e..d5d7b00aaf25 100644
--- a/sci-mathematics/octave/octave-4.4.0.ebuild
+++ b/sci-mathematics/octave/octave-4.4.0.ebuild
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
+		dev-texlive/texlive-plaingeneric
 		dev-texlive/texlive-metapost
 		virtual/latex-base
 	)
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 3b44e9290719..8cb8540c2dff 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index a520316dbe4e..9768f776a188 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,4 +1,6 @@
 DIST espresso++-1.9.4.tar.gz 23954404 BLAKE2B b2bb7940db21acb64771fc387d22cec49fc39bae58b9d4ff683eccdbba63981e7ba5c6d64ce938f53e125e74db0423d40ac3c60e33a5589b64a20527437027c6 SHA512 0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
+DIST espresso++-2.0.tar.gz 26352105 BLAKE2B 1e35f20a781be36b15a587adcfbe461ea2eaaa2be5fffb86906283b1b7327596e94a5c33f4dcb41288fa7d1262ede1655192652d8eb80f8f866d25e5a4ec654c SHA512 97c7fb45091d09c1b131b462b010d7e082589ae1746dd9fedfd6affdbcdd384d5c9beaeaec3e08cec88750d0a1db8a1f8e68adb01f45dd8b92a1cb34c69386dc
 EBUILD espresso++-1.9.4.ebuild 1264 BLAKE2B 8f7ec08b92b85c6f4d891ef3179d32984edd34ba321aedb87c634aa9906e9723dbf42f4fa88f98130c272f95f522dc2c728af7ceb1e32567caa55eefc7290828 SHA512 8b43f473fb2120c85441f721df7a52d82a924ed88d51e8e97672e608edcfb37bb357807e49336a409c28363b9de86fe5f9fde5d909addc8eb7a23b847b5380e5
-EBUILD espresso++-9999.ebuild 1229 BLAKE2B 4489cb157d44f58b1cd7cd722526cde2da79241d2940262cf416a40f8093e3ecbbdb02bb226bf0eb6174fee3d5553dcd1358707add3cbac7e7b01e58ed56c43b SHA512 eb71b59603ddbf3c830b8b0ad1034b613a9a97552ad0d31e0cb67380f2b10b833d150054af363ebeb5474f4fff366af3a787c2f95fa25dc15b9173839a51302e
+EBUILD espresso++-2.0.ebuild 1264 BLAKE2B 00a9bcd8b53a6f324b619c56e2ebfa8cf2a56219f6b522d9640c7394bec0b5e63092e8b20edea561736332e8a8307cc993073d99e320db3e296f72678f380967 SHA512 b3e217d4757fa73821d4532318724c7ec2a9263729b1328598e02343d7bc3d2018e07e86e16d01b9346316ee01e46216af527fc62247825f43e0a662d972066c
+EBUILD espresso++-9999.ebuild 1264 BLAKE2B 00a9bcd8b53a6f324b619c56e2ebfa8cf2a56219f6b522d9640c7394bec0b5e63092e8b20edea561736332e8a8307cc993073d99e320db3e296f72678f380967 SHA512 b3e217d4757fa73821d4532318724c7ec2a9263729b1328598e02343d7bc3d2018e07e86e16d01b9346316ee01e46216af527fc62247825f43e0a662d972066c
 MISC metadata.xml 525 BLAKE2B 19c69884a09ab09426a1e97051757b276ebb02c2122de33f65878f4d28cb0f8fd49e0f8608214ec4026f3e3f19dfcdc8bb924f16600bdbf6ea6f149a7aeed0f3 SHA512 62fa70b4fb5b56734c3ba8d47fa3940f3b3856a2f51941f2804daee53949142bbfd4cab9036ed10e0901284bd9bd15a03541d6927c1d4d89eb701f2efeb636ed
diff --git a/sci-physics/espresso++/espresso++-2.0.ebuild b/sci-physics/espresso++/espresso++-2.0.ebuild
new file mode 100644
index 000000000000..3bae0551d9b2
--- /dev/null
+++ b/sci-physics/espresso++/espresso++-2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="A Modern Multiscale Simulation Package for Soft Matter Systems"
+HOMEPAGE="https://www.espresso-pp.de"
+
+MY_PN="${PN//+/p}"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	virtual/mpi
+	dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
+	sci-libs/fftw:3.0
+	>=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	src_configure_internal() {
+		local mycmakeargs=(
+			-DEXTERNAL_BOOST=ON
+			-DEXTERNAL_MPI4PY=ON
+			-DWITH_RC_FILES=OFF
+		)
+		cmake-utils_src_configure
+	}
+	python_foreach_impl src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+}
diff --git a/sci-physics/espresso++/espresso++-9999.ebuild b/sci-physics/espresso++/espresso++-9999.ebuild
index 2f9ecca51ed3..3bae0551d9b2 100644
--- a/sci-physics/espresso++/espresso++-9999.ebuild
+++ b/sci-physics/espresso++/espresso++-9999.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
@@ -30,9 +30,11 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/mpi
 	dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
-	dev-python/mpi4py[${PYTHON_USEDEP}]"
+	>=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_configure() {
 	src_configure_internal() {
 		local mycmakeargs=(
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ae2a79d0c9a4..780d5aa9acc0 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 4317a15a97d9..02e8a426fe3c 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,7 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
+AUX paraview-5.5.2-qt-5.11.patch 6035 BLAKE2B 063f4418bdf5b65946df71350d5dc5bdd4546f93d7a01064f653cbf2eb07af0167a7fbff54f192f4a4a53e554ad48c075ed66f1732dbead65bf0a2c112c92ec7 SHA512 3e6a640c515bb64be1052e41f219630747676be69d40b8695a97d60bc1a94ce9eef629ce9ed93001e019520096fe3b85bd1ad3b5a97b6f207cdedd3e3905e601
 DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
-EBUILD paraview-5.5.2.ebuild 8355 BLAKE2B 024db792d3b708049e4bf09a294621e802de48e1d3c0f528330f61431e26e67c75226918a2db3356f7c50990fc0dc44c36ce4dfdbc6c1c353aa3ca21db983f98 SHA512 da6247117d63f194d5d24a3aa1f8ab91b58bceaa5be919a450e0f32d6d9950dac6a0bd94bf47418d23aebaf68d7677999cc31febfe56505acb3b2234675877e7
+EBUILD paraview-5.5.2.ebuild 8235 BLAKE2B 8d2c969d099e1e2b1d18aa4199ce4aca239caa59b57479ced193b27236e19b783394b8822fda673266b925d7a4843f2b9e44717bd5e8f42981bd702b44d7e6c7 SHA512 a35a97f0a0bb6ad724911b0ead4eba48b3b52643d2e0a6f48a45a8d1dda2afed96e498fc57a11b2aa9ffd94dfb7acfe2e26d8f688eac939e23b74ba745198517
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
new file mode 100644
index 000000000000..b4299d4ee370
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
@@ -0,0 +1,142 @@
+From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
+From: Robert O'Bara <bob.obara@kitware.com>
+Date: Thu, 24 May 2018 09:49:28 -0400
+Subject: [PATCH] ENH: Changes needed to support Qt 5.11
+
+Basically needed to add missing header files.
+---
+ Plugins/SLACTools/pqSLACDataLoadManager.cxx                     | 1 +
+ Qt/ApplicationComponents/pqColorMapEditor.cxx                   | 1 +
+ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx  | 1 +
+ .../pqStandardViewFrameActionsImplementation.cxx                | 1 +
+ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx              | 1 +
+ .../pqTransferFunctionWidgetPropertyDialog.cxx                  | 2 ++
+ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx     | 1 +
+ Qt/Components/pqChangeInputDialog.cxx                           | 1 +
+ Qt/Components/pqCinemaTrackSelection.cxx                        | 1 +
+ Qt/Python/pqPythonShell.cxx                                     | 1 +
+ 10 files changed, 11 insertions(+)
+
+diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+index 3ba019c26b..ce38396f68 100644
+--- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
++++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+@@ -34,6 +34,7 @@
+ #include "vtkSMProperty.h"
+ #include "vtkSMSourceProxy.h"
+ 
++#include <QAction>
+ #include <QPushButton>
+ #include <QtDebug>
+ 
+diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
+index 0395185e0a..88b56745eb 100644
+--- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
++++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
+@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <QDebug>
+ #include <QKeyEvent>
+ #include <QPointer>
++#include <QStyle>
+ #include <QVBoxLayout>
+ 
+ class pqColorMapEditor::pqInternals
+diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+index 908e4598e0..820361a2b3 100644
+--- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
++++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMUncheckedPropertyHelper.h"
+ 
+ #include <QGridLayout>
++#include <QStyle>
+ 
+ class pqDoubleRangeSliderPropertyWidget::pqInternals
+ {
+diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+index c297dc3d9e..501633f63a 100644
+--- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
++++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <QPushButton>
+ #include <QSet>
+ #include <QShortcut>
++#include <QStyle>
+ 
+ //-----------------------------------------------------------------------------
+ pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
+diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+index 6774c2e48e..e85e614f04 100644
+--- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
++++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMPropertyHelper.h"
+ #include "vtkSMSourceProxy.h"
+ 
++#include <QHeaderView>
+ #include <QLineF>
+ #include <QPainter>
+ #include <QVariant>
+diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
+index 55d3146447..93cd995d92 100644
+--- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
++++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
+@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkPiecewiseFunction.h"
+ #include <QString>
+ 
++#include <QDoubleValidator>
++
+ class pqTransferFunctionWidgetPropertyDialog::pqInternals
+ {
+ public:
+diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+index 6d2865431e..8d2c4b61cd 100644
+--- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
++++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMProxy.h"
+ 
+ #include <QIntValidator>
++#include <QStyle>
+ 
+ class pqViewResolutionPropertyWidget::pqInternals
+ {
+diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
+index 8a67b10095..86db3de01c 100644
+--- a/Qt/Components/pqChangeInputDialog.cxx
++++ b/Qt/Components/pqChangeInputDialog.cxx
+@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMProxy.h"
+ #include "vtkSmartPointer.h"
+ 
++#include <QHeaderView>
+ #include <QItemSelectionModel>
+ #include <QLineEdit>
+ #include <QRadioButton>
+diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
+index 3d6d9dde19..eea2e37680 100644
+--- a/Qt/Components/pqCinemaTrackSelection.cxx
++++ b/Qt/Components/pqCinemaTrackSelection.cxx
+@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ ========================================================================*/
+ #include <QDebug>
++#include <QHeaderView>
+ 
+ #include "vtkPVArrayInformation.h"
+ #include "vtkPVDataInformation.h"
+diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
+index 3d01fd0a96..bc1a014936 100644
+--- a/Qt/Python/pqPythonShell.cxx
++++ b/Qt/Python/pqPythonShell.cxx
+@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkStringOutputWindow.h"
+ #include "vtkWeakPointer.h"
+ 
++#include <QAbstractItemView>
+ #include <QApplication>
+ #include <QCursor>
+ #include <QFile>
+-- 
+2.17.1
diff --git a/sci-visualization/paraview/paraview-5.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
index b34d4ec9805e..0c54acaaf605 100644
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild
@@ -4,22 +4,22 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+inherit cmake-utils desktop eapi7-ver gnome2-utils python-single-r1 toolchain-funcs
 
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
 MY_P="ParaView-v${PV}"
 
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-RESTRICT="mirror"
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
 
 LICENSE="paraview GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
-RESTRICT="test"
+
+RESTRICT="mirror test"
 
 REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
@@ -89,8 +89,7 @@ RDEPEND="
 	tk? ( dev-lang/tk:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/cmake-3.4
-	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
 	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${MY_P}"
@@ -99,17 +98,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-		eerror "For USE=openmp a gcc with openmp support is required"
-		eerror
-		return 1
-	fi
-}
-
 pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
 	python-single-r1_pkg_setup
 	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
 }
@@ -164,8 +157,7 @@ src_configure() {
 		-DVTK_USE_SYSTEM_PNG=ON
 		-DVTK_USE_SYSTEM_PROTOBUF=ON
 		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_XDMF2=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
 		-DVTK_USE_SYSTEM_ZLIB=ON
 		# force this module due to incorrect build system deps
 		# wrt bug 460528
@@ -254,10 +246,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -283,3 +271,11 @@ src_install() {
 
 	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}