gentoo resync : 19.03.2019

11 files changed, 330 insertions, 357 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 8b647476f407..a5fb3918b4e7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e2ffaa6df8cf..a0b7d1f206bb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,5 +6,7 @@ AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a2
 AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
 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
 EBUILD gdal-2.3.1.ebuild 8398 BLAKE2B 9416c124004315533e54b39f042f52bc59462768f7f43c26bbbb69eef6843d43a1173d17f4d75d939d9d2a812bb3d171381631af6939caadd8488b1ea40ff845 SHA512 f4de15f8d1b1a4e772e2480bd7c5d4ebc68bb5c0bfb03d90acad5a1e1f3868cced22cc1af3d3b90ee85868eb1c5d21dd9a46b32483c690de88ab6ca363ac4661
+EBUILD gdal-2.4.0.ebuild 8302 BLAKE2B acb5aefcd219202c6c7a757b267f96781cb9914199fcba2f549b43eff19f10b1f1c44a9a51aa11abaf3afb66f9a64832e8a18068aa2eda776d93d3d31decb223 SHA512 1423525042e86b4b9309a8aea91a4e43ec4bfd0a67e174c66628faffc516c618892576e69446c345341743962b0b64e9088e737ceb9c789d6b9472cc5148c4e9
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/gdal-2.4.0.ebuild b/sci-libs/gdal/gdal-2.4.0.ebuild
new file mode 100644
index 000000000000..3faf2202c974
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.0.ebuild
@@ -0,0 +1,323 @@
+# 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_{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="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
+
+	# fixed in git master or what will become 2.4.1:
+	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+
+	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/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 0720b75a2d23..53c908179ad2 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,3 @@
-AUX linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
 DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
