gentoo resync : 16.06.2018

21 files changed, 551 insertions, 591 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c50a79ac465b..1cdae4f39ab8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 5e20b564af2f..09b48ca5d087 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,3 @@
-AUX cxsparse-2.2.1-autotools.patch 5606 BLAKE2B a313f8cc54f5b97c34ee1c6ca70b1e8dc3af04a5e8cf7982a2da24d4276c4e909dc1e12bdff08da6361cbb105fb5feeb3faf396ab9a6c3ecd84aa7acd405df43 SHA512 463feef6919f421a27ce43588bfb439a0efd8abc8b51cdc7db36b16f4c858ef396dbbff302b51af73d33ece8f0668acb1aae2de543d25d749cf0125cf8328f7a
 AUX cxsparse-2.2.2-autotools.patch 5606 BLAKE2B 2736f9aa6033d1c4a81a34462afdd9ff1f3df41c463da865d22bb0ef29c98839c192a62fbbe96932976614c076806ae6984deb1d9eb7475812df27c80b94c226 SHA512 f11831810dca8b870cfe468f14942be84fa7e0b2975c5f7c677dee52b72aebe81d827e3bfa0f48fe005b20894c8bc99ea596849c6e87d01eaa4b29dda372e4fa
 DIST CXSparse-2.2.6.tar.gz 1987681 BLAKE2B a778a2d91a98d3764940155eff1cfd3397333a02becef2f2c3c85dc45a58e83597b2e5680ef7cbac4c8d6b8af0a9966d0402154c6c0bee79c67b7697f1af2c19 SHA512 a049349e1a389f03e918e3d0b7e76f79ee2647229a4935378caa0aa3bf3beb8cff649e5e37263f6f839d90a32e6929fd5a7f9193e787cab02cea7b2eb64dd5ac
 DIST cxsparse-3.1.1.tar.gz 667306 BLAKE2B d8c960b37cacd042286691a4e4d4144f4abc5c8f25345e6d7ceb25785361a36b7b9244cc7c53211a753614cf54d61462895a0a4b8f8bf4af61faf6d0132cc30a SHA512 a36cf3a124baa74fb742c563dc6accfaf320a35f899cd2a684813ef22df4557af2d2b3489272496a370e85cea3a350293043071bb66830305fe3bf925865b424
