gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sci-libs
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
54 files changed, 576 insertions, 872 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 603cee54f7ae..f0b29cb729aa 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 791516c37f58..dde33d299ead 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,9 +1,3 @@
-DIST armadillo-6.200.3.tar.gz 5442342 BLAKE2B b67b942dcf5da9b878465b2458ce78a61acc1fbc8a05a345a3df70c467e7ac4c3c8a6bac745897fd3b8786dfbce71dabca0d11f9d101df46e9a1d59f7242e84d SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222
-DIST armadillo-7.950.1.tar.xz 4022716 BLAKE2B 9f6961c9745caa4c7347082f77934a90487daf1c03fc342133ef06e13dbfad38cc9e2f8713015b93fc277ae2ccd61302d7ba55f2a82ccd997b67eae481f6442c SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d
-DIST armadillo-8.200.0.tar.xz 4456824 BLAKE2B a9124c8e15807a00b8495e90934d71a3b270e8bf5c9319fe3a28c2e65ed4d8f23e7ca61992a661e8e7f65244203da65d85514ebd91b9adf7edb055551d9177d0 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-EBUILD armadillo-6.200.3.ebuild 2992 BLAKE2B 29a1dd94fee4f8e82447a65921cfa8ad3d3c632fa86adfb6c29b98ece345f60042768e793d0df5ba3af4f0d24ddc1f7b19f0eae7b3b957acc304174cb9300b59 SHA512 39ac3f773cee2493e4511f51fa9a37bad89b2507aad03298bccacec1d4f76992dc3805b3a79fe81d0bd7fcc02db2c879e9237cb88c8925f6562712ce895da918
-EBUILD armadillo-7.950.1.ebuild 3377 BLAKE2B 7cb31f807a6e4c9114eda569b74795bf94f806b2640485be49069793f4b100b611166724d1ef6d8f78aa1afacbed73834f6d2e82e8ed268123d9222e7b52773d SHA512 e585c4981c3c8338594f6cbb3feffdd869afd4c9bd41446f2c33f22443fca24ea747514e27c5e5e4fb9b02f3cacf3ccc0cfeffd89843a8dceabc6a837715fdc6
-EBUILD armadillo-8.200.0.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738
 EBUILD armadillo-8.300.2.ebuild 3376 BLAKE2B 3919b3ff29586060911230a35fa61aa590cec61f982c9b817ad468eea146ea142cc6fe021a4240ffc7bc3562e1349e59f76a868a2632f03bc9a626da0811f08e SHA512 4983eb6be844203df5ebb1cc15d2005ec953c05af300ddcba5d656f4cbf03207998a0c198afee9e43d81d7788799b31d4e13a929f74399dc55120ede0538652b
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-6.200.3.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild
deleted file mode 100644
index 74c00365c047..000000000000
--- a/sci-libs/armadillo/armadillo-6.200.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/6"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( sci-libs/superlu )
-"
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
-		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/examples/${PF}
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-7.950.1.ebuild b/sci-libs/armadillo/armadillo-7.950.1.ebuild
deleted file mode 100644
index f51cc63bdf42..000000000000
--- a/sci-libs/armadillo/armadillo-7.950.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-8.200.0.ebuild b/sci-libs/armadillo/armadillo-8.200.0.ebuild
deleted file mode 100644
index dccb43520ea1..000000000000
--- a/sci-libs/armadillo/armadillo-8.200.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index c2e4d887173f..1ff7d7998db4 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,7 +1,4 @@
-AUX exodusii-5.26-multilib.patch 3148 BLAKE2B 09e88bebddc10fb1940ec14c43a75352059f0fe07082b75adfe4a494371f67da1649b85eecee6e27b3fbc36ee77c9864b27f8e3d458b3f8adad28dfb07313ebf SHA512 f37a2463b7c8a243a6fdd690e8a2b18601188ba144862842833e81120226c6969f4ed815eef89a3b4f47b2fa55dbe3d0799441783f4acc478eaeed4c0217644b
-AUX exodusii-6.09-multilib.patch 3125 BLAKE2B 9b6151c227d235689f99155e53c20053adb0cbcdcda265f2e66c4fb7c4ddf2da36d3657d9cc43ec723d6f5ef8e099acfb94a4b9a40a1f3bbbfddf3bc917fe71b SHA512 7575ea71ed4d21135c6ddeb6932298951ac4d1cdef3b0129104f12c475308bd9224fef4f85233e9ffb644dabba0dec2bdc1819f7d6c0f6b4adb73bc98636f41c
-DIST exodus-6.02.tar.gz 4735364 BLAKE2B 3744bf218e0cc3e8e012ddb61833fd6129f8c394159cc1de9ff4a07af5eb220b468da8148aa3cf70a32aa6d776a10db57aee8576c1592707a1db6c353a639b06 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0
+AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD exodusii-6.02.ebuild 1156 BLAKE2B 7c10f3a8506bdde2165f00eb5a339e623b4072b95e8a8db6f65d4655d7eaef46772a187128fc65ee2098ff074e62bdc000d10241b0e576183b0f4949836601b8 SHA512 916371ad1b1d62e046b4f52f9b88b32292fc8cedc456aa3d4a469757bb7eb1ddf7ff1d610ddd466c4745b3cc6b495fb436fe634aab6a025cfffbcadd7f708cd8
-EBUILD exodusii-6.09.ebuild 1200 BLAKE2B 004033d07cdd7b20252d7666d1672102f05104eed94cb66d60e2811acc6373ae849774b7f3fe16a2d0f3fd47e15fa7cd4c72a043c49c1685b4aee8699f9f4c0b SHA512 891bf37f0810fbde2cfac9e8141971c3feccc43bd42966ed63af01dd09fbd350c24a2abf48550743be291f91f9aa701e0ff1be9ae0d95eb4c09351dc4d1b8788
+EBUILD exodusii-6.09.ebuild 1196 BLAKE2B c2ec5c8ed0c7665420cfa52edfac0e0deb6c504345775e31324d552e2dd103fed776ad31144f360b0b17ffbb33238130e73d1eb92025992368a4bcae7e611a0d SHA512 93d3dec6907f696c84ff8962dd9d942ddbabb0195e220332537500418d6d916c0281de58774eb4311cb78c5d513a63860a1b40af3a153024f5f581da99fa1804
 MISC metadata.xml 603 BLAKE2B 99e4fc167e1cf5e96571a2024a8b217083a200fa3850d09c2d520939a87608ecc70708dd302f1c292338aa4c07d0a586c77da80392f85c16e2fb122f98c86cee SHA512 9d703efe9fbf4d49438d83bcdca60db2cd9a40f0b853fcf8cd796d9f96d304c84825c9e2cb26ba98f1893e3e85ddd1af8a5e15c4c4e179d6de25b1df98be3a55
diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
deleted file mode 100644
index dcaf91498fb5..000000000000
--- a/sci-libs/exodusii/exodusii-6.02.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2 multilib
-
-MY_PN="${PN%ii}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-RDEPEND="sci-libs/netcdf[hdf5]"
-DEPEND="${RDEPEND}
-	test? ( app-shells/tcsh )
-"
-
-S="${WORKDIR}"/${MY_P}/${MY_PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch )
-
-src_prepare() {
-	use test || \
-		sed \
-		-e 's:Fortran::g' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/cbind/test || die
-	ctest || die
-	cd "${BUILD_DIR}"/forbind/test || die
-	emake f_check
-}
diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index a91a3e96e992..1b8221b53486 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 FORTRAN_NEEDED="test"
-
-inherit cmake-utils fortran-2 multilib
+inherit cmake-utils fortran-2
 
 MY_PN="${PN%ii}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/certik/exodus"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 RDEPEND="sci-libs/netcdf[hdf5]"
