gentoo resync : 30.06.2018

4 files changed, 146 insertions, 76 deletions

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 7cfdba370530..77d6c0dbcb12 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -39,6 +39,7 @@ DIST llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz 39754833 BLAKE2B 30fe6
 DIST mkl_dnn-v0.12.tar.gz 759597 BLAKE2B ad790db940ca5353bc20db9e012356761e5a87d6646eeae983880881e1df271a0a4deb3b6810546fa8cf6f2c35c45509c57630cf8d493d72d557d33864f780f3 SHA512 e6a257679b872d16e320556ca2c1ddb5c04a949ee8b8d6b4de350c46ad4ea79749d5d9f92940c592706719490ad837210335027f782a8df46da1a2029ae5adcc
 DIST nasm-2.12.02.tar.bz2 961257 BLAKE2B f45c35571fa1254ccc01ed59de8a46cb480300404c701b444a7a751d077d23f64a7dbeeeb044d7daed8a6f895b1100f76f2db75ced6417ab56cb83b9494eece1 SHA512 7744a078647861382212de798d200b683cc4044881474fc1931acb14dfa0340ce026d1b3f64ac1ece87878ccd0ddcb69b8c0c850415313f47e01f0332e56a8f8
 DIST nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz 151680 BLAKE2B 280f8800e8674fbab90d15c09ab7e260b3230bfcf0fb44c998955c9bd4aaf07b4a9073a74479c8879811c56863d4c28693e408a4b205e5b5d9c801bb82159216 SHA512 ef61f9f0b12cf1252840966243ef4b4a0cc18afde7eddedb7e3f6ea31fa8a89da5570cfe6be536d721e4b7593249d05bb1c60372f6668635ad8bcde78bfc8dee
+DIST nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz 47849 BLAKE2B fb2a6fc1e45057c4150c1dae2a5058a12d8641b3f5dfdd982661b4351ec9df39ac3aefaf4dfa9c8606ddf7fd1c4a8b35683e5e5eddd74cbc63ee025b33d4b731 SHA512 eb555030e9d60d68c4094e85f16e0b74de7f61602c742d57bc2029d12c719084a2fd1214c13467ff262f6f3932508754159af5f014e6f16d279d14e1fafa9b8a
 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST pcre-8.39.tar.gz 2062258 BLAKE2B 1bc2b7b822383ba67b3e9707178fd100a13370a3a4ce8e6527fe0356f7d3e604a9ece11cef5e9e85925fc309698887389e67759d820b8b7a99703cc1cd3ccc88 SHA512 1724b2d6d8575af19fc20a13e50d71cb8024a66458d63cbc006b5bca01230845730535f3446d3850ddd580c93031f38c3ebf547adce0d279dfd18101677403da
 DIST protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz 4803167 BLAKE2B 466db7931c46df5f05018f4ebee0f1061a416b43486dce1fb4953a677f73138c74cbb97f333447862a571bcefe34dd0be3aac18e51b24f9921cb344e4e033af9 SHA512 5af4ebdd8a86a5e50c14c18590e372ea9454cadb101555e00008ebffe448acbaa8c57eeae857a53f20c64c0174ffe0a4d19ba393e2ca53beebad61d5b1db06c1
@@ -49,12 +50,12 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f
 DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
 DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
 DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
-DIST tensorflow-1.9.0_rc0.tar.gz 23632522 BLAKE2B 2049f97edb18fe34963c2706dc7249102204bacbd568c7a1ae880d9d94ba2a24b47f577ef71b6bf40e55b4c42537a2184e0ab2ad8e27cdbfcc9508cfa70515a8 SHA512 55b165882ce965c8b46ebb91e26b5828c3b71d6c07b8d5a321e890e9b5c00e896de511fc1d9e9b2f7f4f33311da6add32c7f7b55631eab8fedcc2167186649e3
 DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