diff --git a/sci-libs/cxsparse/files/cxsparse-2.2.1-autotools.patch b/sci-libs/cxsparse/files/cxsparse-2.2.1-autotools.patch
deleted file mode 100644
index 26957d801f13..000000000000
--- a/sci-libs/cxsparse/files/cxsparse-2.2.1-autotools.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2008-01-29 19:09:42.000000000 +0000
-@@ -0,0 +1,3 @@
-+SUBDIRS = Demo Source
-+EXTRA_DIST = README.txt
-+include_HEADERS = Include/cs.h
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2008-01-29 19:14:14.000000000 +0000
-@@ -0,0 +1,11 @@
-+#                                               -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(cxsparse, 2.2.1, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_HEADERS(UFconfig.h)     
-+AC_CONFIG_FILES([Makefile Demo/Makefile Source/Makefile])
-+AC_OUTPUT
-+
---- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Source/Makefile.am	2008-01-29 19:09:42.000000000 +0000
-@@ -0,0 +1,24 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \
-+        cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \
-+        cs_etree.c cs_fkeep.c cs_gaxpy.c cs_happly.c cs_house.c cs_ipvec.c \
-+        cs_lsolve.c cs_ltsolve.c cs_lu.c cs_lusol.c cs_util.c cs_multiply.c \
-+        cs_permute.c cs_pinv.c cs_post.c cs_pvec.c cs_qr.c cs_qrsol.c \
-+        cs_scatter.c cs_schol.c cs_sqr.c cs_symperm.c cs_tdfs.c cs_malloc.c \
-+        cs_transpose.c cs_compress.c cs_usolve.c cs_utsolve.c cs_scc.c \
-+        cs_maxtrans.c cs_dmperm.c cs_updown.c cs_print.c cs_norm.c cs_load.c \
-+        cs_dfs.c cs_reach.c cs_spsolve.c cs_leaf.c cs_ereach.c cs_randperm.c
-+
-+lib_LTLIBRARIES = libcxsparse.la
-+noinst_LTLIBRARIES = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
-+
-+libcxsparse_di_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_dl_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_dl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_LONG
-+libcxsparse_ci_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_ci_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_COMPLEX
-+libcxsparse_cl_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_cl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_LONG -DCS_COMPLEX
-+
-+libcxsparse_la_SOURCES = cs_convert.c
-+libcxsparse_la_LIBADD = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
---- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Demo/Makefile.am	2008-01-29 19:21:32.000000000 +0000
-@@ -0,0 +1,102 @@
-+check_PROGRAMS = \
-+  cs_ci_demo1 \
-+  cs_ci_demo2 \
-+  cs_ci_demo3 \
-+  cs_cl_demo1 \
-+  cs_cl_demo2 \
-+  cs_cl_demo3 \
-+  cs_demo1 \
-+  cs_demo2 \
-+  cs_demo3 \
-+  cs_di_demo1 \
-+  cs_di_demo2 \
-+  cs_di_demo3 \
-+  cs_dl_demo1 \
-+  cs_dl_demo2 \
-+  cs_dl_demo3 \
-+  cs_idemo \
-+  cs_ldemo
-+
-+LDADD = $(top_builddir)/Source/libcxsparse.la -lm 
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+cs_ci_demo1_SOURCES = cs_ci_demo1.c
-+cs_ci_demo2_SOURCES = cs_ci_demo2.c cs_ci_demo.c
-+cs_ci_demo3_SOURCES = cs_ci_demo3.c cs_ci_demo.c
-+cs_cl_demo1_SOURCES = cs_cl_demo1.c
-+cs_cl_demo2_SOURCES = cs_cl_demo2.c cs_cl_demo.c
-+cs_cl_demo3_SOURCES = cs_cl_demo3.c cs_cl_demo.c
-+cs_demo1_SOURCES = cs_demo1.c
-+cs_demo2_SOURCES = cs_demo2.c cs_demo.c
-+cs_demo3_SOURCES = cs_demo3.c cs_demo.c
-+cs_di_demo1_SOURCES = cs_di_demo1.c
-+cs_di_demo2_SOURCES = cs_di_demo2.c cs_di_demo.c
-+cs_di_demo3_SOURCES = cs_di_demo3.c cs_di_demo.c
-+cs_dl_demo1_SOURCES = cs_dl_demo1.c
-+cs_dl_demo2_SOURCES = cs_dl_demo2.c cs_dl_demo.c
-+cs_dl_demo3_SOURCES = cs_dl_demo3.c cs_dl_demo.c
-+cs_idemo_SOURCES = cs_idemo.c
-+cs_ldemo_SOURCES = cs_ldemo.c
-+
-+check-local: $(check_PROGRAMS)
-+	- ./cs_demo1 < ../Matrix/t1
-+	- ./cs_demo2 < ../Matrix/t1
-+	- ./cs_demo2 < ../Matrix/fs_183_1
-+	- ./cs_demo2 < ../Matrix/west0067
-+	- ./cs_demo2 < ../Matrix/lp_afiro
-+	- ./cs_demo2 < ../Matrix/ash219
-+	- ./cs_demo2 < ../Matrix/mbeacxc
-+	- ./cs_demo2 < ../Matrix/bcsstk01
-+	- ./cs_demo3 < ../Matrix/bcsstk01
-+	- ./cs_demo2 < ../Matrix/bcsstk16
-+	- ./cs_demo3 < ../Matrix/bcsstk16
-+	- ./cs_di_demo1 < ../Matrix/t1
-+	- ./cs_di_demo2 < ../Matrix/t1
-+	- ./cs_di_demo2 < ../Matrix/fs_183_1
-+	- ./cs_di_demo2 < ../Matrix/west0067
-+	- ./cs_di_demo2 < ../Matrix/lp_afiro
-+	- ./cs_di_demo2 < ../Matrix/ash219
-+	- ./cs_di_demo2 < ../Matrix/mbeacxc
-+	- ./cs_di_demo2 < ../Matrix/bcsstk01
-+	- ./cs_di_demo3 < ../Matrix/bcsstk01
-+	- ./cs_di_demo2 < ../Matrix/bcsstk16
-+	- ./cs_di_demo3 < ../Matrix/bcsstk16
-+	- ./cs_dl_demo1 < ../Matrix/t1
-+	- ./cs_dl_demo2 < ../Matrix/t1
-+	- ./cs_dl_demo2 < ../Matrix/fs_183_1
-+	- ./cs_dl_demo2 < ../Matrix/west0067
-+	- ./cs_dl_demo2 < ../Matrix/lp_afiro
-+	- ./cs_dl_demo2 < ../Matrix/ash219
-+	- ./cs_dl_demo2 < ../Matrix/mbeacxc
-+	- ./cs_dl_demo2 < ../Matrix/bcsstk01
-+	- ./cs_dl_demo3 < ../Matrix/bcsstk01
-+	- ./cs_dl_demo2 < ../Matrix/bcsstk16
-+	- ./cs_dl_demo3 < ../Matrix/bcsstk16
-+	- ./cs_ci_demo1 < ../Matrix/t2
-+	- ./cs_ci_demo2 < ../Matrix/t2
-+	- ./cs_ci_demo2 < ../Matrix/t3
-+	- ./cs_ci_demo2 < ../Matrix/t4
-+	- ./cs_ci_demo2 < ../Matrix/c_west0067
-+	- ./cs_ci_demo2 < ../Matrix/c_mbeacxc
-+	- ./cs_ci_demo2 < ../Matrix/young1c
-+	- ./cs_ci_demo2 < ../Matrix/qc324
-+	- ./cs_ci_demo2 < ../Matrix/neumann
-+	- ./cs_ci_demo2 < ../Matrix/c4
-+	- ./cs_ci_demo3 < ../Matrix/c4
-+	- ./cs_ci_demo2 < ../Matrix/mhd1280b
-+	- ./cs_ci_demo3 < ../Matrix/mhd1280b
-+	- ./cs_cl_demo1 < ../Matrix/t2
-+	- ./cs_cl_demo2 < ../Matrix/t2
-+	- ./cs_cl_demo2 < ../Matrix/t3
-+	- ./cs_cl_demo2 < ../Matrix/t4
-+	- ./cs_cl_demo2 < ../Matrix/c_west0067
-+	- ./cs_cl_demo2 < ../Matrix/c_mbeacxc
-+	- ./cs_cl_demo2 < ../Matrix/young1c
-+	- ./cs_cl_demo2 < ../Matrix/qc324
-+	- ./cs_cl_demo2 < ../Matrix/neumann
-+	- ./cs_cl_demo2 < ../Matrix/c4
-+	- ./cs_cl_demo3 < ../Matrix/c4
-+	- ./cs_cl_demo2 < ../Matrix/mhd1280b
-+	- ./cs_cl_demo3 < ../Matrix/mhd1280b
-+	- ./cs_idemo < ../Matrix/t2
-+	- ./cs_ldemo < ../Matrix/t2
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index ea3a2c7cf1d7..6fdd9de9ab33 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,9 +1,3 @@
-AUX flann-1.8.4-CUDA_NVCC_FLAGS.patch 618 BLAKE2B aeede537c8996a6850a411101895bd5fb84afd70ea98f9a8ce6ef581ac85dc381ab1e65ab6d0061a3a2e776d6bda0d5d0581379a2b1077d0785a1a3e0d20c614 SHA512 8a6e385b0b36386288861bb795fda34cc636d73862c1321fc4482855dd5032179bf3ea0016bd7c51e8d6abf0da3b70f6d22058d8fd2da414db09b2e2bb662a7b
-AUX flann-1.8.4-cuda5.5.patch 2227 BLAKE2B 383d33d3463c5be530f6ce6fdb12ac1abc44ddb3d99f1742136e4f9f9633ebccc0b8fd57d53aeecf74be70b2fd5f4e714d0bdc2f809c7a62bb67d7988f4c9f59 SHA512 628367450c5d1a45dc69817ce58e90f87602d1593244a2663703ce02967e98a1fb323ec636700bd20b9278640d89b4453330d1e08e49ebdbfffce65ab5c7ba74
-AUX flann-1.8.4-docdir.patch 571 BLAKE2B 19e6c5161290bec1b85157452884ba9c6272fe85002213023f2e07370ef639e517409496e4418d22ed748921ab9bf0d54d581ff6292bf31bbbcdef3219e67cf5 SHA512 ef2fc88ff254afebf75a75bebad5021ec5aa00077cf3ed3b31242a7e7c17ee872d3cff71064b6bd6ecaf7c284dba31032aa0d0f71ba6257e1ebd01513036978c
-AUX flann-1.8.4-examples.patch 1020 BLAKE2B b4eb466cb53aa6e4ebb2285c605685974e6d371fd4efd2a33c71c78acf427c33c326ca5c29b38a6a8e3641c1063226f18c9dcf75a6e4e5e095a9ca3555bf83af SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83
-AUX flann-1.8.4-multilib.patch 570 BLAKE2B c3f6e2a88a6d6eed16b5cafedf2ba99b51d9686e83f2f8b10ac7ed28b835965cda7ff4702d2f106585cea941ae1475eab89f1323f3c5ad8e05553203c5bece8d SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6
-AUX flann-1.8.4-options.patch 1485 BLAKE2B 2691716dfda2e931849a0852c7be75b3dbc14877950ade2a52481108d75b84aea2686f2245f7b924c0f1a20f94e3ff34372fda519c474e0bdfc961911e746ccf SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
 EBUILD flann-1.9.1.ebuild 2185 BLAKE2B d81b5cc93e470f846c915401b35d7bcdae4c8c9a14c412829035367f85c1f4c9eb690bef0002d24adf78ab655603a06c14969a95670fab826baf04f14b025d2a SHA512 d2b3ee61c1066ca047bfa5ccbad4c37402fc3f10fbe0f4be8ea75580935de055cde09ea7db2a9a51ba4da14e7f069748be8642c63b5cd074d86bffbaaf568650
 EBUILD flann-9999.ebuild 2121 BLAKE2B 336e31bc0e5ece6c63ca3c82e3b61605fbfa46e76ab111574b3d05303add959c31b2339c60768d7ab32f56e534b7cb08f08c1a29fb15279bf2d048a02d00df06 SHA512 6e3978c5c92f2723eed4615cc292aedd3be146a9afe0fc47cd1922a12fb9fb58d81d2f284f2946d96c5f4c2d235f06c0dc5929b37258ea83bf412d36a0ac1e2e