@@ -29,21 +28,23 @@ S="${WORKDIR}"/${MY_P}/${MY_PN}
 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
 
 src_prepare() {
-	use test || \
-		sed \
-		-e 's:Fortran::g' \
-		-i CMakeLists.txt || die
 	cmake-utils_src_prepare
+
+	if ! use test; then
+		sed -e 's:Fortran::g' -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
+	local libdir="$(get_libdir)"
+
 	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
+		-DLIB_SUFFIX=${libdir#lib}
 		-DPYTHON_INSTALL="${EPREFIX}/usr/share/${PN}"
-		$(cmake-utils_use_build !static-libs SHARED)
-		$(cmake-utils_use_build test TESTING)
+		-DBUILD_SHARED=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
 	)
+	export NETCDF_DIR="${EPREFIX}/usr/"
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
deleted file mode 100644
index 1d1c1fca6c2b..000000000000
--- a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
+++ /dev/null
@@ -1,95 +0,0 @@
- CMakeLists.txt         |  6 +++---
- cbind/CMakeLists.txt   |  6 +++---
- forbind/CMakeLists.txt | 12 ++++++------
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca372f5..a071d99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -41,14 +41,14 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
-index 083891f..66fd17b 100644
---- a/cbind/CMakeLists.txt
-+++ b/cbind/CMakeLists.txt
-@@ -293,9 +293,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2c
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
-   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
-diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
-index 5ee026c..66ba1b3 100644
---- a/forbind/CMakeLists.txt
-+++ b/forbind/CMakeLists.txt
-@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY
-    NAMES netcdf
-    PATHS "$ENV{ACCESS}/lib"
--         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -28,14 +28,14 @@ find_program (NETCDF_NCDUMP ncdump
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -61,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
- 
- IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
-   INSTALL(TARGETS exoIIv2for
--    RUNTIME DESTINATION lib COMPONENT Runtime
--    LIBRARY DESTINATION lib COMPONENT Runtime
--    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
-   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
diff --git a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
index 3b1b5e2ace7f..5463fba50019 100644
--- a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
+++ b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
@@ -1,6 +1,6 @@
-diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
-+++ exodus-6.09/exodus/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
+diff -Naur a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
+--- a/cbind/CMakeLists.txt	2016-05-10 13:20:06.408385120 -0600
++++ b/cbind/CMakeLists.txt	2016-05-10 13:22:35.378385120 -0600
 @@ -293,9 +293,9 @@
  
  IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
@@ -14,9 +14,9 @@ diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind
    INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
  ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
  
-diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.txt
---- exodus-6.09.orig/exodus/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -27,7 +27,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf
@@ -43,9 +43,9 @@ diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
-diff -Naur exodus-6.09.orig/exodus/forbind/CMakeLists.txt exodus-6.09/exodus/forbind/CMakeLists.txt
---- exodus-6.09.orig/exodus/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
-+++ exodus-6.09/exodus/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
+diff -Naur a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
+--- a/forbind/CMakeLists.txt	2016-05-10 13:20:06.418385120 -0600
++++ b/forbind/CMakeLists.txt	2016-05-10 13:21:25.928385120 -0600
 @@ -14,7 +14,7 @@
  find_library( NETCDF_LIBRARY
     NAMES netcdf
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3e155f1cba33..6df23c34f961 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,5 +9,5 @@ AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086d
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 7988 BLAKE2B 62f4a17522a39a3fb054be6e4d516d3795a3f63481f13bb4a43dbf2fb1c7e62de4f5e9297ffa5bd37eec977acf01c4794c298c342f7544f3fb589c76eee9d0f7 SHA512 674bee0f3e1b2094186ec76255dd252c045642ad9a30619a346dc4fc4f2d65ba9586a02d806a39537dfabff6eb8a96f1ea01139f716b333682e161bd807c52cb
+EBUILD gdal-2.3.1.ebuild 8013 BLAKE2B 8b4b8c647241b9828a6860327c2e58165882417945998029c811a4008c5f12770d811448a993f46bcf5681d7911af63986c9cb4bbcb985e972659db415ecf0db SHA512 fd61d52be4f9529c50b0b6ab6d62fff932cc5e57ef69572d2d4ef6a1ef88cafcc6ef5a59a53e8b0fe663197f60379b0a3665fc756be619a546d1eed0a0faa1ef
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index e1f97f524f2e..65af4595613d 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -276,6 +276,7 @@ src_compile() {
 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' \
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e20aeee6e652..4598bef808ef 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,5 +2,5 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb1
 DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
 DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
 EBUILD geos-3.6.2.ebuild 1342 BLAKE2B 2cdc55473a3c7e2f4cf45b77de88e3e359598e1b9a7f6ee33d221474853ad191c61692ed84b1648204fe71b4e8c3fec70710725a1f30f4c81c89c3607db6e51a SHA512 91f4a1f15927b151e2d7811410dfa3cf4ccee0a667751eb05f6ebdcaa12b2a8c38e0c6ce08018f22da7bb7220ac77846a5975d4dd439c230eb326718a03ea6ba
-EBUILD geos-3.7.0.ebuild 1348 BLAKE2B b1d14ccab7424bd6f3789fed0f482a3ba7729b87db3645e68c15aa17eee3e44eac3be356e7113db6052b916506113a08e37a7f3d92e0f5ddc8c615a98e7b4f68 SHA512 8bc9a1d54600f1092eace39c7d5ee120baa820d4338580bc7bb2ef4613e597986185e72d883983afd59bf07c6b195a3eff6a79ed8b115a09e4d5c508f62b8f3a
+EBUILD geos-3.7.0.ebuild 1341 BLAKE2B 63aea3f6575420ac79fff622b78a0163e50c869a834aae6cd1a3c0d4b987ad8cf828c134315c3614ded327cee90fe90ecc53fb8e125613b767de4ace789ed2a9 SHA512 11defd6dcdc8a34580a6c9b1b55a6dd6adf95a44882b13627b12b6e206979f3ade8938a40a4c06f6eb51146bd34fa8574d62323a2c9dc628b6e95c6bcd4b9d2b
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
index 230e09c56c97..0fff8e009461 100644
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ b/sci-libs/geos/geos-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 98e435bacbc9..697ae3ec174a 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,5 +1,3 @@
-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-r1.ebuild 574 BLAKE2B 8c5a200993a7b60fca7b899c7df9986c91f4f378eccf710f123869bdca2c58ef78ade67e513b78c0fb2418cd802bab708392bfda8cb247e01e67241911880e50 SHA512 3b6bf6e3089ce46f58352ae80585235189494cc07dc3f4dfccca791d03de21e59e3594bd0be3b05e57555279435642d80569c98ce2804ea4e456f91de9a55cf2
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-3.2.0.ebuild b/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
deleted file mode 100644
index a4ba79c991d3..000000000000
--- a/sci-libs/ignition-math/ignition-math-3.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib vcs-snapshot flag-o-matic
-
-DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/math"
-SRC_URI="https://bitbucket.org/ignitionrobotics/ign-math/get/${PN}3_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}3_${PV}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-multilib_src_configure
-}
diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index 444f153062fa..ba25fca14284 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,5 +1,5 @@
 AUX lemon-1.3-as-needed.patch 1346 BLAKE2B 9c198c0062a47f2da724149a147bd2ab1b798df60ec5a8945249b9d8c09ab94094458ba6df7fc9d17b7e51f57f1268432e2ec3086013b3cd0f174af0ffe1c896 SHA512 20aef0cfc1b6884604a3cf1f4a60feb688ab4d1a958314c242e965195d6cc950062f67f7ef273fc096fe5fcd7a7ee9acb76215c1a6a173587da3b5e76b163468
-AUX lemon-1.3-multilib.patch 437 BLAKE2B aea3b751939620ec8ddc10f586404501b05d5a935d612fd8cb9db2336d728a87cdb0d0c1a9adf541b2e0247cf87b4039ba85bf546cf2fe69377bbbd1081888bc SHA512 6efd7280070bae7bf7e62b28fb6a99e5f2190ddff75f8dd500a629c2a60908670c3ea19aeaf0086059ba9c3c7439e0c835811684dc1c2525c4f8a304a36bba8c
-DIST lemon-1.3.tar.gz 5454290 BLAKE2B f204b84d6ce82d1e942597e40c3b35e0a218d110017bc74d8982d09270e2d94e260e2a62e818e88d69a56a75886a60343b787e2cf05d581b5e520faaf2c73b02 SHA512 f48c14e42e0a463a3d203a05a012fdf635cf09503a5d18e14e64722e9f7f68d7fc223059e0a6a5d118491a473a25196d531e0a6302552f9fb8c121a4ed70af45
-EBUILD lemon-1.3-r2.ebuild 1822 BLAKE2B 84dcdcb8951c75f8ca3898b091b5805af8846f1a474bd22c564c262507c535026dff99e9d2acc30ebd9adb0a9a6dee8a58efe1b96433d476116b1a018280ef9b SHA512 d9fc4a966c4cbfe05f034acc1a3ce8d789aa2b7daeded6bbe95ccc00433ca222e54d78ff9ab6de3b100891058cf3928d7800e27272f80c804c90e99122eb80e8
-MISC metadata.xml 969 BLAKE2B 441103bb2e1358e30c137760af47dd6151f14c54e99ef7dac8cec16f92e4e53150aa38dbd22a18d5bd0f4c794b2a6e78b05c98c9b1a75b6053b5c59ba9d334c3 SHA512 2d83367611c99baa4a589677c752344b4d72ec460456d99ff1cc030f202df32e680b871159532cf5d06472dda596919e8edc23872eb166e25277015c38b9c9e8
+AUX lemon-1.3.1-multilib.patch 841 BLAKE2B 416a2cff88fd4cb1f07a10a9bfe1ca1861c82c70055a30a900bcd622c307b2bd34f87eb1731b6dbe19e1b6e68148cb9d020082cc13ddd24ae375e0db9d0909f6 SHA512 4e31feda5672bcc02bad95d2b794aa2df9d028c655f157f2f95ba0d75679dce68a2cd54e5aa7c6e61f8eec71b7801e57456ca1def3c50d67c17e16a195b9efed
+DIST lemon-1.3.1.tar.gz 5142826 BLAKE2B 23d3b637b4dd32d73bb053b4f5d032e16be787ba162eed6df793f65b81efef6d7ca66d6e5a483b75ac7b1ddb7c8a2698b3b13eb16fcd44e0b726052290082bee SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038
+EBUILD lemon-1.3.1.ebuild 1922 BLAKE2B 1593132815565bc5765507d6834bd6fe233ce6fac41dc01fa77a2e3fa4209c867df336208d8f513670c2b926f2edf6b8e48e7994bdcc013be06d527e2de5537d SHA512 8895c41d7bbed07e57dac8cad33b938c0b859702983a21e92235d768cd27c42fb6a24ce140b4bbed7348def71ded6cfd2a8fa129e9ab5fdbb67031a19a64fefa
+MISC metadata.xml 813 BLAKE2B 1f398a318d3bdf0b2929a992e80f64df34fa71dbb118de41ae369d46b5c1b763bbedf0b623a056e71ecb98befe5b6dbd6fa29fa71ffe3dd2735f2c5911871580 SHA512 a95dba8ed4531ca6563f4a9582933215f7136d13c3ead6d5a0ff5ff765c66d3f085c31908ed547297e28afd6a5ce7d0368f85b8053f8f9ab95da26db667a2afc
diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
deleted file mode 100644
index ee578d4a0f6a..000000000000
--- a/sci-libs/lemon/files/lemon-1.3-multilib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- lemon/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
-index 8011833..0209acf 100644
---- a/lemon/CMakeLists.txt
-+++ b/lemon/CMakeLists.txt
-@@ -61,8 +61,8 @@ ENDIF()
- 
- INSTALL(
-   TARGETS lemon
--  ARCHIVE DESTINATION lib
--  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
-+  LIBRARY DESTINATION lib${LIB_SUFFIX}
-   COMPONENT library
- )
- 
diff --git a/sci-libs/lemon/files/lemon-1.3.1-multilib.patch b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
new file mode 100644
index 000000000000..f2b3cd6bf00c
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
@@ -0,0 +1,31 @@
+--- a/lemon/CMakeLists.txt	2014-07-07 16:40:24.911315501 +0200
++++ b/lemon/CMakeLists.txt	2018-10-15 22:13:12.040890710 +0200
+@@ -66,8 +66,8 @@
+ 
+ INSTALL(
+   TARGETS lemon
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
+   COMPONENT library
+ )
+ 
+@@ -86,6 +86,6 @@
+ 
+ INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
+-  DESTINATION lib/pkgconfig
++  DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+ 
+--- a/lemon/lemon.pc.in	2014-07-07 16:40:24.949315716 +0200
++++ b/lemon/lemon.pc.in	2018-10-15 22:45:28.869931587 +0200
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: @PROJECT_NAME@
diff --git a/sci-libs/lemon/lemon-1.3-r2.ebuild b/sci-libs/lemon/lemon-1.3.1.ebuild
index 4ebb5c672099..3a35fa7919de 100644
--- a/sci-libs/lemon/lemon-1.3-r2.ebuild
+++ b/sci-libs/lemon/lemon-1.3.1.ebuild
@@ -1,51 +1,47 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="C++ template static library of common data structures and algorithms"
 HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/"
-SRC_URI="http://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
+SRC_URI="https://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+coin doc glpk static-libs test tools"
+IUSE="+coin doc glpk static-libs test"
+
+REQUIRED_USE="|| ( coin glpk )"
 
 RDEPEND="
+	coin? (
+		sci-libs/coinor-cbc:=
+		sci-libs/coinor-clp:=
+	)
 	glpk? ( sci-mathematics/glpk:= )
-	coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )"
+"
 DEPEND="${RDEPEND}
 	doc? (
+		app-doc/doxygen
 		app-text/ghostscript-gpl
 		dev-libs/mathjax
-		app-doc/doxygen )"
-
-REQUIRED_USE="|| ( coin glpk )"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${PN}-1.3-as-needed.patch
 )
 
 src_prepare() {
-	sed -i \
-		-e '/ADD_SUBDIRECTORY(demo)/d' \
-		CMakeLists.txt || die
-
-	use doc || sed -i \
-		-e '/ADD_SUBDIRECTORY(doc)/d' \
-		CMakeLists.txt || die
-
-	use tools || sed -i \
-		-e '/ADD_SUBDIRECTORY(tools)/d' \
-		CMakeLists.txt || die
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory demo
 
-	use test || sed -i \
-		-e '/ADD_SUBDIRECTORY(test)/d' \
-		CMakeLists.txt || die
+	use doc || cmake_comment_add_subdirectory doc
+	use test || cmake_comment_add_subdirectory test
 
 	for t in \
 		max_clique \
@@ -60,22 +56,34 @@ src_prepare() {
 		-e '/ADD_TEST(lp_test lp_test)/d' \
 		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
 		test/CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=TRUE
-		-DCOIN_ROOT_DIR="${EPREFIX}/usr"
-		-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
-		$(cmake-utils_use doc LEMON_DOC_SOURCE_BROWSER)
-		$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
-		$(cmake-utils_use coin LEMON_ENABLE_COIN)
-		$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
+		-DLEMON_ENABLE_COIN=$(usex coin)
+		-DLEMON_ENABLE_GLPK=$(usex glpk)
 	)
+	use coin && mycmakeargs+=( -DCOIN_ROOT_DIR="${EPREFIX}/usr" )
+	if use doc; then
+		mycmakeargs+=(
+			-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
+			-DLEMON_DOC_SOURCE_BROWSER=$(usex doc)
+			-DLEMON_DOC_USE_MATHJAX=$(usex doc)
+		)
+	fi
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	# TODO: Upstream needs to see the light of GNUInstallDirs
+	if use doc; then
+		mv "${D}"/usr/share/doc/lemon/html "${D}"/usr/share/doc/${PF} || die
+		rmdir "${D}"/usr/share/doc/lemon || die
+	fi
+}
+
 src_test() {
 	emake -C "${BUILD_DIR}" check
 }
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 1802bf9066b2..92e66a920f00 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>mmokrejs@gmail.com</email>
-  <name>Martin Mokrejs</name>
-</maintainer>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription>
-  LEMON stands for Library for Efficient Modeling and Optimization in
-  Networks. It is a C++ template library providing efficient
-  implementations of common data structures and algorithms with focus
-  on combinatorial optimization tasks connected mainly with graphs and
-  networks.
-</longdescription>
-<use>
-  <flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and
-  <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
-  <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name="tools">Build additional tools</flag>
-</use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		LEMON stands for Library for Efficient Modeling and Optimization in
+		Networks. It is a C++ template library providing efficient
+		implementations of common data structures and algorithms with focus
+		on combinatorial optimization tasks connected mainly with graphs and
+		networks.
+	</longdescription>
+	<use>
+		<flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
+		<flag name="glpk">Enable GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg> support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 282c5bc473df..d1768de69031 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -5,6 +5,6 @@ DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183
 DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca28888969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9 SHA512 56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec
 EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43
 EBUILD libsigrok-0.4.0.ebuild 2115 BLAKE2B f15bc1e01ea4cc389148eb6b3ebc5bc6f1ef42d14662888562ca48a1e1f5a1afe639ebd7755e36994675a461f4c4ac85e962efb4467503d9926ce4f06b51b2c9 SHA512 c0106ee8b697b6932a1ea69721b51e43d84d145ba9050e79afc3dc2e97303f93e73f2e8717a3ea4e6f522ec68830382def004283d32807be5bac647e47f78c4d
-EBUILD libsigrok-0.5.0.ebuild 2115 BLAKE2B b12bec2ba2253be3b93e9e78aa9328ccb0f280c340a71e6aa90dfb560b416ff52a24013f162f4c3cc8896a1b996e63c54ed1ccb520f86e69d3750b11e37083c9 SHA512 0674f759ab0af36e929bccca0867baa9e7b2e38e773222f9c664492766b1ba95c168e2bdd152b69a04a3e97752e4c40e9300cfb80b66417d16a5f236c5eca7f0
-EBUILD libsigrok-9999.ebuild 2118 BLAKE2B 88769b3e391af7d2e077aec987366235e939c80431eb17c023fce2ac4497fef812b8cdac1b5a3d89b8693cbb23e814b5e76defc28c09d05fa298f09c8f7b1912 SHA512 3bf83e9cfad8129dca24c5a61fe984120d3f307923b8a00a3539da823f9e17ded92865883ca65b3c586ae05d7629b6e27931df873c78ebe96667463c4e0ddaa0
+EBUILD libsigrok-0.5.0.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c
+EBUILD libsigrok-9999.ebuild 2288 BLAKE2B d10e435f1b15d58980ddbc9d89c49b68502d2d95ba3fad33b08f2ff916bfae7c3cbf3ddf82b2e4d62e8d94ad09481f5d2c199e29823cf8ab6e40757357520307 SHA512 1c04d587e6adda41c877ea5d8f0a07a89f354b757d1f412d9b91c85a7c575825cce4ff56049eae82d019c7078f0da7644bfe8237358b2ce24f9927098bd34925
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 2119698af8f7..8d56edf96992 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
 	default
 	prune_libtool_files
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index c3a463fbec8a..aeb0f3c4579d 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
 	default
 	prune_libtool_files
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
new file mode 100644
index 000000000000..3877c6abcc6f
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -0,0 +1,5 @@
+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-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
+EBUILD linux-gpib-modules-4.2.0_rc1.ebuild 1587 BLAKE2B 8e27c06ac44e9bbecf2925a9f93380fce2afcd110c37640ffb2ac8abf3c1471217ff601a0e0b831efce053de12ea10e03ef59dab561b0c2da56995f6b97d041f SHA512 d8d26687c404bada61b92a4935f3c7e0680488dc0f8cb8e3fdf1e71feebc95ec7279459009bc217080063e163b875d1e1a99570c6a9fd8db8fd2be6aba78eec6
+MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
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
new file mode 100644
index 000000000000..c3a9764924c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
@@ -0,0 +1,10 @@
+--- 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/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
new file mode 100644
index 000000000000..cba29eece374
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
@@ -0,0 +1,15 @@
+diff -ruN linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am
+--- linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am	2018-10-02 11:32:11.000000000 +0200
++++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am	2018-10-09 12:03:21.272433209 +0200
+@@ -14,10 +14,8 @@
+ 
+ -include $(top_srcdir)/util/linux_flags/flags
+ 
+-#ignore errors from kernel's make modules in all-local, to avoid failure of make install
+-#on nfs filesystem with root_squash
+ all-local:
+-	-$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
++	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
+ 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/compat/include" \
+ 		CONFIG_GPIB_ISA="$(ENABLE_ISA)" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..b08d9a3d45a7
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod autotools toolchain-funcs
+
+MY_PN=${PN/modules/kernel}
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+)
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup () {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+
+	# https://sourceforge.net/p/linux-gpib/bugs/43/
+	if use pcmcia && kernel_is -ge 2 6 38; then
+		die "pcmcia support is broken on kernels newer 2.6.38"
+	fi
+}
+
+src_prepare () {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable isa) \
+		$(use_enable pcmcia) \
+		$(use_enable debug driver-debug) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
new file mode 100644
index 000000000000..b53300ac1ed5
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
+  <use>
+    <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">linux-gpib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 073b7e3e5878..e1e4c01e9bb1 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -6,5 +6,5 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5d
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
 DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78
 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
-EBUILD linux-gpib-4.2.0_rc1.ebuild 4628 BLAKE2B ed09916953f4230719526614c74432ca5722e9a79ee2c5f87c8114442849dc691d5819a3170d3c786915fe6b0eece4c2ae9f1e1acb014b05c119f0b15d0b0f71 SHA512 f29ff1e34b82dd8bde3934b5d9732efe7352a61a8c48f5d94186c4c9398b7a1319ab1614c8145877e9706eb0780678ea82fb98938c42e36f84a371775c97fdf6
+EBUILD linux-gpib-4.2.0_rc1.ebuild 4564 BLAKE2B 2ef4a9d177727d993e5aa30163a055b01463cc8f161b8f23f3a1c2b56be18b03dbbc5c24fddadf755232a106392284447fae97541539776060bfafbc11008c2e SHA512 82188aa008de95105189777f0c47f2379eec67951698ffb60b096f02ace16d288f765678d03f801ca94e8e89dc9ad82a9d2653d42f36d78cef02c7210b23ee53
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
index b378c006c710..5bb251f06487 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
-inherit readme.gentoo-r1 versionator eutils autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
 
 DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${PN}-user-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
@@ -28,7 +28,9 @@ COMMONDEPEND="
 	php? ( dev-lang/php:= )
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	~sci-libs/linux-gpib-modules-${PV}
+"
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
@@ -46,8 +48,6 @@ pkg_setup () {
 }
 
 src_prepare () {
-	[[ ${I_KNOW_WHAT_I_AM_DOING} == "1" ]] || \
-		die "This ebuild is work in progress. Do not use."
 	default
 	eautoreconf
 }
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 3287a1a97f73..ae7b8d9d5389 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,5 @@
 DIST MUMPS_4.10.0.tar.gz 2481516 BLAKE2B ddd3f28bf9627806e9bb5597adc94e2b8f504adf220a8a64ea50630edbde75358bd97e91a53ebd341132a34db5d7248d32a892a060bdf8f205c8aac3b9c88722 SHA512 348df048618ea2086fbe805a90f2e31f57e0db4aa6f4843a0e3c7142bac80fe45e54768e65921657c970bc286b59c2bca91e5006ed8000678f26ba2efe2bfda8
+DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
 EBUILD mumps-4.10.0-r1.ebuild 5585 BLAKE2B 6fa009a933a891b0b31284e0c3f206c21890d0379a502154526b3839cf5d2d67558a47790bcad641eabfef184d12cd09bf6eda8ff99b384fdef5ac65a99f768e SHA512 578f6584f115e6299bac629073701bd8534864693afa7c70f98ed6b0b4edc466e6f242733ec3baaec9b98c61f796a1d822ab10b2671fc90230fb2d73129310ea
+EBUILD mumps-5.1.2.ebuild 5592 BLAKE2B 59e2b9281ddbc2fc0d01eac5282ccbb67bec250899af1aac096ccb449091ee4120c5ca58e4d68906fc7c6759ea0b194ecf545447239fa6992ae96073eaf061e3 SHA512 1050b95e746486e6a3f302f396dd534e362c0baa1228456fcf31d80ac9330427b40f5b7aff281fc2489a73b6c27b16f1cd532e39a5fc6341086f3390b7195fb3
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2.ebuild
new file mode 100644
index 000000000000..725e1ab60e64
--- /dev/null
+++ b/sci-libs/mumps/mumps-5.1.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
+
+MYP=MUMPS_${PV}
+
+DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
+HOMEPAGE="http://mumps.enseeiht.fr/"
+SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples metis mpi +scotch static-libs"
+
+RDEPEND="
+	virtual/blas
+	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
+		mpi? ( <sci-libs/parmetis-4 ) )
+	scotch? ( <sci-libs/scotch-6[mpi=] )
+	mpi? ( sci-libs/scalapack )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
+		-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
+		-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
+		-e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
+		-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
+		-e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:^\(INCPAR\s*=\).*:\1:" \
+		-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
+		-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
+		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
+		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
+		Make.inc/Makefile.inc.generic > Makefile.inc || die
+	# fixed a missing copy of libseq to libdir
+
+	default
+}
+
+src_configure() {
+	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
+	local ord="-Dpord"
+	if use metis && use mpi; then
+		sed -i \
+			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
+			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
+		ord="${ord} -Dparmetis"
+	elif use metis; then
+		sed -i \
+			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
+			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
+		ord="${ord} -Dmetis"
+	fi
+	if use scotch && use mpi; then
+		sed -i \
+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
+		ord="${ord} -Dptscotch"
+	elif use scotch; then
+		sed -i \
+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
+		ord="${ord} -Dscotch"
+	fi
+	if use mpi; then
+		sed -i \
+			-e "s:^\(CC\s*=\).*:\1mpicc:" \
+			-e "s:^\(FC\s*=\).*:\1mpif90:" \
+			-e "s:^\(FL\s*=\).*:\1mpif90:" \
+			-e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
+			Makefile.inc || die
+		export LINK=mpif90
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
+	else
+		sed -i \
+			-e 's:-Llibseq:-L$(topdir)/libseq:' \
+			-e 's:PAR):SEQ):g' \
+			-e "s:^\(SCALAP\s*=\).*:\1:" \
+			-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
+			Makefile.inc || die
+		export LINK="$(tc-getFC)"
+	fi
+	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
+}
+
+src_compile() {
+	# Workaround #462602
+	export FAKEROOTKEY=1
+
+	# -j1 because of static archive race
+	emake -j1 alllib PIC="-fPIC"
+	if ! use mpi; then
+		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+		LIBADD+=" -Llibseq -lmpiseq"
+		static_to_shared libseq/libmpiseq.a
+	fi
+	static_to_shared lib/libpord.a ${LIBADD}
+	static_to_shared lib/libmumps_common.a ${LIBADD}
+
+	local i
+	for i in c d s z; do
+		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
+	done
+	if use static-libs; then
+		emake clean
+		emake -j1 alllib
+	fi
+}
+
+src_test() {
+	emake all
+	local dotest
+	if use mpi; then
+		dotest="mpirun -np 2"
+	else
+		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
+	fi
+	cd examples
+	${dotest} ./ssimpletest < input_simpletest_real || die
+	${dotest} ./dsimpletest < input_simpletest_real || die
+	${dotest} ./csimpletest < input_simpletest_cmplx || die
+	${dotest} ./zsimpletest < input_simpletest_cmplx || die
+	einfo "The solutions should be close to (1,2,3,4,5)"
+	${dotest} ./c_example || die
+	einfo "The solution should be close to (1,2)"
+	make clean
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a
+	insinto /usr
+	doins -r include
+	if ! use mpi; then
+		dolib.so libseq/lib*$(get_libname)*
+		insinto /usr/include/mpiseq
+		doins libseq/*.h
+		use static-libs && dolib.a libseq/libmpiseq.a
+	fi
+	dodoc README ChangeLog VERSION
+	use doc && dodoc doc/*.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 0609bc6ff5d4..8cf7c806ed8c 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,7 +1,4 @@
-AUX nemesis-5.22b-multilib.patch 1885 BLAKE2B 1c678e89e5b5f0ba7d13b5bc258c343d727a93ae32ff1eb64a3de352ad0d9d189433537ab22c8547167adfda95257ecd144016d505a087b9dcab440ce666687c SHA512 d068f9d2f35b306fe9c57b41a065c8c6aea85bfa1f0b4d42c538a17c3563840c014cc0b0f93da79a5bfd98d5c8e6007d6f99d03e92aa534278b90871e7da663d
-AUX nemesis-6.09-multilib.patch 1649 BLAKE2B 620cc881f48b925e4b50fb8306d190ba64ee5bd76d752bb4208a733ece871486964260771096c1894db8a77b28461035ff95e09793bd5a5d5a1ebb5f2ff6d151 SHA512 db01d3afe33bc2f30868e5ceceb4fbe5a0eb10c08b39a72f2d3cb0d363eb837c79bd62e4590a0013602419ecfcb6dcc33eaf656e670d2b25600409e8b07890e7
-DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
+AUX nemesis-6.09-multilib.patch 1617 BLAKE2B 706800577f7ff5865e54502bbe2fb18d64a6c247880c30a1101ede1d27edb5fc3b6e7ffdd6d04c1e84e3b6c29b65042fb0839906ca81fee6971fbd2ea566738e SHA512 4b9b21b67a85c3f4a69a97de1676cd0c8fbc1285737412d0996822d8e1a0e19700e1c5e4990a0dc7cc92db5315415fc8af1d1f3a8a9dfe4fb11cf5cf13e59f27
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD nemesis-5.24.ebuild 1073 BLAKE2B 520b7c8b97e70060d574e0a1f0e1aa1cf6293887b7c5dc034aaee496a6c01e58b5920ccb8b27a3da22477f6496620505d3305594efd5594f5d5d81a52569e897 SHA512 181b306208310225bd22dc328f7dc40c49279ff70a8b504063df2031a5e6ce4eae91b68d54699d6d39a8ba4f72738668dad71b17c0977eaa85dd741039e6bab6
-EBUILD nemesis-6.09.ebuild 994 BLAKE2B f04ec75808a19745daf6965352aa97f19d1b956818c74b8202d1c42ac1394bde3f6a3dced77fa181a37207a93a188c0b01327c887c86333093acf8835bee8c43 SHA512 e9e6e4c3d6c56816144f2d3ef8104a452fa042ec97484b619b0b4c9dee614896a41b89e6625c6c5dbbd57f041ff90ed9e53e3b863417620c7ff5ac0805153ac7
+EBUILD nemesis-6.09.ebuild 899 BLAKE2B 7419ff1d1fe6b888363f0220b014880553aee7fd6f55893c457cd9aaf26e0cf1982209ccb919c39734e1ba6cf3a32ace853c5772f32f0fb1859503556573594f SHA512 537f625ed53c0f361af88f4ddec033b06f25321a2717c4bbc3235f1c38949bf1f9a6ad0aa55eabae652ebe2ef7a9b3e07cbbdd3ade17705305ef01092da479dd
 MISC metadata.xml 1055 BLAKE2B 3ba3589e0f67d44da504eff1e008e0b6ac9b43b9e8eceac9089de61c8333b41b2c04db33bcfc6e3d52e1d083778bd49fdb2702154cebb0fca38e055a44f3b2ed SHA512 bf7702146727a7449c7a0988d64f0036809e3688801a2cca42a8f7a442e4f1f204c0101e50c3ffc98e4a04ee13cc01105c12bad3a480a0179574ae4d1ff6ac14
diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
deleted file mode 100644
index b99add01ea56..000000000000
--- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
- nemesis/CMakeLists.txt | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
-index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
-@@ -19,7 +19,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
- find_library( NETCDF_LIBRARY netcdf
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   )
- 
-@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump
-    $ENV{NETCDF_DIR}/ncdump
-    )
- 
--find_library( EXODUS_LIBRARY exodus
-+find_library( EXODUS_LIBRARY exoIIv2c
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
-+  $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR}
-   )
- 
- # Hack for HDF5
- find_library( HDF5_LIBRARY hdf5
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5
- find_library( HDF5HL_LIBRARY hdf5_hl
-   $ENV{ACCESS}/lib/shared
-   $ENV{ACCESS}/lib
--  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
- TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
-  
- INSTALL(TARGETS nemesis
--  RUNTIME DESTINATION lib COMPONENT Runtime
--  LIBRARY DESTINATION lib COMPONENT Runtime
--  ARCHIVE DESTINATION lib COMPONENT Development)
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
- INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
- 
diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
index d0f05f23a2d2..09b5c9a60377 100644
--- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
+++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
@@ -1,10 +1,10 @@
  nemesis/CMakeLists.txt | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -19,7 +19,7 @@
  find_library( NETCDF_LIBRARY netcdf
    $ENV{ACCESS}/lib/shared
diff --git a/sci-libs/nemesis/nemesis-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild
deleted file mode 100644
index 7a5a5b95805c..000000000000
--- a/sci-libs/nemesis/nemesis-5.24.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 cmake-utils multilib
-
-MY_PN="exodus"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="
-	sci-libs/exodusii
-	sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch )
-
-src_prepare() {
-	find ../exodus -delete || die
-	cmake-utils_src_prepare
-	sed -i 's/exoIIv2c/NAMES exodus &/' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		-DEXODUS_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/ne_test || die
-}
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 4bd332e3b01c..3e18bd12f610 100644
--- a/sci-libs/nemesis/nemesis-6.09.ebuild
+++ b/sci-libs/nemesis/nemesis-6.09.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 MY_PN="exodus"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/certik/exodus"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
+IUSE="static-libs"
 
 DEPEND="
 	sci-libs/exodusii
@@ -32,13 +32,11 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		-DEXODUS_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 	)
+	export NETCDF_DIR="${EPREFIX}/usr/"
+	export EXODUS_DIR="${EPREFIX}/usr/"
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 18879e3c5b07..a31c62ff7002 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -6,6 +6,6 @@ DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2
 EBUILD netcdf-4.3.2-r1.ebuild 1474 BLAKE2B 4a7ae70e9f5442edd52ebff9263ad517345dd5c930af61668b0a013789052a42aae892ad2816368735ef0963c139ef1446a769366fb67dd842bdfb969045e371 SHA512 b5927be5e0c9d3c2833acc9612e2148b7d9fe92a444f0d662a24ee27956f40e5f1be19341ca7fa4ebabf5c0354d4ea43de20553d3d180a32ecc13454e448336f
 EBUILD netcdf-4.4.0-r1.ebuild 1311 BLAKE2B b2a0e74d7ebba7bd0f7bcfd67be94ec68ff389993c568ff72be61e7b48642a62db3e6cfa2a6a9d0375b45274f5c801d1c2fcc0c476370808bdca7388b9b9559b SHA512 16743218eea2154354c57c02b2f3cf76b0c85d9f3d7afa2f7cdb660cbcd7199509fc72a9da6be6b188390ddabe790c29b167b8c33c12835a0a672ac5273df54c
 EBUILD netcdf-4.4.1.1.ebuild 1387 BLAKE2B 35be1dfd64aeb91426dc92850d40e1ea066c1c0aeb29bbdbc9a280dd38680ee715bcddc24b33c3caafe428d0aad0ea17b5f17a605c89d1fad27238895ddd1978 SHA512 0023d4da50a3045313fa0698d6f867050c95e8e22cc882dd5d50a5ebaf7089f9b6d4ff521588a6c22f0be521d84a0c5fc3176005b2ce9ad6d878a725d4483944
-EBUILD netcdf-4.6.1-r1.ebuild 1304 BLAKE2B 3c8c2d5a9953efbe47beec71748301be6599f8eebbc98853932e10e90cb79d7519d72649b8f9b1249339216c1a897c9b98d7f6986b7a253e97a022623f1a42f8 SHA512 f809c16b23972993dcfb9f0a6cb9a53555ed02454ae7e8025cdb3aff7b52bb9939ed07800a52ee66c335c76956f96384f9efdd49a53283b3f1aca864afad47fe
+EBUILD netcdf-4.6.1-r1.ebuild 1303 BLAKE2B 1de11a2598f0be06756961a2238afe07b89a7e1f047227fbd9ab41c2791e189d6eaf8e0a14a24f5cac1084da97fab7a2b88849dab01be7b27829fbb42f456f21 SHA512 ed61101c13ec79900be83ee002c03ec9f26e5b95bad64cbf1c941678f037b7ad5dcb48fb3fc6987f765bb70fd976999e78a3e5d58349cfb9dfe32c6ce24195a1
 EBUILD netcdf-4.6.1.ebuild 1309 BLAKE2B 1f3b940aea083c0f02a6266e323edd8693d3eb97a9daaabd142950237c3345ae0154e69e221fa6ce6bba1897b005d55aa74cf567850ae0b45445d86b346c34a0 SHA512 982b9c8923f7223a794b3ac82967fa33fdc646d3e7493a54d02a2182b2e927a78e3672e32045151833b51a949db2ce715211ee4e9e67a42fca9fef88250605ed
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
index a37c4a93ef33..3ccbe77b51a9 100644
--- a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="UCAR-Unidata"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index e8967bcb7b78..d93c4aa9e24a 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,3 +1,4 @@
+AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
-EBUILD scalapack-2.0.2.ebuild 1540 BLAKE2B 242720d4449a61a52f3507d3e252c6201806d970c625dab93afa7bd3a86137b9c835e49277237db428159398621080ba77735df6f884ce2dbebee0f23d84d935 SHA512 653d3002b4a16ddc5e8b9de2b6b7918e8a7380f5366d7bcd7506ce9c2fc3feb9547c2b9a6af4b85711c46d378282af29435fad60b43f5fa61914786bfbc7bbac
+EBUILD scalapack-2.0.2-r1.ebuild 1586 BLAKE2B 028aef875fb1a867d43a0f07297352786aeca0292765bdf6aa3292022277e470ba5e426dc33c45c100a0fcef339c26835763a00bdfa5f0617505c0b67fd5cc3f SHA512 e39ccd1cd62ad9ff94d1eee1358fb49fe5b2da4fdf0e18e224f5d44344b5b01b31019e53eba1f82a8b728ad059e4f25a1e7d347ceea94d3d8c22068e5cd17491
 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0
diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
new file mode 100644
index 000000000000..a1604a8fd856
--- /dev/null
+++ b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
@@ -0,0 +1,45 @@
+--- a/CMakeLists.txt	2012-05-02 05:58:24.000000000 +0200
++++ b/CMakeLists.txt	2018-10-15 23:57:22.716171671 +0200
+@@ -101,8 +101,8 @@
+ # Organize output files.  On Windows this also keeps .dll files next
+ # to the .exe files that need them, making tests easy to run.
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
+-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
+ 
+ # --------------------------------------------------
+ # Check for any necessary platform specific compiler flags
+@@ -163,8 +163,8 @@
+         PREFIX ${SCALAPACK_BINARY_DIR}/dependencies
+       )
+ 	  if (UNIX)
+-         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE)
+-         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE)
++         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE)
++         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE)
+ 	  else (UNIX) # On Windows
+          SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE)
+          SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE)
+@@ -283,7 +283,7 @@
+ if( NOT LAPACK_FOUND )
+  install(FILES
+   ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
+-  DESTINATION lib
++  DESTINATION lib${LIB_SUFFIX}
+    )
+ endif( NOT LAPACK_FOUND )
+ 
+@@ -303,9 +303,9 @@
+ install(FILES
+   ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
+   ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}
+   )
+ 
+ install(EXPORT scalapack-targets
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION})
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION})
+ 
diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
index 68ade1f4a1ba..3e60e55da8f2 100644
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils eutils fortran-2
+inherit cmake-utils fortran-2
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
-HOMEPAGE="http://www.netlib.org/scalapack/"
+HOMEPAGE="https://www.netlib.org/scalapack/"
 SRC_URI="${HOMEPAGE}/${P}.tgz"
 
 LICENSE="BSD"
@@ -20,10 +20,14 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
+
 src_prepare() {
 	cmake-utils_src_prepare
 
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
 	# mpi does not have a pc file
 	sed -i -e 's/mpi//' scalapack.pc.in || die
 }
@@ -34,7 +38,7 @@ src_configure() {
 			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
 			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
 			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-			$(cmake-utils_use_build test TESTING)
+			-DBUILD_TESTING=$(usex test)
 			$@
 		)
 		cmake-utils_src_configure
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index adb13858a205..50a7d20ad733 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -29,4 +29,4 @@ DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 EBUILD tensorflow-1.10.0.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b91d1a864f9b641bfab2b4522e73c669bc80641ad8feb5134926ac70eb8b3dee1e8551508ba25ae0c93fe59f713aba4 SHA512 29cf0984492d506aebfcab35e6c889e497c8771a8cf5974abf2b5752b2ea4d082491149f76beb3cc66eda7dd1d173322bab478df5fffe02494eac58a6154541f
 EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368ba1e4abcf3996c4b570aa599d4970a5fe709d53152b4a6d35326610ae09e128fd6b674fc1176677ba60c9d3849f896d SHA512 696fd969e06a4f2390ad420d6e713a5f7b025034630593b7f8644509622fda1d766af1737ae5174dcccdff80592b5a0ae6d9f5a3ea94383c4e947688b26e8daa
-MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
+MISC metadata.xml 641 BLAKE2B 6e87fea81b3a1cdbd96bc190a2b39509549a6c3fe384597c394e142e20f0005329df309edf03d7c304e8adb62876a33c8d0c54161e5fb09fbda1df7e9d774fe3 SHA512 42fe38c07d34999da7cf47b780e69b4fa65245763761a915bd35af3d4441f583f477fd84952680d736be8514a049f49ab1dad9a7d4a6963baff00f94f5efa308
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index 5fc9f21f4638..1dca7af5e0f3 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
 		<flag name="mpi">Enable support for MPI</flag>
-		<flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
 		<flag name="system-libs">Link with system instead of bundled libraries</flag>
 	</use>
 	<upstream>
diff --git a/sci-libs/voro++/Manifest b/sci-libs/voro++/Manifest
index 7f500afef064..5f5d2b8d5500 100644
--- a/sci-libs/voro++/Manifest
+++ b/sci-libs/voro++/Manifest
@@ -1,4 +1,4 @@
-AUX voro++-0.4.6-cmake.patch 5803 BLAKE2B d0d95f17ac824a2689e59d21425dd1c347f3fed17ff6b54f0c19b0a782c802108974f94eca9a399020c030568c7023691c9f91e3f0d79d999c4d992c65d8d5d8 SHA512 547e63a20f9dacf946a927f932150e61fc4a08e22f605dedaf9a1d7c2a24583119d61daadb7a657f0bbfbea121687e185ebd1f300abc08c9290ee45a342bd3f1
+AUX voro++-0.4.6-cmake.patch 5811 BLAKE2B 2d0e54fdbc4b3603624365a08c2b9cf76271a403308ade16c36b74c01b3cb7273d47fd25ff9d6eccb3ed292ac87d9256e827276dd4034064167b335856eb48e1 SHA512 6c8d8168432a5cad2713e8fea7e990004f9ff99a5114b0687e7e277cc09009d2545e47ab3389332f3ae342ae71ecae2b71e1cbe85dc5ed20fff29200b95912c1
 DIST voro++-0.4.6.tar.gz 809124 BLAKE2B 0b12f68fe2400d850353171a79aa41dd0a7780dd38d8b7d5fcda6621ba43e5bad60d72a1dd24c3ef9e30d4b63c0be9467062ef33f27138a838f7a984dd3321a2 SHA512 aa8c73d7634bb4ec4c0a7d4d18c0df07511ef975338f2517e6f0ec65de56bac10397adccf1c0e13439d29d096b7cb9b4540d7cfc191a1662f15dc0c3c1ff77c1
-EBUILD voro++-0.4.6-r1.ebuild 494 BLAKE2B 919db050ad8c3681da141c000b245b5ae2eb05697e775402fc20f9fcba2c06fcde75a42fdcb471530751beb0cbe1ac5dd6d8d91c2b3a389421b3fcf1b9092b23 SHA512 ad52da9b5e67151d5d1ab8ff3e9fac5c295a51f114a0cd42d88811fb4e5a5ca9bc56b88d093a28dc972b0624f89cc7390ad65ea9cc13020b07302903692ea409
+EBUILD voro++-0.4.6-r1.ebuild 460 BLAKE2B 84a9160c6aa57179c2090107c2ded1b9131ee4e9448dcdb259d1ca93c3f742c7ec4d810551bdee65148df850fff773039a69a4be4681844f759cd6ac402908de SHA512 b4613a7ebc2b430803c6549ca5a5f57c0eb033486ad3beba2c22b4e116ee5dd215e061833e4e6c2561523ae6ed0630ec1e9a258363b94045e582a18656dbcf50
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
index 375d58f6474e..c848748c5cf7 100644
--- a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
+++ b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(revision 0)
-+++ CMakeLists.txt	(working copy)
+--- a/CMakeLists.txt	(revision 0)
++++ b/CMakeLists.txt	(working copy)
 @@ -0,0 +1,109 @@
 +cmake_minimum_required(VERSION 2.6)
 +
@@ -114,8 +114,8 @@ Index: CMakeLists.txt
 +add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 Index: CMakeModules/cmake_uninstall.cmake.in
 ===================================================================
---- CMakeModules/cmake_uninstall.cmake.in	(revision 0)
-+++ CMakeModules/cmake_uninstall.cmake.in	(working copy)
+--- a/CMakeModules/cmake_uninstall.cmake.in	(revision 0)
++++ b/CMakeModules/cmake_uninstall.cmake.in	(working copy)
 @@ -0,0 +1,22 @@
 +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 +  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
index 1f1aa5a860ae..203bee51e027 100644
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="A 3D Voronoi cell software library"
 HOMEPAGE="http://math.lbl.gov/voro++/"
@@ -14,12 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_configure() {
-	mycmakeargs=( -DLIB=$(get_libdir) )
+	local mycmakeargs=(
+		-DLIB=$(get_libdir)
+	)
 	cmake-utils_src_configure
 }
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index f90ff3a7ad74..90c09bb15e97 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -20,9 +20,9 @@ DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd SHA512 cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-6.1.0-r4.ebuild 10518 BLAKE2B a303880cb6d411975e5e2d2b455385289390411a7bff4fc63fa69121e0f75749a6d235d5581b9bdc63475f87126f5ca6721cca9e7e7ab742a0cfe1fb2a799c24 SHA512 27a5deff359c5fae24ea08b3b697dcdd27e6457d44c594186ff4057ab3d18738cb52af787824c104645d116f44de46081bd3bf48182e29cc3c7b0877bd6d12f2
-EBUILD vtk-7.1.0.ebuild 9334 BLAKE2B 07ec2edf00e7e559fccbec16815d0780b2c1bb21cde482a14eeeb2301a9a732b16ea567fc39593bc2087269b3a34ca86020d8cee23705d3d9fdcfb9e7729fc8f SHA512 93bd46a125ef9993cdf9adde1f2f5ab0ba48bb0d4d9f81d01b792c40aa6a4280a01bfcaf1733c3451344d95fd6a809adf451707cb250499f403aa333f66627b1
-EBUILD vtk-8.1.0-r1.ebuild 9065 BLAKE2B 24248fdc362a1b19055a23d78beac200bbdcd03da33c7f6f1634aad9a1abe3b11ad6cae00eb16a3b7d121fc7ec4682c8ba0f7a32a10f7d65c093b5ee2f2c9f6e SHA512 c131e1417fa5fde3398199f3bb45f73653a4436c6ed09f4b4689af448f568e276f59cae90ddd4d4fe0c01b05741fe88bedc1bbf40e4615c92ff5ee45b33c6850
-EBUILD vtk-8.1.0-r2.ebuild 9075 BLAKE2B aa64cab06dd32cdde01d03ae900448d6a615398261e194bbe120d3e4edd5703f3095481d0490f79b0b3e7228f9482fe4897c400f85462bc9fa656cf5de9c7efe SHA512 39721de229b5bad6d447ac71db98b8472f7879514ed9185bbf4016bccb7903c26aa8df9e87ffbab14fa81a0f9eaeeedd66ce96b704a275b6e879e479ebccd186
-EBUILD vtk-8.1.0.ebuild 9252 BLAKE2B fce898b26eabbb7f80afb9b858289a09cb3a35c288b98d4ffaf76bfa077aa787be2aa2589e313c0333ae7e9b4e2ef14a35ab3eefd6d3058da7801e1a4b910067 SHA512 be0bfdf8611e50bc1ac19460e79f533fd7fac863ac5de1c36777d0dd5ca7244b0fdaefb9129c6cb55a9892fc4054febabcf8521bdb8f13a7b143e0f26ca0f670
+EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794
+EBUILD vtk-7.1.0.ebuild 9296 BLAKE2B 0fd4cb6ff13fe68d9a39bd686a18477fc0f8daad711910135448aacc96e06820251921263dc9517f400454fbdbda26ad5dc9633e98557b2246fe6e8658495537 SHA512 622eabfbb2a4b2c80a6254b09779f05b9354082402f3fead1010767c660b86c0e94413026a27bd06ea8eb7a07bea14d747db3bec51d9b5bf6ccb669d660d937f
+EBUILD vtk-8.1.0-r1.ebuild 9027 BLAKE2B 45d5ef5b8177e418424135b9ee70af8e4d681731584a595bb4108cdff1e8f3fe29f0293bd668fba67967dfcd4e9b7e26ae51e3dea92e72ed0bc7d4589c82597c SHA512 36a149ad672f38d48f767c4381bb04bc4054edd76776430d3157f034f4faf58ddaed43675c712e1d4787ae01f05ed8c2b64988dfb30392a43faeb6c37416d115
+EBUILD vtk-8.1.0-r2.ebuild 9037 BLAKE2B 8f8f89c3d158b826591eb07fe0250c16d0ba9dca9ea11011254152ac37b15bb840a815eb1bcb7b8a7c92524eb12f44d56a5ca16d91ca47b0d2797fa6e43db214 SHA512 5e0285464d4a41370a9e6586f9fb57fa6a1bebc2785f996c9a48d4066022f05103a7f233570cb729a79052a6684c51e682229376afab359b2c56bdbe52ad0a33
+EBUILD vtk-8.1.0.ebuild 9214 BLAKE2B 4705a1ba19eee614686234bb3297f70104fd1b050f51bfd3c16f2c01cc33f745d2fdcf70331dc060852923da8f319cbc554c9296e76d6a742215e3c31990b77d SHA512 34a8ab6760d0b3fbb25dbf9d2c4a9eb5507b7de777bcce509b8d80e92131290d31b747921a1cd0905001b4657c6eba68f6497b024f2ff70cecaa7bdacaccb11a
 MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
index 13badd6cfd51..a24386e16e6b 100644
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -99,7 +99,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		python? (
diff --git a/sci-libs/vtk/vtk-7.1.0.ebuild b/sci-libs/vtk/vtk-7.1.0.ebuild
index 80be41eec4c5..7d06c7c1ccb3 100644
--- a/sci-libs/vtk/vtk-7.1.0.ebuild
+++ b/sci-libs/vtk/vtk-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -96,7 +96,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0-r1.ebuild b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
index a2eaa5fe648e..6524c600faba 100644
--- a/sci-libs/vtk/vtk-8.1.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0-r2.ebuild b/sci-libs/vtk/vtk-8.1.0-r2.ebuild
index 6b84275f59c7..7cad42c1018f 100644
--- a/sci-libs/vtk/vtk-8.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
diff --git a/sci-libs/vtk/vtk-8.1.0.ebuild b/sci-libs/vtk/vtk-8.1.0.ebuild
index 7a718420fbc9..6604f443bb3c 100644
--- a/sci-libs/vtk/vtk-8.1.0.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,7 @@ RDEPEND="
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	web? (
 		${WEBAPP_DEPEND}
 		dev-python/autobahn[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sci-libs
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)