gentoo resync : 07.05.2019

13 files changed, 445 insertions, 10 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index cbbfdd3c5856..aaa5c0b05407 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 5323e8de221b..5b0a52b1f284 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,7 +8,7 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
-EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
-EBUILD fftw-3.3.8.ebuild 4460 BLAKE2B f19d409d070424a703317f2ae9d2a856503c1a5287eb8824c68b8246ea2967c4183bb9e540e84d82d15f7994af0099914928923c390090fb13e2e20fffd151c6 SHA512 1d10035d207cdf625ab775f9d526dbba6ba34a829608b861707ffea5de8e8b0dad56a60dda2f9414e7d382ab50bb083061cbb1c0d28b5456eba361bd3dc55b6c
-EBUILD fftw-9999.ebuild 4654 BLAKE2B b4118a314849101394a263073a661735c3e2ed85ff0b1b55ac3f62e23d295bd92259cca9f21f4e65839d3f264febdadd4198789fa5728c5c71a7c305ecac0bcd SHA512 b19cb97bbc3cd97e3d8c0500bf667e960ae252c6b3ef083736ba903f8bfacb284dd0369b15f3013754978cc9fe71f8dc5f21441e1854bea9967fbfb5a898f94f
+EBUILD fftw-3.3.6_p2.ebuild 4430 BLAKE2B 1d25af2045be0efb6a810e0803dbdcb9f40743d3a77fc11e67b90e764f3c85a26e8f0a9b118410a2bc7a5ea869aec564a5fa7b97b991df4804b31070609ffcdb SHA512 bf9831541103d91e1319a53c2f2c8061b526bc553c70a0ea3471f8727c830b809438c2c74eef6a5fbebe952c2eb0195011d88288b176469f35ece747ace4ef27
+EBUILD fftw-3.3.8.ebuild 4460 BLAKE2B 10124fe44ad462d5b164dbd7e61c43555925af60028708498e779e045aeb618ad1fee8d2820e68ee012e76a0b247800d8a353723c413e28b12928b0797d858dc SHA512 d375d82c6276bcfd4c3a31262c14f7dc9ade0ea49e01c0803d6748c5df46cbad0b8e0741a2487a8ce93a576cea5a5e85dceb551e826872001cc056fbd3ba8908
+EBUILD fftw-9999.ebuild 4651 BLAKE2B 3d0a496935265e1e56b616577713736d62b30a4227a05d0ca6d1242b973161c13580eb98ee8e5420a7e0e452ddd6adcf860c702f107fdca256d852dd2220c324 SHA512 cbcfe34a1aea2c6a74188b37dd38f4e792474e0f963222f01988bc5e907b28ed5dc9dbd9d1d419ccd9d58132ac7538018bc91a2bc5f41581fd602f61e998442b
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 35d91fe43ac0..4535c715b265 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -130,7 +130,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {
diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index d345f5d141f9..c89038acc6aa 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -131,7 +131,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index c08278dde801..a43b48e5809f 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,7 @@ multilib_src_configure() {
 		MY_S="${BUILD_DIR}"
 	fi
 
-	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5714926612ab..d568a4c6b770 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,6 +7,8 @@ AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fc
 AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e SHA512 9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
+DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
 EBUILD gdal-2.3.1.ebuild 8396 BLAKE2B 9f1237ca5566fcbf9cd96d8625fab6378e177659a5df2016c8b3a6f91ef6294a9ae1fcf1e9daa37f464ba77376a183a1be551831b1e3b07f4462a582999d381b SHA512 5c90139465932d1b503e26a401afaecd4388e3e34b8db86505931cd4aac1702457a91fedc5557ab5bc5d31c46a86d03a9cf8046d315800dc4529e1fbd7ec4bf6
 EBUILD gdal-2.4.0.ebuild 8302 BLAKE2B 31e64b20c812786e4cc27a103e85838a38d6082bdf517f16cf8363b35cf18eb40a19853efcb2d37e739d137daa3d01bcb5c9769b314f26a0e9ed75250358692c SHA512 fcca09c9aee575decbf9a59695a4865f0c488242415812554868a85bbfa5aea7306306f756154ddd32daeb8e95c16e086d11b4b23cc54f9341c9a1c9df95d2c5
+EBUILD gdal-2.4.1.ebuild 8055 BLAKE2B b2bb41dfd1a38c6465c2b917dea123bfbca350edf7f6dbf0a3f47db4f202f04f30135228593f6ccec1c2c4296084de3876fca21170e9dde90e9171b5f8222fe1 SHA512 3dbb42c30039f5466472fac3e8b994ee0df823ba8cc74fa2318b3f4a71f0f343107201f7ce9b3cf77f3afae05480f571a032168b86ffd89b9d31ef26a47c418c
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.1.ebuild
new file mode 100644
index 000000000000..303bd716b48f
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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="https://www.gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+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= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	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:= )
+	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 )
+	zstd? ( app-arch/zstd:= )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.7:* )"
+
+DEPEND="${COMMON_DEPEND}
+	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}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+)
+
+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
+
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}/usr/include/${PN}"
+		--disable-pdf-plugin
+		--disable-static
+		--enable-shared
+		--with-expat
+		--with-cryptopp=no
+		--with-geotiff
+		--with-grib
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}/usr/"
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}/usr/"
+		--with-gnm
+		--without-bsb
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-epsilon
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-mrf
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-php
+		--without-podofo
+		--without-qhull
+		--without-sde
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		--disable-lto
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux_xml pam)
+		$(use_with curl)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with perl)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with python)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		tc-export PKG_CONFIG
+		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
+		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		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
+		myinst=( DESTDIR="${D}" )
+		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*/*
+	find "${ED}" -name '*.la' -delete || die
+}
+
+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/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index b6341525473e..984cf106c40c 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,6 +1,8 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
 DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620cf24e86297178eb84a76e4988dd5bde2c278f995d39fa598a84eaaac69e93a62e7d091a77830c5fd16a43cb20a750 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
+DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 EBUILD libgeotiff-1.4.0.ebuild 1504 BLAKE2B 1fe286a7dd5709b2ba11c68161e2e6eed9ef36e2388c2e43fddb2f394e9af5e02e6f8b273649fd54e90c4215474a8d3fda1226bf99832a505a3a53e964a35a1b SHA512 7ead72d31550a10908d9a5e54ef6954bd4ba5ed9987f5fb5ce40e74abecf22c237a29e2591664eb9b0871a83c451408202732fad2308b3601f0b748c981b824d
 EBUILD libgeotiff-1.4.1-r1.ebuild 1288 BLAKE2B 29d7fc36597ec31717fdcfdda203123b972069af3364f3d27f8782563ceb11b76d0a9f29bc0579314077f58397ca4489320736e306ecab64f66462d89fbbeb70 SHA512 e5fc2a4623d9a5f94dda82b0fd4d00e10b86c9f3e27fbebc05b84fb11e4b506b07209de809b1310b3b4e36d80951f47b9a61dc1bbcc6d4a4b1a2bf3605e2fd52
+EBUILD libgeotiff-1.5.1.ebuild 1285 BLAKE2B b252f6e4c70bea3c1e7f6c714acc6bb726990c292713178e896faef9f4741bfe019aa2b4e3b41ba983932e5a9ac11975a5432a0122b54e7d2a3a0a98e2cb7c14 SHA512 8641501ae7be2dc6a1343869fafd7ef6635a90e16502afac311c6b37aeebcc6c9cd4b842d18dfcfa9f79a493c6faaee93aa7d444b89361ce5d61ac6b7441016c
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild
new file mode 100644
index 000000000000..54b176ce7533
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="http://geotiff.osgeo.org/"
+SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs"
+
+RDEPEND="
+	virtual/jpeg:=
+	>=media-libs/tiff-3.9.1:0
+	sci-libs/proj
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P/RC*/}
+
+DOCS=( README ChangeLog )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:-O3::g" \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-debug=$(usex debug) \
+		--with-jpeg="${EPREFIX}"/usr/ \
+		--with-zip="${EPREFIX}"/usr/
+
+}
+src_compile() {
+	default
+
+	if use doc; then
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dohtml docs/api/*
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index bb665e03e7df..cc2fb554d894 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -2,7 +2,10 @@ DIST proj-4.8.0-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de
 DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d0c67ca8b847e8b69c2f6fead7176f69ae1546f45dddcd96e05c6409167b0c078029de0be1d7bc4e550edec SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
 DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
 DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
+DIST proj-6.0.0.tar.gz 2405217 BLAKE2B 7d0be7753048ffb0b95a7aca8bf73346c4239112527bf0c4a37b22a25c66f97c7692445608cd7aff422edeec18e9eb90839d84cda117dda0bbdefbe274b3e5e3 SHA512 bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
+DIST proj-datumgrid-1.8.zip 6601640 BLAKE2B d439286c27b04767b4085f109a3bbbd555ac9e5acad2f673d5641fee433235b5a5410236ce32e42d3b11ce06d3199dec76c6e41aaa2b5dfd14a09b6b33928164 SHA512 991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1
 EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
 EBUILD proj-4.9.2.ebuild 1278 BLAKE2B 832adc77c20d87ea805ac255bd4cf56256ce14d11a982e58cd3243e1944b41cce895645308b2e6a5f6ac8a927126d808ec63e88ec47fc8dff23f5c2dc6d32b7a SHA512 b473463745084c60b535d6d6f91095a9a13ab6f0c7d72b010710d7112b16ee7991378e9bdb227657aaaed90292960160d147f4c988f674612158e6efe2a95a22
+EBUILD proj-6.0.0.ebuild 940 BLAKE2B f9dc8b36da183f28a697f21562ebe79ca5452e4b90af037646a62ee7e48484535682491d71a8ada25282d5426f777caa96c873eb0eeb1c553fa331243f67210e SHA512 948dfd6357fe0d8bad1b0fcc09f9a3191ce023e25a2601a0ca5ad50513b77338183f8648331c91035266f9d753857a8a1805e00785974b2c2b05c7c02477c10c
 MISC metadata.xml 415 BLAKE2B 5bbcea99e5589d2c894dc19eaba8b7893d8965d4c8d25024917fa004e3905c0620a76dfaa34de4c2de156544d4ffdc94e3d05e222cb0b2b2b812ac261d0e9bf3 SHA512 8e98b001981de3b4062d8156577061b92918726c7992a3f96fb3d21c2f18d773efe343839255a4cc1ca69f50d05d16a4c48eb4aabc3db9f40a67ac62adc93e5b
diff --git a/sci-libs/proj/proj-6.0.0.ebuild b/sci-libs/proj/proj-6.0.0.ebuild
new file mode 100644
index 000000000000..24521583e3a7
--- /dev/null
+++ b/sci-libs/proj/proj-6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Proj.4 cartographic projection software"
+HOMEPAGE="http://trac.osgeo.org/proj/"
+DATUMGRID=${PN}-datumgrid-1.8.zip
+SRC_URI="
+	http://download.osgeo.org/proj/${P}.tar.gz
+	http://download.osgeo.org/proj/${DATUMGRID}
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="java static-libs"
+
+RDEPEND=""
+DEPEND="
+	app-arch/unzip
+	dev-db/sqlite:3
+	java? ( >=virtual/jdk-1.5 )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${DATUMGRID}
+}
+
+src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+	fi
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with java jni)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 786258edfc33..bee79345f95d 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -14,5 +14,5 @@ DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd02003
 DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608
 DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
 DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
-EBUILD tensorflow-1.13.1.ebuild 9980 BLAKE2B 5d0918f56fa7b1697f5c333f917cc359c994c0e36fbdd17fcd303bfed55536293efe2a11aba2e75d119acc76d8794e02ecc0973029567841cb17eb3508d1be1e SHA512 d4340676161f9cbd3a831ba261163be8a9c259d247f25755392b25a7e6d18864f468771c71e65e5deab538b703eee0c48d6d0f339eb099b9d9cf2e99f4ecd597
+EBUILD tensorflow-1.13.1.ebuild 9982 BLAKE2B 5c2eafc13c64b2215fa262a596f38b9d013488ca23dbea50f4dfd96a58c20352a6afd40304014b443e30c1becf41c0cfcadbe5858e85617ad5d08ff5bdee841c SHA512 92eeb030be1fe9330254805fffc74e582dfd09b216928038155738ca776ab06d0641728257248b9fdaff40c905ab759a7be6de536abcf04f25969de25da8fd28
 MISC metadata.xml 512 BLAKE2B 39a7fc6dc76945448a9f0e8e9d79866f364d0df5036500a2ab981b6ab6f1170ef8a15e29e3a5a3d39edc0dc441985feaa45ce8069fdfb815ca1419721ba9d870 SHA512 a6dc893a523fa7dab319173914e8602434b8247aee2af6a4adbde29be440097901b0e40193e5592f3849340414a4debce1218ae3895c2c6e7d5af171c463c82b
diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
index 22f3f9300fad..d8f8b29bb7e6 100644
--- a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
-	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/protobuf-3.6.0:=
 	>=dev-libs/re2-0.2018.04.01
 	media-libs/giflib
 	media-libs/libjpeg-turbo