18 files changed, 730 insertions, 227 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1cdae4f39ab8..ecb228940551 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/freesteam/Manifest b/sci-libs/freesteam/Manifest
deleted file mode 100644
index 38ea5554589a..000000000000
--- a/sci-libs/freesteam/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX freesteam-flags.patch 726 BLAKE2B db12d83c8631d0dac4664bb6a664bdbb8e3fdec84641e99fcf70ce1e252daa4c8d2a9be5d44f62f33074cbd19c8a58020a15d8bfc6924afd0bdf2cac6838ad22 SHA512 08fdb64d64f90e7191732195f5f50515efc0a3838d85a17ad10bd588629091f04fec61c50fc780d6efa9d84e595b5cfba4a0f67b757db10d315eca87c98c323d
-AUX freesteam-soname-symlinks.patch 1473 BLAKE2B fb48ea4d49756487949fac2ae636295ab8ae688d29b8a3afeb9c33c047238d51eefb3fa6309ac650b696045b38dc25b00865fb216b0f99186df29a4ac57f3b06 SHA512 8aec90dc35af857286fbb2f53a9a1f2215641a27f16d73b009685036467747e30dd8a7ea37cb4b46f8875ecbe82a7ae5e42627b85edcc17ba61c9e84ffd00b7d
-DIST freesteam-2.0.tar.bz2 80838 BLAKE2B fe2a3730bf929adbe9e1f7a82434ea0f7fb3d80f4f77a9aaac647480185ea0496e9104352c95cd2629db3629ec44abeda333e0fe5b90916ae928c31fb56bbdc1 SHA512 32c69a5b6665c62c566fb1c6e4b349ec820028a0a431532a39d0f8d07c2a474c1d41b166dff5e05087a94b58066084a0a369a5f3f6531df1021596c6252325f8
-EBUILD freesteam-2.0.ebuild 788 BLAKE2B 3cd02b1c48c97d064810a5f214342ef0f62866c9964c20c9a82817f42985838a453e543656151d55bad7fb3f746d82de475e74152ffe7397d81f93de61d00565 SHA512 3b4e1994630574c716c69bd7a03333df298bac8b06ffc1c7232178fd435abc0bc72d82c49c2618c5b2688902e5a97b588a0fd02020658a953399c99cb53eb3e1
-EBUILD freesteam-9999.ebuild 808 BLAKE2B b28a0b4ac9c467ed96220818f63b2c3cc1bf5dc7b91318ca59b67543e16a5dc2f3d42ba77e306b8d86a65df487c5e187f850fc2a5cf3fda2b9d7c3328913fbf1 SHA512 c9ade950e139b984e676b05ead2cad59a8da7d5d2c5d00a97962bcd031f9b4f4a8e63eab8a15641e43da9ae3736d4be4631837d8055c8ea99da095b8273468a2
-MISC metadata.xml 336 BLAKE2B 06eb01f140acdc54dae6827128f974f894d00de51d4a86db047ac9fdc9ab36e89071f0b46de104c90f3d51b7263532f754644b66d166dd38709aa8f23970a498 SHA512 a0c11e2d2258d3488c185235d362b03bab7cd85fb25b936c078dcd0464abf6c26fd94fe10a4ec267e0ad8eab6c49dbabf1883e5a3d174d03e1fa22c8cdc7dc73
diff --git a/sci-libs/freesteam/files/freesteam-flags.patch b/sci-libs/freesteam/files/freesteam-flags.patch
deleted file mode 100644
index 615bdc050321..000000000000
--- a/sci-libs/freesteam/files/freesteam-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6a68348f4b1fb755724e1df34bff4d6986d07dab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
-Date: Sat, 26 Nov 2011 22:30:15 +0100
-Subject: [PATCH] Merge CFLAGS and LDFLAGS from the environment.
-
----
- SConstruct |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 9dc17f5..e529e88 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -194,6 +194,11 @@ SConsEnvironment.InstallLibraryAs = lambda env, dest, files: InstallPermAs(env,
- 
- vars.Update(env)
- 
-+# Merge environment CFLAGS & LDFLAGS
-+
-+env.MergeFlags([os.environ.get('CFLAGS', ''),
-+	os.environ.get('LDFLAGS', '')])
-+
- #----------------
- # SWIG
- 
--- 
-1.7.8.rc3.31.g017d.dirty
-
diff --git a/sci-libs/freesteam/files/freesteam-soname-symlinks.patch b/sci-libs/freesteam/files/freesteam-soname-symlinks.patch
deleted file mode 100644
index dbd8b2a64c26..000000000000
--- a/sci-libs/freesteam/files/freesteam-soname-symlinks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dd03d6b29fd29f9978022291f0c023e4fe5dd345 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
-Date: Sat, 26 Nov 2011 23:18:37 +0100
-Subject: [PATCH] Fix SONAME symlinks - make them relative.
-
----
- SConstruct |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 1794691..d84a13a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -5,7 +5,7 @@
- # We don't currently propose to support building freesteam from MSVS but
- # that shouldn't be necessary, as you should be able to use the MinGW-generated
- # DLL even with MSVS, because it only uses C code.
--import platform, sys, distutils.sysconfig, os 
-+import platform, sys, distutils.sysconfig, os, os.path
- 
- #version number for this copy of freesteam
- version = "2.1"
-@@ -436,11 +436,11 @@ else:
- 
- 	install_link1 = None
- 	if env.subst(link1) != env.subst(libname):
--		install_link1 = env.Command("${INSTALL_ROOT}"+link1,install_lib,"ln -s %s $TARGET" % libname)
-+		install_link1 = env.Command("${INSTALL_ROOT}"+link1,install_lib,"ln -s %s $TARGET" % os.path.basename(libname))
- 
- 	install_link2 = None
- 	if env.get("SONAME_MINOR"):
--		install_link2 = env.Command("${INSTALL_ROOT}"+link2,install_lib,"ln -s %s $TARGET"%libname)
-+		install_link2 = env.Command("${INSTALL_ROOT}"+link2,install_lib,"ln -s %s $TARGET"%os.path.basename(libname))
- 	
- 	env['installedfiles'] += [install_link1, install_link2]
- 
--- 
-1.7.8.rc3.31.g017d.dirty
-
diff --git a/sci-libs/freesteam/freesteam-2.0.ebuild b/sci-libs/freesteam/freesteam-2.0.ebuild
deleted file mode 100644
index 92f6e685bc00..000000000000
--- a/sci-libs/freesteam/freesteam-2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib scons-utils toolchain-funcs
-
-DESCRIPTION="Open source implementation of IF97 steam tables"
-HOMEPAGE="http://freesteam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freesteam/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sci-libs/gsl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-flags.patch
-		"${FILESDIR}"/${PN}-soname-symlinks.patch
-	epatch_user
-}
-
-src_configure() {
-	myesconsargs=(
-		INSTALL_PREFIX=/usr
-		INSTALL_LIB=/usr/$(get_libdir)
-		INSTALL_ROOT="${D}"
-
-		CC="$(tc-getCC)"
-		SWIG=false
-	)
-
-	mkdir -p "${D}" || die
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons install
-}
diff --git a/sci-libs/freesteam/freesteam-9999.ebuild b/sci-libs/freesteam/freesteam-9999.ebuild
deleted file mode 100644
index 939afc9dfe20..000000000000
--- a/sci-libs/freesteam/freesteam-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib scons-utils toolchain-funcs subversion
-
-DESCRIPTION="Open source implementation of IF97 steam tables"
-HOMEPAGE="http://freesteam.sourceforge.net/"
-SRC_URI=""
-ESVN_REPO_URI="https://svn.code.sf.net/p/freesteam/code/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="sci-libs/gsl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-flags.patch
-		"${FILESDIR}"/${PN}-soname-symlinks.patch
-	epatch_user
-}
-
-src_configure() {
-	myesconsargs=(
-		INSTALL_PREFIX=/usr
-		INSTALL_LIB=/usr/$(get_libdir)
-		INSTALL_ROOT="${D}"
-
-		CC="$(tc-getCC)"
-		SWIG=false
-	)
-
-	mkdir -p "${D}" || die
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons install
-}
diff --git a/sci-libs/freesteam/metadata.xml b/sci-libs/freesteam/metadata.xml
deleted file mode 100644
index a8f3c63c1bf6..000000000000
--- a/sci-libs/freesteam/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">freesteam</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 843f75a5193a..effd6d3403a8 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,8 @@
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
+AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc326c9e0e7967bd81ab8b80f3a09657c16f4a95250e6753a3dd463acc0a45301a157279a6408b697c15868f86aa SHA512 2dce2e5f391645c4470d7b08a906a942b1821a0086a4042853ba6a38df96b710b29bb7c32f6a2ac9732d281f3afe9e42aeb6f51fdc2734f896402680aed95d27
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
 EBUILD gdal-2.2.3-r1.ebuild 7556 BLAKE2B e8f07d634b9db3159a282d5e47b48a125ee2048ebb7378ac7e772b46c792fe482f557d408b18c15ca879ecae967c54f835d20c49accaf4434413a6581a3109b3 SHA512 955f994cbf9ac8b3e4ca1fc0f03727aabd93b868ea29d83503efd05d864c044ff4942a365a4e16b38f4f56b8705e0e2b48977e244e6580a29728771828817e40
