gentoo resync : 05.04.2019

18 files changed, 771 insertions, 174 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a5fb3918b4e7..c67486d2d688 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 6e2ab7542b9c..71b611aad372 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -3,7 +3,9 @@ AUX hdf5-1.8.15-implicits.patch 1050 BLAKE2B 9a019e69e9e02c487c5cf460380aaff08c6
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 66ad762aed90cea9e58a9735bf0e189d78befc40cac0e566586e967f2b3ba6f5bf8a6bfd12a2f4062f8b20900c16d467c34134c17dedfd8f345cb96bd853a2fe SHA512 266b0e2f28c5fd540099a4955244ddb8c03aca3ad40d626358643f033a6ae5e9266a1d6c1d60925c7d42d24d28a1549d3305fe8ddb42cec2379af7231b93e554
+DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
 DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3 SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
 EBUILD hdf5-1.10.1.ebuild 2808 BLAKE2B 79eb6b5c889d717f6a8391ce334baa0878971256460be4d6bde00726078f4a944c2e4843867c767fa25cf346cca9f7f2cf58f0c918d17bd4cf050a11ba17c396 SHA512 29b39083a7fc5400490c81a5c6ad9bc76485c5ac67f983a45524010b1d72e99cca6e218b1dd052c000bfd7bd7397ec770e6d62ca0d5e313ac3c3c2253387e758