+DIST tensorflow-patches-1.9.0_rc1-r2.tar.bz2 9372 BLAKE2B fe6d33deff5cdf1158319f2e30c7c79130c555d8d8c5f8fa719c7760e1edcc1083118fcff04c0e8aedd089dd95641e19240d14d6d10e28d2dd6ae9f4ec75f185 SHA512 fc904e2396e4a0e98baa463d1bdfc421402a5e17609fe7d4ec30f6c3e5692a432f5db36ba7fa9083e9eebf4dba29b48865102fb24429bde072c738c76478d377
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
-EBUILD tensorflow-1.9.0_rc0.ebuild 13456 BLAKE2B af490ef87277a17569d2f24fee316ff111c06db7193b04fce3b568421e38807de4300dcf8f7acab64353962a944b11b045e371a93bf2af00ef8dbf0e7eb1f939 SHA512 f9e497ac6f4fa9032918d57b329476ee6e428745af6e8d35eacfa1016147b1926a67563cce42284835bbed8c07b9b7c6ac4a4b890d1214c7e29f693fcd1525f8
-EBUILD tensorflow-1.9.0_rc1.ebuild 13585 BLAKE2B 0791608a2ed5f15dc8539cdaf67b6d92934f6c61c98ad9124ec52819c8858771b4fb67a59e2ab48ab17f1431640790c6cef30389b9d9198020a3eb856162c348 SHA512 dcc8998e2c722304f7e50d66777503d0e38f5e1b27f6f9d4671e4723aa8d75353672e2cffc189280d0424b11d5dd748278fadd21a49f3034468e1137d2cb2802
-MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
+EBUILD tensorflow-1.9.0_rc1-r1.ebuild 14203 BLAKE2B b917672bd1af89c78f04f0494005d7f060633ccf5f98fe69ff3b747420d7c43a6820206d73cf97fa970a6ff888c1da8f5879afac5de817f2693b538ce9f76f57 SHA512 3d65dbc8ab6ab91ecfde615a73d4bb3671f8b2ad0fee2477f82b1b9b2839f9acf4e9285e870bccc7adea788c0fc80fd291ae5eaf1e7102d545fcc7749eecb692
+EBUILD tensorflow-1.9.0_rc1-r2.ebuild 15253 BLAKE2B b5e9ed0a73d8baaf7cea580424300104f21c2a1a6274f529ef9e6f88260b59f507d01d9f9f988a388a112f85abbf3fe5190150210ce96a77e63cc2a55d286977 SHA512 1490ccd3332dd31c99dfba4af61e433953d582370273192cc50f7b3c26e52962eda9aee5a0746d529ac50e472730345b3e07824e0042fbc7247392991856a657
+MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index d6a68a59e703..5fc9f21f4638 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
 		<flag name="mpi">Enable support for MPI</flag>
 		<flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