deleted file mode 100644
index c3a9764924c2..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100
-+++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c  2017-05-02 00:59:04.509950834 +0100
-@@ -37,6 +37,7 @@
- #include <linux/file.h>
- #include <linux/timer.h>
- #include <linux/delay.h>
-+#include <linux/sched/signal.h>
- #include <asm/uaccess.h>
-
- #include "gpibP.h"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 0d6fc7ebed4f..87be8219d4c1 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1720 BLAKE2B 911baede8c9c54591f6f4814adb7babe0c428e38378c519702dc5f4cef65f7feb78bc3c9d1bb22e6673b6cd0ad41821820cc63a5591afb851df43b6353e7d7af SHA512 a733040dd61f37495f3b8a7c9018ecf865b5a48fcb69794c77b6b74164489197ef959b1c8b9b708558fb93782419ca2482ff6dd3ed30313ea67ceb459f6dc193
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1737 BLAKE2B f116e665d36240905d0dc8dd09d53afd668334fb6b8d07ef244aae42a0ef9bf342eef528b74e5678bf6ed21ba2777814aea20b272af8aa493bc610e557845625 SHA512 e241bfda22ed0a12e77cfd72a11099c01dc8122ee20fa6fb604fb2502446e0813f9f227373b2823bd9d3d81442ef8771988488b266e3b2afcafcb3e1460e6603
+EBUILD mpir-3.0.0.ebuild 1735 BLAKE2B 506cfc8aa9c27877d4a4fc3b9bb5621fb00eafe694da5e2b53fb59be4dfc00643fb7cafc5ebaba61e3e45ec82e5c1f4d7587676e24e0190c6a8c5a15f6882a12 SHA512 ad1a6cd4fa6085d16f04efccd95d70c69965e04c495167ca9c8d45760c3c71eabe15e0f88de10d511143d558f10d76fc93c731928e651b2232f6473295340f1a
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index da93b8c038b3..9fd9b3183b95 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index ba9de7da7493..82790b283ba6 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,7 +1,4 @@
-AUX parmetis-3.1.1-autotools.patch 10971 BLAKE2B 52263cfef545a91590635d0d7e4b11766c38d2ffc77ccdc9358c3f1da84384adce155eed356e2bb66a11b92a25f5270a43b3846bca159e0a17c9ebc0258d1836 SHA512 4e0de7697391da0a49b7051f8f58d83ce4865a1cfc63dd0f6cb2085224385b2c951d0f9297f7e291a225b91ab7053a10a38f36ad369c81e2100d3298ed7b9a15
-DIST ParMetis-3.2.0.tar.gz 5291841 BLAKE2B f18b5144f2814a83c3a0b945b1bdbad812cce204e61e762498a98f380d33d79bdb6a4c58f25ebbd44401c7f76edbac602899d4fe8c05ca92f22a91d98f8f7607 SHA512 be7e5affa6ed687c7e8cbef51c5f4838e6302aa7632796f337ed079f15361569d77aa73fc61b876b5c9973e974575571fd1e3e6c73505480b1ecdb7cf801a0d0
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
-EBUILD parmetis-3.2.0.ebuild 867 BLAKE2B 98b33fe947e2c2b596d698d6923c18c7a22c144261d1a1ac2132af047be7366a18932e4e40d2e2a513000e0b895127623be456eaaa4b40da8ef56d7e00643c8d SHA512 d7d4ba4be5f372187796ac6c6d9c80a342b54bb7a01034d84676eca9cff2e88f4cda9c4b6170560faa342038b94616a9444690fa13472372cca48c964feaa0ef
-EBUILD parmetis-4.0.3.ebuild 4083 BLAKE2B a26a6988ac29f6e6107626141a377cb732cafb3b17aa6ac8840f8ae1cf604b6009f89f495c3833f7e7ef3cdb3cbb00645b7860463ced3b46d38f5dd5a4c86633 SHA512 902ca8d5d974ebded7aacaaf5d9d099eb42078b4c3e601a4b250c5fa5689caea6a213bab75abdb0b691c6d42026123f81e9046575fef4e877ccbb99ca71f3e80
+EBUILD parmetis-4.0.3.ebuild 4081 BLAKE2B 47034c2028fea0e7af01c6ca710994686ea79eb9daa902b9c4fc90bb0f67aef3cb820161e89753073beb53cbaed9f1cadba8813929fac3523d3e0297cb5a9484 SHA512 bcba60dc0a2ad5ab4c537b9072b604258a14ad712f85d81f4fc55631b5162e15c29789b3e15054eb1a87b1d631c945a36e3184dda9016d5abdc8bf84bba85367
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch b/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
deleted file mode 100644
index d38a2f7575cf..000000000000
--- a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
+++ /dev/null
@@ -1,298 +0,0 @@
---- configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2009-03-14 11:37:58.804041439 +0000
-@@ -0,0 +1,18 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(parmetis, 3.1.1, karypis@cs.umn.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+sinclude(ax_mpi.m4)
-+AC_LANG_PUSH([C])
-+AX_MPI([], AC_MSG_ERROR([could not compile an mpi test program]))
-+AC_CONFIG_FILES([Makefile 
-+		 metis.pc
-+		 parmetis.pc
-+		 ParMETISLib/Makefile
-+		 METISLib/Makefile
-+		 Programs/Makefile])
-+AC_OUTPUT
---- Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,5 @@
-+SUBDIRS = METISLib ParMETISLib Programs
-+EXTRA_DIST = CHANGES VERSION parmetis.pc.in metis.pc.in
-+include_HEADERS = parmetis.h
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = metis.pc parmetis.pc
---- METISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ METISLib/Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,18 @@
-+pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h \
-+	stdheaders.h struct.h
-+pkgincludedir = $(includedir)/metis
-+
-+lib_LTLIBRARIES = libmetis.la
-+libmetis_la_SOURCES = \
-+	coarsen.c fm.c initpart.c match.c ccgraph.c \
-+	pmetis.c pqueue.c refine.c util.c timing.c debug.c \
-+	bucketsort.c graph.c stat.c kmetis.c kwayrefine.c \
-+	kwayfm.c balance.c ometis.c srefine.c sfm.c separator.c \
-+	mincover.c mmd.c mesh.c meshpart.c frename.c fortran.c \
-+	myqsort.c compress.c parmetis.c estmem.c \
-+	mpmetis.c mcoarsen.c mmatch.c minitpart.c mbalance.c \
-+	mutil.c mkmetis.c mkwayrefine.c mkwayfmh.c \
-+	mrefine2.c minitpart2.c mbalance2.c mfm2.c \
-+	kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c \
-+	mfm.c memory.c mrefine.c checkgraph.c
-+libmetis_la_LDFLAGS = -no-undefined -version-info 4:1:0 
---- metis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ metis.pc.in	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: METIS
-+Description: Software for unstructured graph partitioning
-+Version: @VERSION@
-+Libs: -L${libdir} -lmetis
-+Cflags: -I${includedir}/metis
---- ParMETISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMETISLib/Makefile.am	2009-03-14 11:57:08.006017954 +0000
-@@ -0,0 +1,21 @@
-+pkginclude_HEADERS = defs.h macros.h parmetislib.h proto.h \
-+	rename.h stdheaders.h struct.h
-+pkgincludedir = $(includedir)/parmetis
-+
-+lib_LTLIBRARIES = libparmetis.la
-+libparmetis_la_SOURCES = \
-+	comm.c util.c debug.c setup.c grsetup.c timer.c \
-+	node_refine.c initmsection.c order.c \
-+	xyzpart.c pspases.c frename.c \
-+	iintsort.c iidxsort.c ikeysort.c ikeyvalsort.c \
-+	kmetis.c gkmetis.c ometis.c \
-+	initpart.c match.c \
-+	kwayfm.c kwayrefine.c kwaybalance.c \
-+	remap.c stat.c fpqueue.c \
-+	ametis.c rmetis.c lmatch.c initbalance.c \
-+	mdiffusion.c diffutil.c wave.c \
-+	csrmatch.c redomylink.c balancemylink.c \
-+	selectq.c akwayfm.c serial.c move.c \
-+	mmetis.c mesh.c memory.c weird.c backcompat.c
-+libparmetis_la_LDFLAGS = -no-undefined -version-info 3:1:1
-+libparmetis_la_LIBADD = @MPILIBS@ $(top_builddir)/METISLib/libmetis.la
---- parmetis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ parmetis.pc.in	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: ParMETIS
-+Description: Software for parallel (mpi) unstructured graph partitioning
-+Version: @VERSION@
-+Requires: metis
-+Libs: -L${libdir} -lparmetis
-+Cflags: -I${includedir}
---- Programs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ Programs/Makefile.am	2009-03-14 11:37:15.700900498 +0000
-@@ -0,0 +1,13 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib
-+LDADD = $(top_builddir)/METISLib/libmetis.la \
-+	$(top_builddir)/ParMETISLib/libparmetis.la
-+
-+check_PROGRAMS = ptest mtest
-+ptest_SOURCES = ptest.c io.c adaptgraph.c
-+mtest_SOURCES = mtest.c io.c
-+
-+MPIRUN = mpirun -np 2
-+
-+check-local: $(check_PROGRAMS)
-+	$(MPIRUN) ptest ../Graphs/rotor.graph
-+	$(MPIRUN) mtest ../Graphs/bricks.hex3d 2
---- ax_mpi.m4	1970-01-01 01:00:00.000000000 +0100
-+++ ax_mpi.m4	2010-01-20 20:33:15.000000000 +0000
-@@ -0,0 +1,178 @@
-+# ===========================================================================
-+#             http://www.nongnu.org/autoconf-archive/ax_mpi.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro tries to find out how to compile programs that use MPI
-+#   (Message Passing Interface), a standard API for parallel process
-+#   communication (see http://www-unix.mcs.anl.gov/mpi/)
-+#
-+#   On success, it sets the MPICC, MPICXX, MPIF77, or MPIFC output variable
-+#   to the name of the MPI compiler, depending upon the current language.
-+#   (This may just be $CC/$CXX/$F77/$FC, but is more often something like
-+#   mpicc/mpiCC/mpif77/mpif90.) It also sets MPILIBS to any libraries that
-+#   are needed for linking MPI (e.g. -lmpi or -lfmpi, if a special
-+#   MPICC/MPICXX/MPIF77/MPIFC was not found).
-+#
-+#   If you want to compile everything with MPI, you should set:
-+#
-+#     CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC"
-+#     LIBS="$MPILIBS $LIBS"
-+#
-+#   NOTE: The above assumes that you will use $CC (or whatever) for linking
-+#   as well as for compiling. (This is the default for automake and most
-+#   Makefiles.)
-+#
-+#   The user can force a particular library/compiler by setting the
-+#   MPICC/MPICXX/MPIF77/MPIFC and/or MPILIBS environment variables.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if an MPI library is
-+#   found, and ACTION-IF-NOT-FOUND is a list of commands to run if it is not
-+#   found. If ACTION-IF-FOUND is not specified, the default action will
-+#   define HAVE_MPI.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2008 Julian C. Cummings <cummings@cacr.caltech.edu>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+AU_ALIAS([ACX_MPI], [AX_MPI])
-+AC_DEFUN([AX_MPI], [
-+AC_PREREQ(2.50) dnl for AC_LANG_CASE
-+
-+AC_LANG_CASE([C], [
-+	AC_REQUIRE([AC_PROG_CC])
-+	AC_ARG_VAR(MPICC,[MPI C compiler command])
-+	AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC)
-+	ax_mpi_save_CC="$CC"
-+	CC="$MPICC"
-+	AC_SUBST(MPICC)
-+],
-+[C++], [
-+	AC_REQUIRE([AC_PROG_CXX])
-+	AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
-+	AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX)
-+	ax_mpi_save_CXX="$CXX"
-+	CXX="$MPICXX"
-+	AC_SUBST(MPICXX)
-+],
-+[Fortran 77], [
-+	AC_REQUIRE([AC_PROG_F77])
-+	AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command])
-+	AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77)
-+	ax_mpi_save_F77="$F77"
-+	F77="$MPIF77"
-+	AC_SUBST(MPIF77)
-+],
-+[Fortran], [
-+	AC_REQUIRE([AC_PROG_FC])
-+	AC_ARG_VAR(MPIFC,[MPI Fortran compiler command])
-+	AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC)
-+	ax_mpi_save_FC="$FC"
-+	FC="$MPIFC"
-+	AC_SUBST(MPIFC)
-+])
-+
-+if test x = x"$MPILIBS"; then
-+	AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
-+		[C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])],
-+		[Fortran 77], [AC_MSG_CHECKING([for MPI_Init])
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
-+				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])],
-+		[Fortran], [AC_MSG_CHECKING([for MPI_Init])
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([],[      call MPI_Init])],[MPILIBS=" "
-+				AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
-+fi
-+AC_LANG_CASE([Fortran 77], [
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
-+	fi
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpich, MPI_Init, [MPILIBS="-lfmpich"])
-+	fi
-+],
-+[Fortran], [
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"])
-+	fi
-+	if test x = x"$MPILIBS"; then
-+		AC_CHECK_LIB(mpichf90, MPI_Init, [MPILIBS="-lmpichf90"])
-+	fi
-+])
-+if test x = x"$MPILIBS"; then
-+	AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"])
-+fi
-+if test x = x"$MPILIBS"; then
-+	AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"])
-+fi
-+
-+dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the
-+dnl latter uses $CPP, not $CC (which may be mpicc).
-+AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpi.h])
-+	AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[C++], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpi.h])
-+	AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[Fortran 77], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpif.h])
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi],
-+[Fortran], [if test x != x"$MPILIBS"; then
-+	AC_MSG_CHECKING([for mpif.h])
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[      include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS=""
-+		AC_MSG_RESULT(no)])
-+fi])
-+
-+AC_LANG_CASE([C], [CC="$ax_mpi_save_CC"],
-+	[C++], [CXX="$ax_mpi_save_CXX"],
-+	[Fortran 77], [F77="$ax_mpi_save_F77"],
-+	[Fortran], [FC="$ax_mpi_save_FC"])
-+
-+AC_SUBST(MPILIBS)
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x = x"$MPILIBS"; then
-+        $2
-+        :
-+else
-+        ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1])
-+        :
-+fi
-+])dnl AX_MPI
diff --git a/sci-libs/parmetis/parmetis-3.2.0.ebuild b/sci-libs/parmetis/parmetis-3.2.0.ebuild
deleted file mode 100644
index 7d656c03b719..000000000000
--- a/sci-libs/parmetis/parmetis-3.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-MYP=ParMetis-${PV}
-
-DESCRIPTION="Parallel graph partitioner"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="free-noncomm"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="virtual/mpi"
-RDEPEND="${DEPEND}
-	!sci-libs/metis"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.1-autotools.patch
-	sed -i -e "s/3.1.1/${PV}/" configure.ac || die
-	sed -i -e 's/order.c//' -e 's/lmatch.c//' ParMETISLib/Makefile.am || die
-	eautoreconf
-	export CC=mpicc
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc Manual/*.pdf
-}
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index bb48b4e600fe..5fbc940345ef 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
 	examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="free-noncomm"
 IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"