+EBUILD hdf5-1.10.5.ebuild 2660 BLAKE2B 02eb512d9b204c31ec26bd0b61a9ab0d0b40c63505a07928aebc78185d765d4e551b0905fd5b0fa7c84feb117b0f909edb17f2803729ec55b80f26ecec43c3ff SHA512 bdde7e485f7dab120051b22ece32fdbd7ec943c859d37b007847789aa68cbf7153dc38dbf077e56415334743a6843457c94eb6a1883ea9a494ada48ded0781d7
 EBUILD hdf5-1.8.18.ebuild 3366 BLAKE2B 5ea79bd8cfd5664c92de2cfb62c826500b1847290684a9ad3a1bda7ac2aa33d2d428b59ce9f7f1bfb17637472742804ddb98f9018386ebfbdff33c2023d942e4 SHA512 54e66dc074fd9b0fe9ad23f23234fc20e79c6ed9e9759d6964cb8e4d3e79321c08b4539a814f2fae2c935bb9358549115a884b8f55719fb77744fd26ad680867
 MISC metadata.xml 822 BLAKE2B ab9bf739575f9758fa521e9640438b345379373884ffd25a021a15589b7016d519f01d4d4d39dc5c8efbd271fbeb89d584b3d627e2b0d90cecf55d36747447cf SHA512 5e6cb47fcf2e704887a375f527b447075a36a51225cc2bdf10892bff5cce548599dd6f04a36ae2e31f691bd635dd6cc5d1455729e05923a8992d95fb27716164
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
new file mode 100644
index 000000000000..1e8158a6d6bd
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+
+MY_P=${PN}-${PV/_p/-patch}
+MAJOR_P=${PN}-$(ver_cut 1-2)
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/HDF5/"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
+
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
+	threads? ( !cxx !mpi !fortran !hl )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool:2
+	>=sys-devel/autoconf-2.69"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+	"${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
+	"${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
+)
+
+pkg_setup() {
+	tc-export CXX CC AR # workaround for bug 285148
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC=mpicc
+		use fortran && export FC=mpif90
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_prepare() {
+	# respect gentoo examples directory
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
+		-e '/docdir/d' \
+		-i config/commence.am || die
+	if ! use examples; then
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die #409091
+	fi
+	# enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
+	hprefixify m4/libtool.m4
+
+	default
+	eautomake
+}
+
+src_configure() {
+	econf \
+		--enable-deprecated-symbols \
+		$(use debug && echo --enable-build-mode=debug || echo --enable-build-mode=production) \
+		$(use_enable debug codestack) \
+		$(use_enable cxx) \
+		$(use_enable fortran) \
+		$(use_enable hl) \
+		$(use_enable mpi parallel) \
+		$(use_enable threads threadsafe) \
+		$(use_with szip szlib) \
+		$(use_with threads pthread) \
+		$(use_with zlib)
+}
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 3a3308ac31be..ae44d6154309 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,4 +1,8 @@
 AUX libflatarray.patch 528 BLAKE2B 474cde0e9871454c042587c282d9439cace5ffacc91f171dd4c77ea4c6298c9e863fb3a6267d2a97222255f396f7689a98e28e57ea47f063e2e01159d77dd8c7 SHA512 e3b195723999285fa14702e01497485f55e8523883951db16eb883220cb636d3f20f3df776b1a0dff70da221dfd7483a032e08b2996e94fd642fa175f69cc627
+AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
+AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
 DIST libgeodecomp-0.3.1.tar.bz2 740341 BLAKE2B f08f4a7e1b8666d20e40a21d494dbd1cf54b38bae90f451a1b239038e313ae692d39e81d2182cd018d85a4dfc298394c74da2d36218d379e226807feb9ff2cc3 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0
+DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
 EBUILD libgeodecomp-0.3.1.ebuild 1149 BLAKE2B a4f53fc01e70fc062f33b3e5977d002a24976c03501bde84cf7d18392cbdfe1c834c32f1f250fae70e3c37983bcdf3335133831e48cb3f36fdce27a9968e4c7d SHA512 25bc38e283677b494026427ef3aacf8b30b0092294fbab5536d5fae383398f2287d7fcd22b580af09f8c696ba5f90472d50bf29e7098ba19e27a1437361a82ae
-MISC metadata.xml 219 BLAKE2B 7897f49c5b7e807a5e1afe99c3a3335de47d1713e53f9f099d48d8a318655ae3547a562e3b6a74bd92e49b6bd9aae104d41c7cea808c95085dbea379b0a50156 SHA512 b6db740071cb706a6dd7ce9e21ec09a11c9d63752f87e700a5cb58fc100befdfc3c6b16b3065e8a8cb9a8cd3bcae6bd162f3bcd3dfcc592e27b5f738adc71007
+EBUILD libgeodecomp-0.4.0.ebuild 1433 BLAKE2B b01b43bb080a42db99cb4f9a7d5b40cd7c398cded3f70c042c56893ff004ee5cec9e21e3247ca663a2a2e103c5a0850349c5ec6ea501d43da0c70ae136f3910b SHA512 26eebc9213e4b09c5b8708fbf2965a6e7215b65a455f54f07e97f1a088374082c14d7dcb09456821236b03bb1307185f2ac3502771aae5458944c51b10a4c407
+MISC metadata.xml 1252 BLAKE2B 1c35e4efb788c48e23b62025853472afeedfe1f860797cf22e79877e8bab3170998bb1e064ff05a36bf8ddbb6e70b40da329cf9be7ab929a7cb6a9aca2b51c04 SHA512 e8c259afc51b594f4d167128555c7c0ef6935eab46e43ee92407ed32183815cd5e3588a3b0cb0230d757dfa9ca0ddb1f36ef4887b9c31f27ee57e668413f1026
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
new file mode 100644
index 000000000000..39da128feff8
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
@@ -0,0 +1,19 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0666f1d..673017f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -509,11 +509,12 @@ endif()
+ target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES})
+ 
+ #============= 10. INSTALLER CONFIG ==================================
++include(GNUInstallDirs)
+ install(
+   TARGETS geodecomp
+   EXPORT ${PACKAGE_NAME}-targets
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME})
+ install(FILES libgeodecomp.h DESTINATION include)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
new file mode 100644
index 000000000000..774293f34c4a
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
@@ -0,0 +1,163 @@
+diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
+index 9f22b8d..0755470 100644
+--- a/CMakeModules/FindSCOTCH.cmake
++++ b/CMakeModules/FindSCOTCH.cmake
+@@ -232,81 +232,83 @@ int main() {
+ ")
+ 
+     message(STATUS "Performing test SCOTCH_TEST_RUNS")
+-    try_run(
+-      SCOTCH_TEST_LIB_EXITCODE
+-      SCOTCH_TEST_LIB_COMPILED
+-      ${CMAKE_CURRENT_BINARY_DIR}
+-      ${SCOTCH_TEST_LIB_CPP}
+-      CMAKE_FLAGS
+-        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+-        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+-      COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
+-      RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
+-      )
+-
+-    if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
+-      message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
+-      set(SCOTCH_TEST_RUNS TRUE)
+-    else()
+-      message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
+-      if (SCOTCH_DEBUG)
+-        # Output some variables
+-        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                       "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
+-        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                       "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
+-        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                       "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+-        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                       "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+-      endif()
+-    endif()
+-
+-    # If program does not run, try adding zlib library and test again
+-    if(NOT SCOTCH_TEST_RUNS)
+-      if (NOT ZLIB_FOUND)
+-        find_package(ZLIB)
+-      endif()
+-
+-      if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
+-        set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
+-        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
+-
+-        message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
+-        try_run(
+-          SCOTCH_ZLIB_TEST_LIB_EXITCODE
+-          SCOTCH_ZLIB_TEST_LIB_COMPILED
+-          ${CMAKE_CURRENT_BINARY_DIR}
+-          ${SCOTCH_TEST_LIB_CPP}
+-          CMAKE_FLAGS
+-                  "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+-                  "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+-          COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
+-          RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
+-          )
+-
+-        # Add zlib flags if required and set test run to 'true'
+-        if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
+-          message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
+-          set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+-          set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
+-          set(SCOTCH_TEST_RUNS TRUE)
+-        else()
+-          message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
+-          if (SCOTCH_DEBUG)
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+-          endif()
+-        endif()
+-
+-      endif()
+-    endif()
++    set(SCOTCH_TEST_RUNS FALSE)
++    message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
++    # try_run(
++    #   SCOTCH_TEST_LIB_EXITCODE
++    #   SCOTCH_TEST_LIB_COMPILED
++    #   ${CMAKE_CURRENT_BINARY_DIR}
++    #   ${SCOTCH_TEST_LIB_CPP}
++    #   CMAKE_FLAGS
++    #     "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++    #     "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++    #   COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
++    #   RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
++    #   )
++
++    # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
++    #   message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
++    #   set(SCOTCH_TEST_RUNS TRUE)
++    # else()
++    #   message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
++    #   if (SCOTCH_DEBUG)
++    #     # Output some variables
++    #     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                    "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
++    #     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                    "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
++    #     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                    "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++    #     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                    "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++    #   endif()
++    # endif()
++
++    # # If program does not run, try adding zlib library and test again
++    # if(NOT SCOTCH_TEST_RUNS)
++    #   if (NOT ZLIB_FOUND)
++    #     find_package(ZLIB)
++    #   endif()
++
++    #   if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
++    #     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
++    #     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
++
++    #     message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
++    #     try_run(
++    #       SCOTCH_ZLIB_TEST_LIB_EXITCODE
++    #       SCOTCH_ZLIB_TEST_LIB_COMPILED
++    #       ${CMAKE_CURRENT_BINARY_DIR}
++    #       ${SCOTCH_TEST_LIB_CPP}
++    #       CMAKE_FLAGS
++    #               "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++    #               "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++    #       COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
++    #       RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
++    #       )
++
++    #     # Add zlib flags if required and set test run to 'true'
++    #     if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
++    #       message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
++    #       set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
++    #       set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
++    #       set(SCOTCH_TEST_RUNS TRUE)
++    #     else()
++    #       message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
++    #       if (SCOTCH_DEBUG)
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++    #       endif()
++    #     endif()
++
++    #   endif()
++    # endif()
+   endif()
+ endif()
+ 
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
new file mode 100644
index 000000000000..98fd350e079c
--- /dev/null
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils cuda
+
+DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
+HOMEPAGE="http://www.libgeodecomp.org"
+SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mpi cuda opencl opencv silo hpx visit"
+
+RDEPEND=">=dev-libs/boost-1.48"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		app-text/texlive
+		media-gfx/graphviz
+		)
+	mpi? ( virtual/mpi )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	opencl? ( virtual/opencl )
+	opencv? ( media-libs/opencv )
+	silo? ( sci-libs/silo )
+	hpx? ( sys-cluster/hpx )
+	visit? ( sci-visualization/visit )"
+
+S="${WORKDIR}/${P}"
+PATCHES=( "${FILESDIR}/${P}-scotch.patch" "${FILESDIR}/${P}-libdir.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MPI=$(usex mpi)
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCV=$(usex opencv)
+		-DWITH_SILO=$(usex silo)
+		-DWITH_SCOTCH=false
+		-DWITH_HPX=$(usex hpx)
+		-DWITH_VISIT=$(usex visit)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	DOCS=( README )
+	use doc && HTML_DOCS=( doc/html/* )
+	cmake-utils_src_install
+}
+
+src_test() {
+	cmake-utils_src_make check
+}
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 9c43c5cbc14e..a3c9cd3cd67d 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -4,4 +4,34 @@
   <maintainer type="person">
     <email>slis@gentoo.org</email>
   </maintainer>
+  <longdescription>
+    LibGeoDecomp (Library for Geometric Decomposition codes) is an
+    auto-parallelizing library for computer simulations. It is specifically
+    targeted computational science applications in the context of supercomputers
+    and heterogeneous systems. The library eases development of such tightly
+    coupled codes by essentially taking over the parallel programming: it
+    handles both, the parallelization itself and parameter tuning. This enables
+    scientists to focus on their simulation code, rather than the technical
+    details of the parallel computer.
+  </longdescription>
+  <use>
+    <flag name="cuda">
+      Enables plugins for NVIDIA GPUs
+    </flag>
+    <flag name="opencl">
+      Enables OpenCL backend
+    </flag>
+    <flag name="opencv">
+      Enables OpenCV related code
+    </flag>
+    <flag name="silo">
+      Enables SILO related code
+    </flag>
+    <flag name="hpx">
+      Enables HPX backend
+    </flag>
+    <flag name="visit">
+      Enables VisIt related code
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 67cbe1f0ef13..8b8f02c46531 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,13 +1,7 @@
-AUX libsigrokdecode-0.3.0-configure-test.patch 859 BLAKE2B a66a6c7023b961b4b6d17f8a15ca4ac4d525d94744cdea0e2d6ebc90ff65f3e08721baac23f4714de3ed5376121d8760c72fc3ef4e51dff94d6a28c549c357ab SHA512 466f21110fa3a8dec268f0b28520fea3497fa36fa7e8a93b98ac9dc8d36ac2172f847a02814625fb2a24740c19dee4ffc06e889727a0385d2a848a72552819ae
-AUX libsigrokdecode-0.3.0-no-check-linkage.patch 1002 BLAKE2B 0af12fda705aa507ddbcb1f7133f2e1d90dd0214c35ef9875843ae843c56693d90e027fa975892beaca8ec1079c29f3eb51c8092870c02878af5cec653aa5c65 SHA512 580b3f635fd050341c5c12ce6c5e2266f50543920fd70008b8f4c52077ecce0dfe6bd19134c8deea4ca6b24eaf0d177e44e96290c015ba6bf74fdd7bd578c74c
-DIST libsigrokdecode-0.3.0.tar.gz 607691 BLAKE2B d61f647ccfba0b47f20d57ec04d5e0c58d7e0b0cfb8c02eecfa4b8cb7e53715bbda0ebd1f7fe967b504fd74312c5f7043de0ba9ae645b214fc8f17826dff41b6 SHA512 d943091bdb1b20b11191f7a93ec8a305ba702e732247d7fbfd61fd9ae9fc4d61556bdec987c07bed11ddc20d3ab85ff8118ddc75161ebd9d9d1abe8cfc48ac19
-DIST libsigrokdecode-0.4.0.tar.gz 694223 BLAKE2B bf1cc0f78086b64ce029b794c3c90606a283606f5f2bfa51518f5c47175b814755247f61d7a630c3be690eb517c8775ed384a7cfa6d7e4a4026b12d56131e071 SHA512 54e8a3defb5f8b0cfc354e42a8c997d7515b70f40f0c069adf9ec0cc022835c5e77708e33588099878b5793f6a9acbb7e438f807ce6dabcaeca2fa17d208009b
 DIST libsigrokdecode-0.4.1.tar.gz 751546 BLAKE2B b1625714a75e481d94956bd64af264c87b440c0a236f19ff02d18cc16964b701de8799a81943f4e9ec1181b1906c5e62deca98fbbbc30dfbdf8bff2208f86bc6 SHA512 b072001190e80a194986524fd4de4d32f4559d618b151a3dbfa2c63b292c8a490535cb7479cfa665c4e8d3798251a5d6f5ecfa456ca669237237ffced3e88272
 DIST libsigrokdecode-0.5.0.tar.gz 790399 BLAKE2B a9d57ddfa72b96937a8ebb2f5009ab06d73a040778163fd24bc29d9379061aa7d9837277bc460ebaea65d266e4c53659c1e84e078b2fbffc7414925237b11058 SHA512 79d497f6c20efcffdf840b6f4a437b29e68fa49b9c6e73f66e5e2429d58033b83272a602289dd46ffe9f1115c36f2ad8c7d40e43f58494b027890bebcfe080a5
 DIST libsigrokdecode-0.5.1.tar.gz 813809 BLAKE2B 6850d6a543917989e277ed93335005c9d802a33f7f3c1f5a5883d060b0063da797ae271847fc63b70b7dc2149926bd8e2a6387e5d488830096bc1924ca1f2205 SHA512 bda14475317863c06615f578f9d26e267da83f7d9fdd7cd24f4e1f23344694763fb78b3b77acfa83eafc792ecd8f4554a9bbdd24fa42bee760426df4a428be7a
 DIST libsigrokdecode-0.5.2.tar.gz 852133 BLAKE2B 7a73c3766582d6fd33e597ca286b0125ece3e5e9f5f3b70dcd79dd42693b9688df674dd5d1876ddef798a5b3aee97f47df4d40b52c5a24b9b8c09a347cda96ad SHA512 49d0cba3a5fe17593165c3669dc8530e4e68497369b461f39b63c903f41a3060766c23d44c4112c9b9a5e740ae1e2c03a735494ac798dc631f3913079be04e22
-EBUILD libsigrokdecode-0.3.0.ebuild 1146 BLAKE2B 903c06444799299c6115b8650cbc8f80c0eeaaea55884afde9212c0271fbebf229204f2c4945e93f4cb45c96d5194d883adfde8482fd34feba7b987d1ffe3d6e SHA512 b991b1a35c272e7599604090f639bbc6e73adac82aafbd3b2b2a83e9ce9ab7de95c466123c44292f5a57722a078156fe7a0f0448d5538b79b7bf161f7b2d1f72
-EBUILD libsigrokdecode-0.4.0.ebuild 1064 BLAKE2B 898c2fee7c0d0c7a39e7ce25bbbce8d4060b76a9c2e3627c7a6b4f169442c0918c3d19c44b9204e92570dc1c993d3d51c233e1de79dc519a81e979fc678b57be SHA512 d7b1ae790e1d5d92c8db3a9caef5ba488ff8fc0efc32eaf8942a6a1e2a59a9e161ed6cff5119faf4e58b14873760c46e6888216e367a895ffa70d4178c5784e4
 EBUILD libsigrokdecode-0.4.1.ebuild 1070 BLAKE2B e057628b15f227858b25f4722d684dc66ea30e2d003d74b3d3034ed74f142baa49380c486cd48e3b580a3a9438f8fcf36c236ec40d33f77006ef7c9f1a7d43c4 SHA512 e2761ca53895c5384fc8d306ad2225a6d2a2ec28872016577d9a704df6175e982940dd259d14d21644b91cc43ebf63aee23f9d6e0b0b0442fb05cd83cb50014a
 EBUILD libsigrokdecode-0.5.0.ebuild 1070 BLAKE2B 765f93807990b87833264d1db1a37b7ef59f9093e55be30df3b562dcfa4958a278f0c1468e0ec16660b023eae9d89b54bbb5333704f0be7f2849fcdf0af5128e SHA512 8a299bcfbd66c1c11a50ac1cca8abe94ab4101915cb59942eae9cf1c79fcee73071cb7ab6b3b939821d3e28390c7609a101974cf76257d66f7d4c7d82b91a01e
 EBUILD libsigrokdecode-0.5.1.ebuild 1070 BLAKE2B cf752fbebc51fe06af6b350383a98daa1c1e30ed90fb32763c74f70d212b2ef27f2555d8e6010799238a181768776890e58473cc292f7840043aa77b0b84c995 SHA512 f0a6433678ebdc41da1715593d62b84ef2071bbc3559c61a11a1498ea46855c779ec278e40e64a19f9feb93dd31eae3b4c07e171e6b38b7a05107a2c49711cbd
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch
deleted file mode 100644
index 8c3b40206040..000000000000
--- a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://sourceforge.net/p/sigrok/mailman/message/32459769/
-
-From dc83770847c39934f5cbc63c8652124fafcb8d0b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Jun 2014 01:37:12 -0400
-Subject: [PATCH 1/2] fix test operator
-
-The == operator is not in POSIX.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9527379..3f661ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -125,7 +125,7 @@ AC_SUBST(MODNAME_PYTHON)
- # We also need to find the name of the python3 executable (for 'make install').
- # Some OSes call this python3, some call it python3.2, etc. etc.
- AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
--if test "x$PYTHON3" == "x"; then
-+if test "x$PYTHON3" = "x"; then
- 	AC_MSG_ERROR([cannot find python3 executable.])
- fi
- 
--- 
-2.0.0
-
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch
deleted file mode 100644
index a749a0bb64d8..000000000000
--- a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://sourceforge.net/p/sigrok/mailman/message/32459770/
-
-From 27ecf0c85482786f7617571c690797ab3f07f795 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Jun 2014 01:38:58 -0400
-Subject: [PATCH 2/2] do not add check to common cflags/libs
-
-Only the unittests use these flags, so don't go linking them in for
-the main library too.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3f661ec..10213a7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,8 +134,7 @@ AC_SEARCH_LIBS([pow], [m])
- 
- # The Check unit testing framework is optional. Disable if not found.
- PKG_CHECK_MODULES([check], [check >= 0.9.4],
--	[have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
--	LIBS="$LIBS $check_LIBS"], [have_check="no"])
-+	[have_check="yes"], [have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- 
- # libsigrok is optional (only used for the protocol decoder test framework).
--- 
-2.0.0
-
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild
deleted file mode 100644
index 4fea25b910d5..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_4 )
-inherit eutils python-single-r1 autotools
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/2"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.24.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.0-configure-test.patch
-	epatch "${FILESDIR}"/${PN}-0.3.0-no-check-linkage.patch
-	eautoreconf
-
-	# Only a test program (not installed, and not used by src_test)
-	# is used by libsigrok, so disable it to avoid the compile.
-	sed -i \
-		-e '/build_runtc=/s:yes:no:' \
-		configure || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild
deleted file mode 100644
index 23e0d8ba6904..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit eutils python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.28.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-
-	# Only a test program (not installed, and not used by src_test)
-	# is used by libsigrok, so disable it to avoid the compile.
-	sed -i \
-		-e '/build_runtc=/s:yes:no:' \
-		configure || die
-
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 1ca67369b4f8..f23f90ab480f 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,4 +1,6 @@
 AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 4250 BLAKE2B 79702d82e629e2159cbe33efe8dd91536d904536f4bbf3d4ad02186916a09786cde6ce29a63acaafe3169dbd7904448461f2b557f33218651351fd87d42ed613 SHA512 42bb57433f61b3a9b1a93c897202bacdf44a8277ea0e64257ac3b60c9b964a6441345c9b222fb26afb1d66a53323fe38c29811adfd6354032cb5d3f85dde0816
+DIST tensorflow-estimator-1.13.0.tar.gz 530871 BLAKE2B 4f208ed20e10fa68e06d21c9865cd07623e14362bdcff456bc9b412431c8f12f289c8a8f8ad89cb1f0ec98b1432844632d7e1097ea29d40bf6f67b90b4968f93 SHA512 e4be92b805776d2be5f391f737f1043b994f42721173c4d4a7dbf3fac9b00121cb072091a474bf71c7dcd952fc8b330cf9254c7a5ad9d096ba1cdc12ba12078b
 DIST tensorflow-estimator-1.13.0_rc0.tar.gz 531012 BLAKE2B 1398fdec5b81a7bab7ccfb2d37b8094c4ef4b96562e2c6b8b4e565cad3c234245b5d8dfb30a79b73302fc0764b1d3503d4ee2d4363a9d2e635b36fb8e2b726b4 SHA512 c8ad78d0df294c7471f1577880905be08edcc038878e9d197b975f33f91192e9c413d13fa70e8fa1ff760ad6bf6141f199322bf2076568690e75fa38bd5a4cf4
+EBUILD tensorflow-estimator-1.13.0.ebuild 1333 BLAKE2B 0087323052bd5de42be018b255f21d50c499a18aba79a8540e6490cd1a9173be9a08b257cfd2da2b0378c274331b9a51f9048891688f0115a300a997279e1c55 SHA512 7c10982a4f1f1a7943c2497f3831f5825836a8589bc74c52665e0862d386a73e71039c474ee1f78f4505b9c5af4bd72ef34f73bc5b58c758f04beef19be691c8
 EBUILD tensorflow-estimator-1.13.0_rc0.ebuild 1329 BLAKE2B ed4451574acbc5067715148a5a365017d3b4b42a99aece10be94d6b3d1683f3d0cc758ff6dc89c7c4b1d9ac1974969b9ab3f320d6434014f16ef1d405d137dc1 SHA512 5db769ca08138e3fe4a696708049b96eb442c2e2484b737f821eff5da89575d671a57c156fc583819f345d53e4a800503df3517355d76cd4440af2ac6410ae61
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild
new file mode 100644
index 000000000000..a5aede9bca28
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Jason Zaman
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch"
+)
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index f231acbcc812..1bfa0ae28d63 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -34,6 +34,7 @@ DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab
 DIST tensorflow-1.12.0.tar.gz 26341737 BLAKE2B 6b9e21a9367ec7454916af327ae21fc6c46e54885f30823784985a61193654fd1942cbd3b5688f55cbd63f890417eac812d0cdb576d0f0b8677df92c259837c0 SHA512 b145a9118856aa00a829ab6af89bff4e1e131371c96d77b07532544112803c4574d97ef224b28a64437a2af8db4286786dc0b4123efe110b2aa734b443a7e238
 DIST tensorflow-1.13.0_rc0.tar.gz 31616223 BLAKE2B b4cb76cdb0e79639e8a1282835101d8a5e23a0e9d659dfbc01d8395528d05c434d0cc93df010086acbc338590d8ced3d95b4b00d6e1a7ebbe8d1df1f87265114 SHA512 0d8f88a8882ae1f69eee82fd54a836b3a0629c6a274af8ef329421445aeb446b651b90285c3ea19cb768860fd759e715dea481d5a07ec722ebd34323331e61dd
 DIST tensorflow-1.13.0_rc2.tar.gz 31616906 BLAKE2B 94e6ba8a56cad25e1c90950c75129d77bd6351dcd4e87721efb41cd560835ca7212d1f1a932c54c2f328756f92afe1fe299c48e9b520aea74bbb3b0928b0c356 SHA512 a0b5c961f56530cf5245d4f2f0d51642829dd348b811315eff533dae9f77d38e99f03ec0d61c40a20237758916a7173f4baf99a474717c1aefc111614f9171e0
+DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
 DIST tensorflow-patches-1.10.0.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b
 DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80
 DIST tensorflow-patches-1.12.0.tar.bz2 10638 BLAKE2B fc2c30f6b425390f5791df8ec409165aa4cc242eb93885845cc34e8302f781b267efaebf9e996f0cbc7558d975d742fb2e5509df9f06d85a370ea73795f92c49 SHA512 2b734e206eda58c898ad7090b3fe371b08c06dcb52d07fc0991548cec7e45c2500e797dd7b98b8a3a4416b85c8886314bd75921d0cd6d942a7cd15688954dd5d
@@ -44,4 +45,5 @@ EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368b
 EBUILD tensorflow-1.12.0.ebuild 9185 BLAKE2B a2a7089074ea57d13667c205623b512aa95223c9aec0108080aa26b5cba94ce327d38710e84b60e8727a92c450ccac545d230954f3dc93a5d43bf15ab007f944 SHA512 2fea55fdb5df02ef984423ec6b1f1c9708a61edc60e282c6ac704bd296cb8eb78d124988bc30ccb598fcff3c22ab8d1103c1834b8983ba8f6a5b5c75139375c1
 EBUILD tensorflow-1.13.0_rc0.ebuild 9477 BLAKE2B 0b03827922faed2c7df018dc0e20ecaa19aa06d4068a7dbe1595e62a1eaf1c31a6e9ec24587cdab0bf2bb669d2fdd30dad5ace9602e39f6d3e25702df234faca SHA512 493c62b3b31a78e22171b60e936b9c6ff965e74c2c834b1c6f6b22a492cd993db910f1f1537b438f09bbf8f784291a2551eb142656d51813957335f33e05efbe
 EBUILD tensorflow-1.13.0_rc2.ebuild 9474 BLAKE2B 69c319821d5dc45b033380e03e199f0212ccf6438d2bb1ff8cf058c7551916a8764e49b04bf6c4012d002d20df78784d8944e242b28c9383c124979628e322d1 SHA512 5b7733ddfd2bd0bb0210cf075b2fe83286c79154081f57f7653dc7539d95dafc9b13da29a78b4d9763de2c5995b0b5e0e01d3e872bfb342047f52a18b847b13a
-MISC metadata.xml 641 BLAKE2B 6e87fea81b3a1cdbd96bc190a2b39509549a6c3fe384597c394e142e20f0005329df309edf03d7c304e8adb62876a33c8d0c54161e5fb09fbda1df7e9d774fe3 SHA512 42fe38c07d34999da7cf47b780e69b4fa65245763761a915bd35af3d4441f583f477fd84952680d736be8514a049f49ab1dad9a7d4a6963baff00f94f5efa308
+EBUILD tensorflow-1.13.1.ebuild 9980 BLAKE2B 5d0918f56fa7b1697f5c333f917cc359c994c0e36fbdd17fcd303bfed55536293efe2a11aba2e75d119acc76d8794e02ecc0973029567841cb17eb3508d1be1e SHA512 d4340676161f9cbd3a831ba261163be8a9c259d247f25755392b25a7e6d18864f468771c71e65e5deab538b703eee0c48d6d0f339eb099b9d9cf2e99f4ecd597
+MISC metadata.xml 592 BLAKE2B 2b9961e757a7ab3dc931c5ae120f4708b3d82adf6b408f899b79d902d7b078c8333991582905d2962fc650be6315fd1cfb95ac43cfaa73ebc5e97735c1a089ce SHA512 a5196ae7569fab5bf2a43a29ce7c350d4abcfd51338acf28179cd1b341fdc8eb98f48c832618d07c046e28b68e72c3128e597eeb7100737ec842cdb80a624e4e
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index 1dca7af5e0f3..fd7eed034544 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -10,7 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
-		<flag name="mpi">Enable support for MPI</flag>
 		<flag name="system-libs">Link with system instead of bundled libraries</flag>
 	</use>
 	<upstream>
diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
new file mode 100644
index 000000000000..22f3f9300fad
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2019 Jason Zaman
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic 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 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://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/9f48e814419e.tar.gz -> eigen-9f48e814419e.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz -> abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
+	https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz -> rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.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/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		${bazel_external_uris}"
+
+# cuda-10.1 / cudnn 7.5 is not supported yet
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.8.4
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=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.16.0
+	net-misc/curl
+	sys-libs/zlib
+	cuda? (
+		|| (
+			( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
+			( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
+			( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
+		)
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/google-pasta[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		net-libs/google-cloud-cpp
+		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/grpcio-tools
+	)"
+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"
+
+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[*]}"
+}
+
+pkg_setup() {
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls(){
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 5 G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=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="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_NCCL_VERSION="1"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_google_protobuf
+			com_google_protobuf_cc
+			com_googlesource_code_re2
+			curl
+			cython
+			flatbuffers
+			gast_archive
+			gif_archive
+			grpc
+			icu
+			jpeg
+			jsoncpp_git
+			keras_applications_archive
+			lmdb
+			nasm
+			nsync
+			org_sqlite
+			pcre
+			png_archive
+			protobuf_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			zlib_archive
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	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
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${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 "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/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
+}