+		<flag name="system-libs">Link with system instead of bundled libraries</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">tensorflow/tensorflow</remote-id>
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
index 207901b88346..cdd7f2db1800 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
@@ -111,8 +111,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
 
 bazel-get-cpu-flags() {
 	local i f=()
@@ -304,6 +302,7 @@ src_compile() {
 }
 
 src_install() {
+	local i j
 	do_install() {
 		einfo "Installing ${EPYTHON} files"
 		local srcdir="${T}/src-${EPYTHON/./_}"
@@ -338,6 +337,9 @@ src_install() {
 		cd "${S}-${MULTIBUILD_VARIANT}" || die
 	fi
 
+	local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+	local output_base="${WORKDIR}/bazel-base${base_suffix}"
+
 	einfo "Installing headers"
 	# Install c c++ and core header files
 	for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
@@ -345,9 +347,23 @@ src_install() {
 		doins ${i}
 	done
 
-	# Eigen headers
-	insinto /usr/include/${PN}/third_party/eigen3/Eigen/
-	doins third_party/eigen3/Eigen/*
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	insinto /usr/include/${PN}/third_party/eigen3/
+	doins -r third_party/eigen3/Eigen
+	insinto /usr/include/${PN}/third_party/eigen3/unsupported/
+	doins -r third_party/eigen3/unsupported/Eigen
+
+	insinto /usr/include/${PN}/
+	doins -r "$output_base"/external/eigen_archive/Eigen
+	insinto /usr/include/${PN}/unsupported/
+	doins -r "$output_base"/external/eigen_archive/unsupported/Eigen
 
 	einfo "Installing libs"
 	# Generate pkg-config file
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
index 77831fe28628..05a156e3a00f 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
-inherit distutils-r1 multiprocessing toolchain-funcs
+inherit check-reqs cuda distutils-r1 eapi7-ver multiprocessing toolchain-funcs
 
 DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
 HOMEPAGE="https://www.tensorflow.org/"
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.tensorflow.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python"
+IUSE="cuda jemalloc mpi +python system-libs"
 CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
 for i in $CPU_USE_FLAGS_X86; do
 	IUSE+=" cpu_flags_x86_$i"
@@ -24,95 +24,111 @@ done
 
 # distfiles that bazel uses for the workspace, will be copied to basel-distdir
 bazel_external_uris="
-	http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
-	http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
 	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
 	https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz -> eigen-6913f0cf7d06.tar.gz
-	https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
 	https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
 	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-	https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
 	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
 	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
 	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
 	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
 	https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
 	https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
-	https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
-	https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
-	https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
-	https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
 	https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
-	https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
-	https://zlib.net/zlib-1.2.11.tar.gz
 	https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
+	cuda? ( https://github.com/nvidia/nccl/archive/03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz -> nvidia-nccl-03d856977ecbaac87e598c0c4bafca96761b9ac7.tar.gz )
 	python? (
-		http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
-		http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
-		https://curl.haxx.se/download/curl-7.49.1.tar.gz
 		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
 		https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
 		https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
-		https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
 		https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz
 		https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-		https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
 		https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz
 		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
 		https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
 		https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz -> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz
 		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
 		https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
-		https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
 		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-		https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
-		https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+		!system-libs? (
+			http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
+			http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
+			https://curl.haxx.se/download/curl-7.49.1.tar.gz
+			https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
+			https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
+			https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
+			https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
+			https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
+		)
+	)
+	!system-libs? (
+		http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
+		http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
+		https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
+		https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
+		https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
+		https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
+		https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
+		https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
+		https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
+		https://zlib.net/zlib-1.2.11.tar.gz
 	)"
 
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
 		${bazel_external_uris}"
 
 RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/libpcre
-	dev-libs/protobuf
-	dev-libs/protobuf-c
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libpng:0
-	net-libs/grpc[${PYTHON_USEDEP}]
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler] >=dev-libs/cudnn-6.0 )
-	jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.0[profiler]
+		>=dev-libs/cudnn-6.0
+	)
 	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
+	system-libs? (
+		app-arch/snappy
+		dev-db/lmdb
+		dev-db/sqlite
+		>=dev-libs/flatbuffers-1.8.0
+		>=dev-libs/jsoncpp-1.8.4
+		dev-libs/libpcre
+		dev-libs/protobuf
+		dev-libs/protobuf-c
+		>=dev-libs/re2-0.2018.04.01
+		media-libs/giflib
+		media-libs/libjpeg-turbo
+		media-libs/libpng:0
+		>=net-libs/grpc-1.12.1[${PYTHON_USEDEP}]
+		net-misc/curl
+		sys-libs/zlib
+		jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
+		python? (
+			${PYTHON_DEPS}
+			dev-python/absl-py[${PYTHON_USEDEP}]
+			dev-python/astor[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/termcolor[${PYTHON_USEDEP}]
+		)
 	)"
 DEPEND="${RDEPEND}
 	!python? ( dev-lang/python )
 	app-arch/unzip
 	>=dev-util/bazel-0.14.0
 	dev-java/java-config
-	dev-lang/nasm
-	dev-lang/swig
-	dev-python/cython
-	dev-python/mock"
+	dev-python/mock
+	system-libs? (
+		dev-lang/nasm
+		dev-lang/swig
+		dev-python/cython
+	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
 
 bazel-get-cpu-flags() {
 	local i f=()
@@ -196,6 +212,10 @@ ebazel() {
 
 load_distfiles() {
 	# Populate the bazel distdir to fetch from since it cannot use the network
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
 	local src dst uri rename
 
 	while read uri rename dst; do
@@ -213,32 +233,39 @@ load_distfiles() {
 			einfo "Copying $dst to bazel distdir ..."
 		fi
 		cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
-	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//' <<< "${bazel_external_uris}")"
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//g' <<< "${bazel_external_uris}")"
 }
 
 pkg_setup() {
 	export JAVA_HOME=$(java-config --jre-home)
+	check-reqs_pkg_setup
 }
 
 src_unpack() {
 	# Only unpack the main distfile
 	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
 }
 
 src_prepare() {
-	BAZEL_OUTPUT_BASE="${WORKDIR}/bazel-base"
-	mkdir -p "${BAZEL_OUTPUT_BASE}" || die
 	setup_bazelrc
 	load_distfiles
 
+	eapply "${WORKDIR}"/patches/*.patch
+
 	default
 	use python && python_copy_sources
+
+	if use cuda; then
+		for i in /dev/nvidia*; do
+			addpredict $i
+		done
+	fi
 }
 
 src_configure() {
 	do_configure() {
 		export CC_OPT_FLAGS=""
-		export GCC_HOST_COMPILER_PATH=$(which $(tc-getCC))
 		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
 		export TF_NEED_GCP=0
 		export TF_NEED_HDFS=0
@@ -252,8 +279,6 @@ src_configure() {
 		export TF_NEED_COMPUTECPP=0
 		export TF_NEED_MKL=0
 		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_NEED_CUDA=$(usex cuda 1 0)
 		export TF_SET_ANDROID_WORKSPACE=0
 
 		if use python; then
@@ -265,6 +290,27 @@ src_configure() {
 			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
 		fi
 
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+
+			TF_CUDA_VERSION="$(best_version dev-util/nvidia-cuda-toolkit)"
+			TF_CUDA_VERSION="${TF_CUDA_VERSION##*cuda-toolkit-}"
+			export TF_CUDA_VERSION="$(ver_cut 1-2 ${TF_CUDA_VERSION})"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+
+			TF_CUDNN_VERSION="$(best_version dev-libs/cudnn)"
+			TF_CUDNN_VERSION="${TF_CUDNN_VERSION##*cudnn-}"
+			export TF_CUDNN_VERSION="$(ver_cut 1-2 ${TF_CUDNN_VERSION})"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
 		# Only one bazelrc is read, import our one before configure sets its options
 		echo "import ${T}/bazelrc" >> ./.bazelrc
 
@@ -272,6 +318,10 @@ src_configure() {
 		./configure || die
 
 		sed -i '/strip=always/d' .tf_configure.bazelrc || die
+
+		if use system-libs; then
+			echo 'build --action_env TF_SYSTEM_LIBS="com_googlesource_code_re2,nasm,jpeg,png_archive,org_sqlite,gif_archive,six_archive,astor_archive,termcolor_archive,pcre,swig,curl,grpc,lmdb,zlib_archive,snappy,flatbuffers,cython,jemalloc"' >> .tf_configure.bazelrc || die
+		fi
 	}
 	if use python; then
 		python_foreach_impl run_in_build_dir do_configure
@@ -288,33 +338,26 @@ src_compile() {
 	fi
 
 	ebazel build \
-		$(usex cuda --config=cuda '') \
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so
 
 	do_compile() {
-		ebazel build \
-			$(usex cuda --config=cuda '') \
-			//tensorflow/tools/pip_package:build_pip_package
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
 	}
 	use python && python_foreach_impl run_in_build_dir do_compile
 }
 
 src_install() {
+	local i j
 	do_install() {
 		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${EPYTHON/./_}"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
 		mkdir -p "${srcdir}" || die
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
 		cd "${srcdir}" || die
 		esetup.py install
 
-		# It installs site-packages/external but shouldnt
-		python_export PYTHON_SITEDIR
-		rm -rf "${D}/${PYTHON_SITEDIR}/external" || die
-		sed -i '/^external/d' "${D}/${PYTHON_SITEDIR}"/${P/_rc/rc}-*.egg-info/{SOURCES,top_level}.txt || die
-
 		# Symlink to the main .so file
 		rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
 		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
@@ -343,9 +386,18 @@ src_install() {
 		doins ${i}
 	done
 
-	# Eigen headers
-	insinto /usr/include/${PN}/third_party/eigen3/Eigen/
-	doins third_party/eigen3/Eigen/*
+	einfo "Installing generated headers"
+	for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+		j=${i#bazel-genfiles/}
+		insinto /usr/include/${PN}/${j%/*}
+		doins ${i}
+	done
+
+	einfo "Installing Eigen headers"
+	ebazel build //third_party/eigen3:install_eigen_headers
+
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/third_party/eigen3/include/*
 
 	einfo "Installing libs"
 	# Generate pkg-config file