diff --git a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
deleted file mode 100644
index 1a068af28351..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/cpp/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 8e72409..a4b35b1 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
- 
- if (BUILD_CUDA_LIB)
--    SET(CUDA_NVCC_FLAGS -DFLANN_USE_CUDA)
-+    SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
-     if(CMAKE_COMPILER_IS_GNUCC)
- 		set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler;-fPIC;-arch=sm_13" )
-         if (NVCC_COMPILER_BINDIR)
diff --git a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
deleted file mode 100644
index 046b3252c36f..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- src/cpp/flann/util/cuda/result_set.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpp/flann/util/cuda/result_set.h b/src/cpp/flann/util/cuda/result_set.h
-index 9ac8111..324ca1e 100644
---- a/src/cpp/flann/util/cuda/result_set.h
-+++ b/src/cpp/flann/util/cuda/result_set.h
-@@ -54,7 +54,7 @@ struct SingleResultSet
-     DistanceType bestDist;
-     const DistanceType epsError;
- 
--    __device__
-+    __device__ __host__
-     SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ }
- 
-     __device__
-@@ -129,7 +129,7 @@ struct KnnResultSet
-     const DistanceType epsError;
- 
- 
--    __device__
-+    __device__ __host__
-     KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ }
- 
-     //          __host__ __device__
-@@ -229,7 +229,7 @@ struct CountingRadiusResultSet
-     DistanceType radius_sq_;
-     int max_neighbors_;
- 
--    __device__
-+    __device__ __host__
-     CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ }
- 
-     __device__
-@@ -279,7 +279,7 @@ struct RadiusKnnResultSet
-     //          int count_;
- 
- 
--    __device__
-+    __device__ __host__
-     RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { }
- 
-     //          __host__ __device__
-@@ -381,7 +381,7 @@ struct KnnRadiusResultSet
-     const DistanceType radius_sq;
- 
- 
--    __device__
-+    __device__ __host__
-     KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ }
- 
-     //          __host__ __device__
-@@ -484,7 +484,7 @@ struct RadiusResultSet
-     int count_;
-     bool sorted_;
- 
--    __device__
-+    __device__ __host__
-     RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ }
- 
-     __device__
diff --git a/sci-libs/flann/files/flann-1.8.4-docdir.patch b/sci-libs/flann/files/flann-1.8.4-docdir.patch
deleted file mode 100644
index 4b16684de14d..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-docdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 2d8eb24..aeac8ed 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,4 +1,8 @@
- find_package(LATEX)
-+
-+if (NOT DOCDIR)
-+  set(DOCDIR share/doc/flann)
-+endif ()
-  
- if (EXISTS ${PDFLATEX_COMPILER} AND EXISTS ${BIBTEX_COMPILER})
-     include(${PROJECT_SOURCE_DIR}/cmake/UseLATEX.cmake)
-@@ -14,6 +18,6 @@ endif()
- 
- install(
-     FILES manual.pdf
--    DESTINATION share/doc/flann
-+    DESTINATION ${DOCDIR}
-     OPTIONAL
- )
diff --git a/sci-libs/flann/files/flann-1.8.4-examples.patch b/sci-libs/flann/files/flann-1.8.4-examples.patch
deleted file mode 100644
index b3346b35f73c..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-examples.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3922081fbd6710f4b72421069f6bf24dc37d35a8 Mon Sep 17 00:00:00 2001
-From: Casey Goodlett <casey.goodlett@kitware.com>
-Date: Thu, 8 Aug 2013 18:42:45 -0400
-Subject: [PATCH] Option to disable example building
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b19367..410a8f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON)
- option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
-+option(BUILD_EXAMPLES "Build examples" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
- 
-@@ -154,7 +155,9 @@ endif()
- 
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+if (BUILD_EXAMPLES)
-+  add_subdirectory( examples )
-+endif(BUILD_EXAMPLES)
- add_subdirectory( test )
- add_subdirectory( doc )
- 
--- 
-1.8.5.1
-
diff --git a/sci-libs/flann/files/flann-1.8.4-multilib.patch b/sci-libs/flann/files/flann-1.8.4-multilib.patch
deleted file mode 100644
index 17a9d65dd778..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-multilib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- cmake/flann_utils.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
-index 1a10939..afe4742 100644
---- a/cmake/flann_utils.cmake
-+++ b/cmake/flann_utils.cmake
-@@ -1,6 +1,6 @@
- macro(GET_OS_INFO)
-     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
--    set(FLANN_LIB_INSTALL_DIR "lib")
-+    set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-     set(FLANN_INCLUDE_INSTALL_DIR
-         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
- endmacro(GET_OS_INFO)
diff --git a/sci-libs/flann/files/flann-1.8.4-options.patch b/sci-libs/flann/files/flann-1.8.4-options.patch
deleted file mode 100644
index dd212aca66a4..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- CMakeLists.txt | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 410a8f9..b6244a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,6 +54,8 @@ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
- option(BUILD_EXAMPLES "Build examples" ON)
-+option(BUILD_TESTS "Build tests" ON)
-+option(BUILD_DOC "Build documentation" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
- 
-@@ -158,8 +160,12 @@ add_subdirectory( src )
- if (BUILD_EXAMPLES)
-   add_subdirectory( examples )
- endif(BUILD_EXAMPLES)
--add_subdirectory( test )
--add_subdirectory( doc )
-+if (BUILD_TESTS)
-+  add_subdirectory( test )
-+endif (BUILD_TESTS)
-+if (BUILD_DOC)
-+  add_subdirectory( doc )
-+endif (BUILD_DOC)
- 
- 
- # CPACK options
-@@ -202,6 +208,9 @@ include(CPack)
- message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
- message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
- message(STATUS "Building C bindings: ${BUILD_C_BINDINGS}")
-+message(STATUS "Building examples: ${BUILD_EXAMPLES}")
-+message(STATUS "Building tests: ${BUILD_TESTS}")
-+message(STATUS "Building documentation: ${BUILD_DOC}")
- message(STATUS "Building python bindings: ${BUILD_PYTHON_BINDINGS}")
- message(STATUS "Building matlab bindings: ${BUILD_MATLAB_BINDINGS}")
- message(STATUS "Building CUDA library: ${BUILD_CUDA_LIB}")
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 376d00f6135b..25c95a181deb 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,4 @@
 AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
-DIST geos-3.6.1.tar.bz2 1833434 BLAKE2B 7feede989d9aacad8b72e107d988bac7746e74e1674d812a2db738f124d357cf0cb24b4040f36a0e1290086c87585f1155f5cac962bb2c8ad83d7879d7f30af7 SHA512 8b28e7706567375ca02ae5f5dbebf0870e8fed8ea430596a3637e5c975e72bc0f3c16c31b052f154042dd029c54130325a8d44de95c3458f5da024a97d3cfaf9
 DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
-EBUILD geos-3.6.1.ebuild 1326 BLAKE2B 63fec330aa117188041ac2a9653d3a05df850bdedfdc8dc22442c5be81b50d7c6ef73785de7a304d1341ec18911e7ad0a1ea940b8c23b764f49215a1d782dd70 SHA512 98a71dde912af00e31687741a6d327f3a03a69c659a02b9b98ff554dfb8c6765518ff139d40f5c890a033079410072c6a6d4ff09e8825e69f83efad2f89f80a0
-EBUILD geos-3.6.2.ebuild 1325 BLAKE2B 7f89c022ab60568a107c334e1420772ae761d72b0115cf87753f7287b913a15345c576b9724f536068e4e16b9fddbc0a4ffbf5677d76d02f231d2796d3120534 SHA512 e5a27ea6075bde252a7c9f113b77dfa816e09d9c1548d2318ed890e1059b04995b2b9e68e399c91bc01baadc2be3e2a1cbfaf118a153791cdb9385bf72c64feb
+EBUILD geos-3.6.2.ebuild 1342 BLAKE2B 2cdc55473a3c7e2f4cf45b77de88e3e359598e1b9a7f6ee33d221474853ad191c61692ed84b1648204fe71b4e8c3fec70710725a1f30f4c81c89c3607db6e51a SHA512 91f4a1f15927b151e2d7811410dfa3cf4ccee0a667751eb05f6ebdcaa12b2a8c38e0c6ce08018f22da7bb7220ac77846a5975d4dd439c230eb326718a03ea6ba
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.6.1.ebuild b/sci-libs/geos/geos-3.6.1.ebuild
deleted file mode 100644
index b6c6daaabed6..000000000000
--- a/sci-libs/geos/geos-3.6.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-"
-
-PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.6.2.ebuild b/sci-libs/geos/geos-3.6.2.ebuild
index 1c746611f0fd..a53255ec4230 100644
--- a/sci-libs/geos/geos-3.6.2.ebuild
+++ b/sci-libs/geos/geos-3.6.2.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
 
+RESTRICT="test"
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index e7f606ce9e21..8049ccfc0002 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,7 +1,9 @@
 DIST libaec-0.3.2.tar.gz 353185 BLAKE2B 7578b35f25ecf8e3e5172f1f0fcbb84a0354cf5a1cb3bfb8588d63ee6872ea8ad7e220b53ea4989dfc1741417f5f10023e91d3a3db7d2ed9e7bc1f6a4eae3509 SHA512 c3935f7d3e2e289e66f24d5af8f8fe21aab1044adbe883708ed64eb194bf93511fe2a9dd2b1658571ebbcc502123b3a5e6dfaa1bc4a1b85eaeaedc8b43d8085e
 DIST libaec-1.0.0.tar.gz 3118578 BLAKE2B f3b8ef52e636cd3a04710f75de6fac6d4ab97bbb9422a7753ec5acf98a9cfedf8dacfd13a610f6a5445312448e3490d43182753c8f82995b112de1ad3dd0f45a SHA512 112ded6151e46a90adfe230d8298452b2e42105e0e9d40ce10ac49f1e0160a13fa7ddec22e22346f0d5defc397bbba7c12f9d58b08e024da19991108e6e8d8ba
 DIST libaec-1.0.1.tar.gz 769507 BLAKE2B 7a5f0e3c016f6562a94013a072e33638ba6e4b4af1a607befd508e442dae750d59435b96628bc59e4b86694d5745c302a615fa00603221d642700b86519c4428 SHA512 e3e38298d8d1fdf86332612c4dd62cafb8fa59ec8de00ed96aabee5bfbb46fd2396fcc0ad7fa2e4f89f9a22de538e58be5017d214b42176c0450dcc7c35bfedb
+DIST libaec-1.0.2.tar.gz 767910 BLAKE2B 4d843839b21d93a7ae0f90627217978d1d7262dff35962bb7fe7a9f62f57b5042c36278ff61ad7d7aa3ad1a7cdd1ceb75a59dcc1ab9b3d1c899c506ffe5819d3 SHA512 28a8839089e4b643b259cb8679b96e602a35098d1129baae6b3923767060e5deabfa33256d628a8bcbf205368cda5f2e6701078de0caccf44e0597d932a67ba2
 EBUILD libaec-0.3.2.ebuild 861 BLAKE2B 02da5f244313ee6e63b45786c993bafac01aa4e25599a9c6669fb00cef636cd36cb1210cf4e138ec7554812ae4e8cf325bb7d324155754c391403bf7ae6016ac SHA512 98665305d25602202a33013af317ce7c12e65a5c37520db0e7f62b57bed70df064356d4a79cdedc7d8c119fec6bad06f327cc9f4ce95b46bf069f15d14dc63f6
 EBUILD libaec-1.0.0.ebuild 867 BLAKE2B 41f44e86d7298b6d2693e95f99bd5a7562bd070b76118baeddb226c30b8ff6fdf67d437cc1fc40d93adc61529b34a9e919724b99542ee397cc0617a0171cd73c SHA512 14b5bd5e53710b28b53110cf3720754425220d1a58635da560945a3c2c6aec609adcad5bc5992aec1366e14a6ac3a3d1f200e4a7ee3543b1153835dc21ec1c02
 EBUILD libaec-1.0.1.ebuild 727 BLAKE2B e798ca2aa12bb996cfdcbb1a4d6f93be758e0fd6656ec5b69f5aabad5fe99171bfeace01fb20da536f57691375192d16177c9869c87fb5b2aec2629fbb48cc67 SHA512 c265ab4b16211ff6af0b166b070642f6f3c37ef06b48da3d9dc4d1ba16c955909be9c94a1428d9cace53cac3df099bc5a86091ec110b1c1fa9e382d6919095bb
+EBUILD libaec-1.0.2.ebuild 717 BLAKE2B 2e5aaf14ee3bf9231cfea99f7b3ae76590a92f5c87a1eb8bfb414a2a9d855277291f459a9296a40f39faac08feca69046c8f05eb17f8b5eb7202f3f20a2f8351 SHA512 94203dc5bfcc4c4a361996595b474a3f6f5262497baf3ca542434205d7902c1d64b694d1be4ae6a06036ec2f5099991866807e52e4f52027643eb83b343de5d2
 MISC metadata.xml 719 BLAKE2B d8294233ada6c2318c05d70c6062e7b7db0b0bab38410e9bd0c7d6f9834d1515cb138095d555f27f36c829fbbf7c83c141c1ce74213fba849da8704adf63889d SHA512 f0197c0cf374cb0771e4b2e3bfcc80f639d3e660943df1cab79eec68b515a605855f792b0b1627d24409cfb6cc2890ca7e96f4aace01639106ee50e14574ccf6
diff --git a/sci-libs/libaec/libaec-1.0.2.ebuild b/sci-libs/libaec/libaec-1.0.2.ebuild
new file mode 100644
index 000000000000..99c1467eeb98
--- /dev/null
+++ b/sci-libs/libaec/libaec-1.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Adaptive Entropy Coding library"
+HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
+SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+szip"
+
+DEPEND=""
+RDEPEND="szip? ( !sci-libs/szip )"
+
+src_install() {
+	cmake-utils_src_install
+	# avoid conflict with szip (easier than to patch)
+	if ! use szip; then
+		rm "${ED}"/usr/include/szlib.h || die
+		rm "${ED}"/usr/$(get_libdir)/libsz* || die
+		rm "${ED}"/usr/share/doc/${PF}/README.SZIP || die
+	fi
+}
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 62ab0f6d8680..6b6bed5bbe16 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,4 +1,3 @@
-AUX ogdi-3.1.5-fpic.patch 7619 BLAKE2B 24e71ebb9a0ff536133f83dc4babbafe1e0a82002510a0a88df1ee3aaa5321d0a8f21a0bf4e89be0cd7b37fa12ad2a3bceaa48ed59dba5204ed48b5466992e81 SHA512 da978d0e38794c4b987e787c3fe2168fa4379e316390d7be7bb0490d0e0bdce54d59c105a03314b8e3f9ba450a2ba62ea07d11d89dc199c5f476da2225462251
 AUX ogdi-3.1.6-fpic.patch 961 BLAKE2B 6339c06958876010249514fb633186ba08eb749cc16c36ca2279f0685641b0b7a0cc2f4aa70994cfc20cba4107d05e969cb3bc2ae9627a1920557af3d292ce84 SHA512 9d5d89d907043b14f5a18b6e036a1784b657ae6dd824d03067ab3e1e4e777ad55286e9addf15c9499523d7b2fdb743d329660f64a54e5140961c567135b40579
 AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
 AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
diff --git a/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch
deleted file mode 100644
index 33fb56103193..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Only in ogdi-3.1.5.orig: bin
-Only in ogdi-3.1.5.orig/config: Linux.mak
-Only in ogdi-3.1.5.orig: config.cache
-Only in ogdi-3.1.5.orig: config.log
-Only in ogdi-3.1.5.orig: config.status
-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
-diff -ur ogdi-3.1.5/external/expat/makefile ogdi-3.1.5.orig/external/expat/makefile
---- ogdi-3.1.5/external/expat/makefile	2001-08-27 14:11:10.000000000 +0000
-+++ ogdi-3.1.5.orig/external/expat/makefile	2005-08-01 18:57:49.020052368 +0000
-@@ -36,7 +36,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) \
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
- 	-DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
- 
- ifeq ($(BIG_ENDIAN),1)
-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
-diff -ur ogdi-3.1.5/external/zlib/makefile ogdi-3.1.5.orig/external/zlib/makefile
---- ogdi-3.1.5/external/zlib/makefile	2001-04-19 05:26:46.000000000 +0000
-+++ ogdi-3.1.5.orig/external/zlib/makefile	2005-08-01 18:58:47.984088472 +0000
-@@ -46,7 +46,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- #
- # Primary target
-Only in ogdi-3.1.5.orig/lib: Linux
-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
---- ogdi-3.1.5/ogdi/c-api/makefile	2001-04-19 05:29:31.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile	2005-08-01 18:53:51.936094608 +0000
-@@ -23,7 +23,7 @@
- 		$(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
- 		$(EXPAT_INCLUDE)
- 
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
- 		$(PROJ_STATICLIB) $(MATH_LINKLIB)
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
---- ogdi-3.1.5/ogdi/datum_driver/canada/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile	2005-08-01 19:03:00.932634448 +0000
-@@ -17,7 +17,7 @@
- SOURCES = nadconv.c dtcanada.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= 
- 
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
---- ogdi-3.1.5/ogdi/datum_driver/usa/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile	2005-08-01 19:03:24.883993288 +0000
-@@ -17,7 +17,7 @@
- SOURCES = dtusa.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(PROJ_STATICLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
---- ogdi-3.1.5/ogdi/driver/adrg/makefile	2001-06-22 16:37:50.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile	2005-08-01 19:06:07.422283712 +0000
-@@ -18,7 +18,7 @@
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
- 
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB) 
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile ogdi-3.1.5.orig/ogdi/driver/dted/makefile
---- ogdi-3.1.5/ogdi/driver/dted/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile	2005-08-01 19:06:31.460629328 +0000
-@@ -17,7 +17,7 @@
- SOURCES = dted.c utils.c object.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB)  $(GLUTIL_STATICLIB) 
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/network: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/network/makefile ogdi-3.1.5.orig/ogdi/driver/network/makefile
---- ogdi-3.1.5/ogdi/driver/network/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/network/makefile	2005-08-01 19:06:52.242470008 +0000
-@@ -17,7 +17,7 @@
- SOURCES = remote.c ecs_clnt.c 
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)  
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/rpf: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/rpf/makefile ogdi-3.1.5.orig/ogdi/driver/rpf/makefile
---- ogdi-3.1.5/ogdi/driver/rpf/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/rpf/makefile	2005-08-01 19:07:39.956216416 +0000
-@@ -19,7 +19,7 @@
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
- 	   $(GRASS_INCLUDE) $(PROJ_INCLUDE)
- 
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/skeleton: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/skeleton/makefile ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile
---- ogdi-3.1.5/ogdi/driver/skeleton/makefile	2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile	2005-08-01 19:07:15.500934184 +0000
-@@ -18,7 +18,7 @@
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)
- 
--CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/driver/vrf: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/vrf/makefile ogdi-3.1.5.orig/ogdi/driver/vrf/makefile
---- ogdi-3.1.5/ogdi/driver/vrf/makefile	2001-06-20 21:49:31.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/vrf/makefile	2005-08-01 19:08:03.541630888 +0000
-@@ -17,7 +17,7 @@
- SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
- 
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)
--CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)
- 
-Only in ogdi-3.1.5.orig/ogdi/gltpd: OBJ.Linux
-Only in ogdi-3.1.5.orig/ogdi/glutil: OBJ.Linux
-Only in ogdi-3.1.5.orig/proj: OBJ.Linux
-diff -ur ogdi-3.1.5/proj/makefile ogdi-3.1.5.orig/proj/makefile
---- ogdi-3.1.5/proj/makefile	2001-04-09 16:20:08.000000000 +0000
-+++ ogdi-3.1.5.orig/proj/makefile	2005-08-01 19:01:03.573475752 +0000
-@@ -42,7 +42,7 @@
- 
- INCLUDES     	= $(CURRENT_INCLUDE)
- 
--CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) 
-+CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
- 
- include $(TOPDIR)/config/common.mak
- 
-Only in ogdi-3.1.5.orig/vpflib: OBJ.Linux
-diff -ur ogdi-3.1.5/vpflib/makefile ogdi-3.1.5.orig/vpflib/makefile
---- ogdi-3.1.5/vpflib/makefile	2001-02-20 04:25:20.000000000 +0000
-+++ ogdi-3.1.5.orig/vpflib/makefile	2005-08-01 19:09:48.072739744 +0000
-@@ -31,7 +31,7 @@
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)
- 
- CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \
--	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN)
-+	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN) -fPIC -DPIC
- 
- include $(TOPDIR)/config/common.mak
- 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 9330059e77b4..3f6e2049faa7 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -13,9 +13,13 @@ DIST scipy-0.19.1.tar.gz 14083805 BLAKE2B 65369ffec2726a8e16da2d6852a71965277b8d
 DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3 SHA512 15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
 DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B bc8e590509cfb4bfda9deab40bbc6ebc919e39cb03a5817040ad2e9bbdfd0acc1a1dc194a88ac890a9052b6ddb3bb7b39292d08d925e3d1eb310605ca0589450 SHA512 657ef3c643ab61a8452dd85982018eb2210cd1531edd152c9b1c3d8c722f8a45ab1efd03f5bbb3c763a75e70e6d39036a845869ec5135f2aa0445480a074f3e0
 DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f SHA512 7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
+DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb SHA512 a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
+DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6 SHA512 c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
+DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 EBUILD scipy-0.16.1.ebuild 4249 BLAKE2B 8335f8abb2453467099d68e97aa3aa669634f64b42e75b3c310f6f39178f90c9b8760a1ffa4bb76a3ff6285dc19806074e7408d16427416caa2bcdb9db6aed0e SHA512 adc049f57eb2c16565d8d99983409a6f64f57938aa649d89008587374550af06aa5d1f9476f61d9fcfbaa5615e60732381c1ed436b0dd9241aee00b43370ba44
 EBUILD scipy-0.18.1.ebuild 4254 BLAKE2B 156c9f9cfa488170e9be814e2238f1e4113f6e176f4458f3f659959ab6d552729afff18a3a0c392a579f7025c216a7ce354910f836a26549866764d86d070f74 SHA512 f20fd715cbb7667cabf636db6cf11b8b1de26c497ef87a6d4ee16324415867a9fe06f0bca57677eacb4622b621e60badcd97e8325dc74076492cb0e29ef8e4f2
 EBUILD scipy-0.19.1.ebuild 4192 BLAKE2B aafd6baf4cd291920f505860421d1f8c3976aec99eaa66234e314a7fb8442fc8cf0f2c049a0a5524d0db8acabb2414d81980ffb6c78c982202faf6a1b2a0c4e7 SHA512 3c23790d43940e5d8011abedd4e4035359a8d665d4ecc83a92542498af2f5214f8654cd05eb0c1fefde85aafcd208df05292ede0604fc246210a096a649b57ca
 EBUILD scipy-1.0.0.ebuild 3978 BLAKE2B 71dee72bb5508a1eb06e729e7040c9bed83aa7d09c329e32f0d6e67fe9ca7e7bbce28a796e688215e48185dd921b324ce2b4df32fd90d0d5b2a52da0247a11e9 SHA512 62a0364cf6a67f1342aa5f906d31527033e06ac1f8daf5378a459d7d2487b7d0d2860e1560e0c7f3698eafec1a2abcf14159f89041b3068e5f33bfd7ba7ebef3