+EBUILD gdal-2.2.3-r2.ebuild 7607 BLAKE2B cbd3aed4d0c7dc1ae88eff6bed02e2d23aa997d152512a3164bfe3064254aafde2327f9ccf95085b7fd5f01d6ea7b6b8ceec326195ca4b1422a31b24afb01ca5 SHA512 c31835c25043dbddb926549fab3ef7717218c1843740ade90e9785d789f64fb5aa9779f9b0997941154c8af8f97956a2a109bf9f794b5509d445dbf307a5fa45
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
new file mode 100644
index 000000000000..a25a524c2538
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
@@ -0,0 +1,11 @@
+--- a/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:00.980957371 +0300
++++ b/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:44.378955265 +0300
+@@ -1055,7 +1055,7 @@
+ {
+     if (GetType() == PDFObjectType_String)
+     {
+-        GooString* gooString = m_po->getString();
++        GooString* gooString =(GooString*) m_po->getString();
+         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
+                                                       static_cast<int>(gooString->getLength())));
+     }
diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..9db812294860
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:=
+	media-libs/tiff:0=
+	sci-libs/libgeotiff
+	sys-libs/zlib:=[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( >=app-text/poppler-0.24.3:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+	app-shells/bash-completion
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.7:* )
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-soname.patch"
+	"${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
+	"${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
+	"${FILESDIR}/${P}-goocast.patch" # bug 656252
+)
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		-i "${S}"/GDALmake.opt.in || die
+
+	# the second sed expression should fix bug 371075
+	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		-i "${S}"/swig/python/GNUmakefile || die
+
+	# Fix spatialite/sqlite include issue
+	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+	# Fix freexl configure check
+	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# updated for newer swig (must specify the path to input files)
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 619148
+	append-cxxflags -std=c++14
+
+	tc-export AR RANLIB
+	local myopts=()
+
+	if use java; then
+		myopts+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myopts+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	#     also that thing is developed by the gdal people
+	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+	# bsb - legal issues
+	# ingres - same story as oracle oci
+	# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+	# podofo - we use poppler instead they are exclusive for each other
+	# tiff is a hard dep
+	ECONF_SOURCE="${S}" econf \
+		--includedir="${EPREFIX}/usr/include/${PN}" \
+		--disable-pdf-plugin \
+		--disable-static \
+		--enable-shared \
+		--with-expat \
+		--with-geotiff \
+		--with-grib \
+		--with-hide-internal-symbols \
+		--with-libjson-c="${EPREFIX}/usr/" \
+		--with-libtiff \
+		--with-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-gnm \
+		--with-cryptopp=no \
+		--without-bsb \
+		--without-dods-root \
+		--without-ecw \
+		--without-epsilon \
+		--without-fme \
+		--without-grass \
+		--without-hdf4 \
+		--without-idb \
+		--without-ingres \
+		--without-jasper \
+		--without-jp2mrsid \
+		--without-kakadu \
+		--without-mrsid \
+		--without-msg \
+		--without-mrf \
+		--without-pcraster \
+		--without-pdfium \
+		--without-sde \
+		--without-sosi \
+		--without-mongocxx \
+		--without-podofo \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_with armadillo) \
+		$(use_with aux_xml pam) \
+		$(use_with curl) \
+		$(use_with fits cfitsio) \
+		$(use_with geos) \
+		$(use_with gif) \
+		$(use_with gml xerces) \
+		$(use_with hdf5) \
+		$(use_with jpeg pcidsk) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjpeg) \
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+		$(use_with netcdf) \
+		$(use_with oracle oci) \
+		$(use_with odbc) \
+		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
+		$(use_with opencl) \
+		$(use_with perl) \
+		$(use_with png) \
+		$(use_with pdf poppler) \
+		$(use_with postgres pg) \
+		$(use_with python) \
+		$(use_with spatialite) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+		$(use_with threads) \
+		$(use_with webp) \
+		$(use_with xls freexl) \
+		${myopts}
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_install
+		popd > /dev/null || die
+		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
+			-i GDALmake.opt || die
+	fi
+
+	use perl && perl_delete_localpod
+
+	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
+	use doc && HTML_DOCS=( html/. )
+
+	default
+
+	python_install() {
+		distutils-r1_python_install
+		python_doscript scripts/*.py
+	}
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.txt README-python.txt
+
+		insinto /usr/share/${PN}/samples
+		doins -r swig/python/samples/
+	fi
+
+	doman "${S}"/man/man*/*
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 41ae01d16f44..98e435bacbc9 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,5 +1,5 @@
 DIST ignition-math3_3.2.0.tar.bz2 382201 BLAKE2B 79d0450356d931e3150afddd8f0d558923c6a27be4a56566ba18c6dc654b61b32acb92eff2ce5a87228bd512058e4b68d85b26bbbf1ac6a6c6af617b5ebcf59e SHA512 ffb5d61105ba0951c6420c53d64b47bdd65bdcac17e8ef2ce7cb83aeb2310280e5acb4d029d1af5c05fb5c40accf05df61d1e04dc990225159f1749284e3dcf1
 DIST ignition-math4_4.0.0.tar.bz2 387717 BLAKE2B 1b19bcd377eb18b616a300e022419ba2651795e04c0f0a3769f565e6febdc1a37f321c81730e1c13c9f9b17f35e6cf558d1129b278b2477ec8d5a5f46b927d66 SHA512 4815c6222945fd228b2d23c9da7ad8876f8ba1fea382312e1eb320819ec5d8bbf637095c18dbe2413184bbea77040bd1a5492ea9427355fc5e62f6169277530e
 EBUILD ignition-math-3.2.0.ebuild 881 BLAKE2B b22579cc9846ff35aa82bbcc84565881803a180ccb52bf675d0fd80fb58a5f386d014e8f14b2b91602f3ab8450a9caaec6bef4dbcf6656dd0d67201fd4de8ffa SHA512 f13343d8a98b7e40e2e9c67142831fcd52e86aa42246cd5c8ea81f3821518746e9786fb9ea81b2b205a4841557f33f6d0ed389f758a112f29905646d7b60284c
-EBUILD ignition-math-4.0.0.ebuild 586 BLAKE2B 58612cff1c406ae4afc93963ca099ec0d53415fd57127a604bae1b498695de2743f64a41547c75e2e08225247086efe4848bfb3c06685a56f312dde95aff1639 SHA512 2665fe6615cb7ff1be80534a26b6c2452004c9a8719afb163e211302ed369f8886bbf9d90a682b6c24d192cfebb3414d0b93871cbfe0f479c4afe416469798e5
+EBUILD ignition-math-4.0.0-r1.ebuild 574 BLAKE2B 8c5a200993a7b60fca7b899c7df9986c91f4f378eccf710f123869bdca2c58ef78ade67e513b78c0fb2418cd802bab708392bfda8cb247e01e67241911880e50 SHA512 3b6bf6e3089ce46f58352ae80585235189494cc07dc3f4dfccca791d03de21e59e3594bd0be3b05e57555279435642d80569c98ce2804ea4e456f91de9a55cf2
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-4.0.0.ebuild b/sci-libs/ignition-math/ignition-math-4.0.0-r1.ebuild
index 03d5e2d9fbbb..522811b8b000 100644
--- a/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-4.0.0-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-multilib vcs-snapshot flag-o-matic
+CMAKE_BUILD_TYPE=RelWithDebInfo
+inherit cmake-multilib vcs-snapshot
 
 DESCRIPTION="A small, fast, and high performance math library for robot applications"
 HOMEPAGE="https://ignitionrobotics.org/libraries/math"
@@ -17,5 +18,5 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-util/ignition-cmake[${MULTILIB_USEDEP}]"
+
 S="${WORKDIR}/${PN}4_${PV}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 7616fd67f76d..f032e4dbca33 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,3 @@
-DIST indilib-1.4.1.tar.gz 1529660 BLAKE2B e869ba6b7430515a88f536d1738a9e5beb2622fad20d47ef2e981f9f00eb46e8703b2ad7842dca00b784d972cae639db3c8bfbb301ecbec8d582f372dae2f360 SHA512 b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f
 DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
-EBUILD indilib-1.4.1.ebuild 845 BLAKE2B 67d815e51377ee5b154f91835e89352c77d5bdeccb69fe547da980a6be529ac08fdbaa07e69a505ffe542efc9793bb2fb63a2c7c88a95d9cecc6ef83ffe40824 SHA512 8bd626e97b2e8dff6081c62664be68cd5e42179315c5587a377e3a043d04dc416f89fbea44213e374d5470cd43866172f0bcd8f226b824e6ab8e16d7d21b4375
 EBUILD indilib-1.6.0.ebuild 1105 BLAKE2B 8f5e21b13aea5f88309ea355abf526255c200a78b545e2992c774aefd28383bb5a14c07137f1370f820577c257e6304feed0e6be0912e69fe39fd7f2cf76b963 SHA512 42ca02a83d01913d99a786365166088a13bc0a41f49a99077f9d0acb58592f990124d753eaa21ff860deae33d438cacd591d7f6533cda7370b75f395e3e4750b
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.4.1.ebuild b/sci-libs/indilib/indilib-1.4.1.ebuild
deleted file mode 100644
index 6ff6dfdaa8c5..000000000000
--- a/sci-libs/indilib/indilib-1.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio
-	sci-libs/gsl
-	sci-libs/libnova
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-S=${WORKDIR}/${MY_PN}
-
-src_configure() {
-	local mycmakeargs=(
-		-INDI_BUILD_UNITTESTS=OFF
-		-INDI_BUILD_QT5_CLIENT=OFF
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index affcab29a5e3..22c198f483f2 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -4,9 +4,11 @@ DIST libsigrokdecode-0.3.0.tar.gz 607691 BLAKE2B d61f647ccfba0b47f20d57ec04d5e0c
 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
 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
 EBUILD libsigrokdecode-9999.ebuild 1073 BLAKE2B 8b2bf207315eace5e21e6eb2502c1448770416c2adc82a9cef8797f6af9942ea8e361836a3ad570b0270d41443ef22c55140a6681f472c694a5b8981bd4289bc SHA512 7c401109d22980b700af500ca3471dc41e0fa761cc8d6e2a83950b53e4054d46000985e13de3babab3f20703734e6ee12a3803231b4cf34ecf45732b33f06cd8
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.1.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.1.ebuild
new file mode 100644
index 000000000000..7c39504420c1
--- /dev/null
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+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/4"
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/glib-2.34.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/Manifest b/sci-libs/tensorflow/Manifest
index 75b961f018ba..7cfdba370530 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -50,9 +50,11 @@ DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466d
 DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
 DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
 DIST tensorflow-1.9.0_rc0.tar.gz 23632522 BLAKE2B 2049f97edb18fe34963c2706dc7249102204bacbd568c7a1ae880d9d94ba2a24b47f577ef71b6bf40e55b4c42537a2184e0ab2ad8e27cdbfcc9508cfa70515a8 SHA512 55b165882ce965c8b46ebb91e26b5828c3b71d6c07b8d5a321e890e9b5c00e896de511fc1d9e9b2f7f4f33311da6add32c7f7b55631eab8fedcc2167186649e3
+DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
 EBUILD tensorflow-1.9.0_rc0.ebuild 13456 BLAKE2B af490ef87277a17569d2f24fee316ff111c06db7193b04fce3b568421e38807de4300dcf8f7acab64353962a944b11b045e371a93bf2af00ef8dbf0e7eb1f939 SHA512 f9e497ac6f4fa9032918d57b329476ee6e428745af6e8d35eacfa1016147b1926a67563cce42284835bbed8c07b9b7c6ac4a4b890d1214c7e29f693fcd1525f8
+EBUILD tensorflow-1.9.0_rc1.ebuild 13585 BLAKE2B 0791608a2ed5f15dc8539cdaf67b6d92934f6c61c98ad9124ec52819c8858771b4fb67a59e2ab48ab17f1431640790c6cef30389b9d9198020a3eb856162c348 SHA512 dcc8998e2c722304f7e50d66777503d0e38f5e1b27f6f9d4671e4723aa8d75353672e2cffc189280d0424b11d5dd748278fadd21a49f3034468e1137d2cb2802
 MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
new file mode 100644
index 000000000000..207901b88346
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
@@ -0,0 +1,363 @@
+# 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
+	# Bazel looks in distdir but will only look for the original filename, not
+	# the possibly renamed one that portage downloaded. If the line has -> we
+	# need to rename it back, otherwise a simple copy is fine.
+
+	local src dst uri rename
+
+	while read uri rename dst; do
+		src="${uri##*/}"
+		[[ -z $src ]] && continue
+		if [[ "$rename" != "->" ]]; then
+			dst="${src}"
+		fi
+
+		[[ ${A} =~ ${dst} ]] || continue
+
+		if [[ "$dst" == "$src" ]]; then
+			einfo "Copying $dst to bazel distdir $src ..."
+		else
+			einfo "Copying $dst to bazel distdir ..."
+		fi
+		cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
+	done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//' <<< "${bazel_external_uris}")"
+}
+
+pkg_setup() {
+	export JAVA_HOME=$(java-config --jre-home)
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+}
+
+src_prepare() {
+	setup_bazelrc
+	load_distfiles
+
+	default
+	use python && python_copy_sources
+}
+
+src_configure() {
+	do_configure() {
+		export CC_OPT_FLAGS=""
+		export GCC_HOST_COMPILER_PATH=$(which $(tc-getCC))
+		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
+		export TF_NEED_GCP=0
+		export TF_NEED_HDFS=0
+		export TF_NEED_S3=0
+		export TF_NEED_KAFKA=0
+		export TF_ENABLE_XLA=0
+		export TF_NEED_GDR=0
+		export TF_NEED_VERBS=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_MKL=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		# Only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
+		# This is not autoconf
+		./configure || die
+
+		sed -i '/strip=always/d' .tf_configure.bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_setup
+		local MULTIBUILD_VARIANT="${EPYTHON/./_}"
+		cd "${S}-${MULTIBUILD_VARIANT}" || die
+	fi
+
+	ebazel build \
+		$(usex cuda --config=cuda '') \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build \
+			$(usex cuda --config=cuda '') \
+			//tensorflow/tools/pip_package:build_pip_package
+	}
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	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
+}