+EBUILD scipy-1.1.0.ebuild 3978 BLAKE2B cd7dc524ac127f6bb0e11644d6b23c644e38651c03df0ef7c5069987d92d5de34a549d8577588433c515f0cc70ad136d28a47209a6d8fdb67553f2c6e8d6bcb6 SHA512 416f80d36a83bb8a300e16b2543313782de6a16dfbe75c96cf148390aee2d886454ca90d8bde13f11b40131236889e45dcc4137e01f636d074bd66b1bee6233f
 EBUILD scipy-9999.ebuild 3615 BLAKE2B 83d9274d3c6cc56d1de623b99e15da74df3615aec38675912937cf0572a74ce5ad0eaaa945e541707d8a5444251d4009eddeeffb287cd4db89cf610188f0759b SHA512 55148129c46cacdca338380d7d26792dcdb5d7fa3128273de9c44e930d6bf83715574d26d8b065fec8b633f1efbda9d9446a5b6bae04bc9069d315a1ee85f385
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
new file mode 100644
index 000000000000..789041b2c35b
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${PYTHON}" -c \
+		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
+		|| die
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 9c085f2ff417..75b961f018ba 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -2,28 +2,36 @@ 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 abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz 875263 BLAKE2B f11af5582ef3e00155361de2185b703fc9edde1b6cbefce62224da7b13e1beae219076f144b7b8d4bf63d1b21a73beb77fbb437e6d91e6d59a233846d91c1a99 SHA512 a3694d4c74f542f7a55872707548469e1bdc6dcd05d40ffd62de41d7440dc1fb98d260f690a6799ad39142e35226b04aacc6122aa1edf104fc9d396997995a8c
+DIST abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz 189090 BLAKE2B ac4e7ffffb6dc2ad922d03cbfee1858335728fffe5721761fb0207b242ccf0f8d9739bed29987c8cc718f7cc3c297e05bf7506b36f31a06b9019be8215f842a7 SHA512 faf00229a062dcf71d9147bc76538dd4ee3adcb76b7e46943663eb43e3023587c68819d1ca157709c3f071e5796bbcf8e10277ccca1f5b83f33fb0025520d373
 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
 DIST aws_sdk_cpp-1.3.15.tar.gz 14181795 BLAKE2B 8e6d407876c4d68b73e22a21c3863efe1155231835be8edb4d7c0f1cceca1880ba1c6791bc3fda8226a22a201515cd44dbe7020883f21cdbbeb3559c8c733a0e SHA512 844addabf01bdbba2c50f94303f23fd092ac5593c42c782aad5959d5edaadb0bec8a6408a91f4605cef996f0d5a23fd94ca3c194829c65db98291d5fa7150bff
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-rules_closure-08039ba8ca59f64248bb3b6ae016460fe9c9914f.tar.gz 433332 BLAKE2B a5a9022c046a8362681cc54e755f1ae1c96a9100be0c1891841ab0326f56f564b4c494ba268573cb5450525e9e35d337ba2505ce63e576ea37da84e7a6554b5d SHA512 9fee59ae3485cbde8adec062af68e9de6be588607bb9280fffd64edbd6ba6f973dd4e158fe229b4228a44d949e68271645f918da720a2a398d1ba30b0b31c4bf
+DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 435984 BLAKE2B 1ec325861e5e5292b2153119beff3b3be743b4833adf3571eab1a066fef06a61131ef0a761e6f8ba4bf978e7c1c073f197f48a507cd1259ee346d4209129211d SHA512 13991822624e5bdcc2424299acb1b9ce12880f46ebbf2065d7d19a66c77f1a6802862a7ea96334fc91a1c85cff516fd32a493320f0a4d98f19e9d33e5f887986
 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 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 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 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
 DIST giflib-5.1.4.tar.gz 738552 BLAKE2B 414cfdb488a12bcebc6e6e1db9face0e69430e5af94929e7935dc38ff2355182e223b5d87aef53d405f5f79867b4bc1e756f84134d60a01bcb8b5bf5b6859fa1 SHA512 d9a98a593bcfbbfb2fcbeef1382ca9669a6b85276512e6828c92869d16c7cfe980bbb318766fc176be3c9f7deff7878d2be8aeda1d40af2cc4ac723fe6121b83
 DIST grpc-bd6bdf93279a39a8cd92978fd7c9d14eccd98fc2.tar.gz 13478349 BLAKE2B 81f6722c893332c6be7875f9bd4f8311eca989c6dcaf87e47de038abe43b4d8eef5aaa0326a15a7c4f5c7a922e85bc006ace244ef4004ed78bf91645711adc12 SHA512 9268fc28bc128d2ad944fff4d9e1764a5cf0ab7c4d3f693607f42413cccdb766ec349b8f2e487bef823ac65007da9b9e3fdf91a7f623634616d91a68477b2951
+DIST grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz 13432340 BLAKE2B 68a0da37600fe15632542da2b477c47488c92a1eff578088187ca3ce2a4feaa8487dd4f6777c62af59be907984a9fa9f8170fc016a31d193bfafb472ed789a75 SHA512 7fc5a3f4a09317cb81a95fc82654379fb4361797f96a5e20e3bda4b425f57b8369922342ddf4ab4d401246abf4be8669ecb0a46f50c9065824901f14d3d21a6a
 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-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 libxsmm-1.8.1.tar.gz 893332 BLAKE2B b09879ef45a8d3007846361aaad8536dac526297583d29f28378a91c05fdd3a4c51e399d7d5b05dd4456268d5fd3e7014d889a41be61c1d99425dd7234b0dd6e SHA512 30388de1edf46ae40b2ccdf224bd9febd1ffbb91f8250c89c03044fe1ea75754ce5155107ec9d027fe2e08963f1ac9d2e526ea84618d2cf50c2d5dfe8a1e074d
@@ -31,16 +39,20 @@ 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 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
 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
 DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f9823196d09ac1b1c1ea5b093da12592957b66d8be2450a7edf18c54ae83a03e09564d5c7f6b0cb8dd48d4fa8b4f2b153f62a7 SHA512 659b5fe93d526d6121f1530581d3fce5af90c986decf2fab7505fea14dc1ebc9167943261a433207fd70df0019bbcb4faeb5e49e586fc9ba6300439b6e00d1e8
+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-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
 MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
new file mode 100644
index 000000000000..77831fe28628
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
@@ -0,0 +1,361 @@
+# 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 )
+PATCHES=(
+)
+
+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
+	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() {
+	BAZEL_OUTPUT_BASE="${WORKDIR}/bazel-base"
+	mkdir -p "${BAZEL_OUTPUT_BASE}" || die
+	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() {
+	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
+
+	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
+
+	# Eigen headers
+	insinto /usr/include/${PN}/third_party/eigen3/Eigen/
+	doins third_party/eigen3/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
+}