gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sci-libs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
178 files changed, 1311 insertions, 3245 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a7c8917767f8..e2c3520dec8f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
index e3af13b49435..ccdc0a2483b4 100644
--- a/sci-libs/Rtree/Manifest
+++ b/sci-libs/Rtree/Manifest
@@ -1,3 +1,5 @@
 DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c
+DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
 EBUILD Rtree-0.8.3_p20180802.ebuild 677 BLAKE2B 63182b2364e40bfccfd82b80ed5e9f7d552e276d53d002023572d6791b2ceb6d84c50921c6ee1315b9c17d80e694c22c37f407edc4f44e8817f22e768329db72 SHA512 35f3477cb35cb9b37683d51d08d72336d3bd526600acdfd5e28dc07972468f638633c0880b6b9a43a3735087e1a4a806362c33802d9ebe20fdbfdd406d21c088
-MISC metadata.xml 297 BLAKE2B dc79464a861da2bba0e4d63ef427f0a6d1300ba196b4739ccc8c1827cda2714fe4222c5cac032f6fb80ed0e557ee851bb763c83bb107283b7840dbb8651779d7 SHA512 37da09df732badd85eea558b74949850f08be3039d813e94e33240a68a58fbd13fb9a469382cc234fa399f32a0aa796c0ed11fae44cb00c77735bc1f3df7223f
+EBUILD Rtree-0.9.4.ebuild 495 BLAKE2B b6e693428baa03a3e91ce43ccc413d04d5167fa1f7ba4418f6ddc3e1d24925d96494fb4d6b102af4af28f4a787ea62d4520f4b11d12cd9221c16a7a3a3bfb7bb SHA512 ce8c6940c6f81ef921f5d0e9a599ff24be6c5e65e500375169d5a50f73c21b4e7c3993ab804c11c53b77728b6f900ade6abeb1885870cce326fb63abba127304
+MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/Rtree/Rtree-0.9.4.ebuild b/sci-libs/Rtree/Rtree-0.9.4.ebuild
new file mode 100644
index 000000000000..ee3030b4dffd
--- /dev/null
+++ b/sci-libs/Rtree/Rtree-0.9.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="R-Tree spatial index for Python GIS"
+HOMEPAGE="https://rtree.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="sci-libs/libspatialindex"
+
+distutils_enable_sphinx docs/source
+
+distutils_enable_tests pytest
diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/Rtree/metadata.xml
index f78d3bff8f54..d03728e20d7e 100644
--- a/sci-libs/Rtree/metadata.xml
+++ b/sci-libs/Rtree/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">Toblerity/rtree</remote-id>
-    <remote-id type="pypi">Rtree</remote-id>
-  </upstream>
+    <maintainer type="project">
+        <email>3dprint@gentoo.org</email>
+        <name>Gentoo 3D Printer Project</name>
+    </maintainer>
+    <longdescription>
+        Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing
+        features for the spatially curious Python user.
+    </longdescription>
+    <upstream>
+        <bugs-to>https://github.com/Toblerity/rtree/issues</bugs-to>
+        <remote-id type="github">Toblerity/rtree</remote-id>
+        <remote-id type="pypi">Rtree</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 481add333454..68e1d34c9689 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,4 +1,6 @@
 AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
 DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
+DIST Shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
 EBUILD Shapely-1.6.4_p2-r1.ebuild 1230 BLAKE2B 29cb26d4278e745a60a2ade9de8aa9017bc717334f6c1ca8a29a994260fab52a5d8854cfc080813b5192ce7d5d3f37408f85a2382ec61b43c7e7deacba5d122a SHA512 890f69a44cd91c69c1e486c4c8b6e8a3388a213b15de9249770abd4df98272e46a0ec8383b1ab916f1f66b6e98fa1cc3ebcc9b7a1e8d37c8a3c7df86ba59eae9
-MISC metadata.xml 242 BLAKE2B 5314a9f3c3a7dd475d215dc1be8c4fba1947504699ae6658044a1f8d05fa860798ebb24aed8b881a16a89f8eb84d554e2f9a738a2193668807173888bc187f56 SHA512 0d12ba53a623b64840750891b600f6fc2b4f857f8766557c54cf7a0ef473320b0bc09bab1d50d6ce2c8284fcf7a10b3aa1df8d43d9b10274101e82e1a7b1db94
+EBUILD Shapely-1.7.0.ebuild 771 BLAKE2B b4a44431198e9a5ff19b0389a43d4485ebffb630590f6706744b73236f0ace0408e7120804b37b1deaa7a8e51a010bdb8261579ebc8675f38b5bb93092b56e02 SHA512 18d77d5124d8725f3b537f2bca0099177d12ad9c04df054273ca4fb22e71982415c16604ff604e9ac7f1eb46f60c57f70ef1d333914ee2db4942a15096d720ac
+MISC metadata.xml 897 BLAKE2B 7901faa7b96b6337282ffcbc681d856509578e9fb32187c9e7cb23d8467a7b426bb949c5d816702c2ff30c1d730630dece0080a97db4690bfd1e0b662cf401b7 SHA512 04166dd09e200b93e259bbc8c0b08e17049e8dac2dcc573310be4524ecc7da0b45b667405020dc282de725e54a7123fb05389419808328521e432b55dfc22bb0
diff --git a/sci-libs/Shapely/Shapely-1.7.0.ebuild b/sci-libs/Shapely/Shapely-1.7.0.ebuild
new file mode 100644
index 000000000000..83aed726c948
--- /dev/null
+++ b/sci-libs/Shapely/Shapely-1.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
+SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/matplotlib
+
+python_test() {
+	distutils_install_for_testing
+	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/sci-libs/Shapely/metadata.xml b/sci-libs/Shapely/metadata.xml
index 8c6ed6fdd97a..fba577d3fb03 100644
--- a/sci-libs/Shapely/metadata.xml
+++ b/sci-libs/Shapely/metadata.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>expeditioneer@gentoo.org</email>
+    <name>Dennis Lamm</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects.
+    It is based on the widely deployed GEOS (the engine of PostGIS) and JTS (from which GEOS is ported) libraries.
+    Shapely is not concerned with data formats or coordinate systems, but can be readily integrated with packages that are.
+  </longdescription>
   <upstream>
+    <remote-id type="github">Toblerity/Shapely</remote-id>
     <remote-id type="pypi">Shapely</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 0c2bb022cec8..6ae9f314a39b 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,3 @@
-DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.3.1.ebuild 739 BLAKE2B f92ddd0fc74c0e1940975e1536f3a56364125a40f0ded5660c9c9dafa04235628b6e10c0aacb03abbc6faad134a2e91b88990475f9222ff9bc6fa1361ca224a7 SHA512 96e2ffe647415968e1824faab20011008db57a3d810d562dd1e45107881512dbe14cf106ea05022f8e22b0a6ca12c5bff0e5c461efaa338b09dca2e2d30534da
-EBUILD amd-2.4.6.ebuild 718 BLAKE2B 932f6b127a62562c0d86e2e472246f0b9dcaca68d4eb1eaf440eed72e071018fadc3c5c42c290d146a38847aa38a2d3feb9bed7f38a99aea777057130f5c1d9d SHA512 593178c8259d83a56d2fdf80149aa6b631e9feecabb5944e702f06b2499104c9d08dc8482ee24a3f9211494256f6b748b8606f29ebb6a1a0f5a0348c446746c5
+EBUILD amd-2.4.6.ebuild 781 BLAKE2B f4647eb197bc38a2fa0f9dcd38ecf71afde48cac512d46a31d21c87b4e94a32e480983bdcb456970aaf07c02f43c028fa0261ed00b07bd718313372171a824e0 SHA512 73b3a9d3d76d8661194a3ecace1de7856fe584fb73882214a24c3bec0d24cdf5a9a4a2126dfe0f7d81028d2e9ed71d8c88d716cc71dd1015a6c11156095421a1
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
deleted file mode 100644
index a0bb445c716c..000000000000
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc fortran static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index ccfc70342cb8..e63da81355ad 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -11,17 +11,24 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc fortran static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-REPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_enable fortran) \
-		$(use_with doc) \
-		$(use_enable static-libs static)
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 1ae24ed7116d..643744e18c0e 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -5,6 +5,6 @@ DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc81
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
 EBUILD arpack-3.1.5.ebuild 1550 BLAKE2B 0b18c51eff62ef6f0d25cd4692dfe0c6fe4b7148276427c69aa07eb487596ae624384140cb7d7cfe8939d8edd21ec4c361904220a309a5ca061e92e41faf0f35 SHA512 201b1020fda26b59b2b8c9b989500039a7d73718d4fd9531234f1a20e1972d33ba1ac827139ef0e453452cc6d358c7eabd568b2fab10ca2597d3bc2a473c292b
 EBUILD arpack-3.4.0.ebuild 1404 BLAKE2B bf8e09e30ec596ab74d018e18070024bc08f9330111b79df485319cfa4fb11c233e5e6fcf028494954944da04d29106f30705bb61319381adfbc023a94d9b375 SHA512 7bd4c57f74ac17f1f50943e521c67aef50c65d16fb6b065a4a955e4cfab53fb7bb0a58e4925e9dc2e2eb8747ee9ffd4b5217f3e84c6b3ed5d23f2c0ae30c06ac
-EBUILD arpack-3.5.0.ebuild 1411 BLAKE2B 646f23f6893c1bda8d0c3942603a07ed7b033d5995abba9e9d61fe1bd0b52e3d86d0b5726cadec888797ee10cf8af161c92d0b7814ef7db64bd4a253e99ae1e7 SHA512 67d8cd863f235f6472273a8d4ee882685112791d33ef63bcecf732b0e0de44c10ff010e8ae691e3eaecb86d5e8a22fdf8de5da0c6c48badf7f540c81ed21af80
+EBUILD arpack-3.5.0.ebuild 1475 BLAKE2B 280c8b025a95d2f50ae9403c64c68681f40a65d55a25720c6fd5146be664b1b9b6dd46fc8089785e47d023f230a2a5ffe149c6e93e1367b2050bfad9d4d9112e SHA512 932ddcac59c36b5dbf86adc8fb79b73ab4ed7b4090efbd159db524af8e82c6b16c9afbe3d5306345d17a675951d79497f014619663ba40a55f01634e593e6c0f
 EBUILD arpack-9999.ebuild 1247 BLAKE2B bbbec3f3b0fce5ffc831382cd9257e7db4a2c118cc64ec7954d457dbab5943f546258a61a22f2d2bb3a6617df0b61e26869698c1aba2c0bbb1b871d85b78cedd SHA512 00dba333d657689664eff0120eeaef5f9753d9169ee644004aea7099279c1d443be9c170a9d2ef570d8d2f2be7b795914767547150d95ca1cec17f05eef51fe1
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.5.0.ebuild b/sci-libs/arpack/arpack-3.5.0.ebuild
index aced391f4b38..fe0ae23d0c28 100644
--- a/sci-libs/arpack/arpack-3.5.0.ebuild
+++ b/sci-libs/arpack/arpack-3.5.0.ebuild
@@ -56,4 +56,7 @@ src_install() {
 			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index 4ff70c136aaa..c3bfb54ed04a 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -1,7 +1,9 @@
 AUX bliss-0.73-autotools.patch 3117 BLAKE2B d74cd207311cd1f6ef5be1c5c411493542146e8ba69fe0e40392458f758eec84411eedbe075ae8f3669fb4e8b6cdfb9e09db077c918db5d1b7203275d6004b05 SHA512 98333e4d97eca83776148b06e8ec41b283fa2a85a77a2c1281084a5af5efefb22ca34b9b6a11e2b9fdb71af944c6c56247291ea6721bd6d6dcf855e73116351e
+AUX bliss-0.73-clang.patch 457 BLAKE2B 2875a16231e17d6cb8079fc67ad74df69b126d626cbbd7ccf588d9e96da7fcf8e3d645af876e2311d415a37985e68c0df72aa53b5fbb5691d9dc45773e42e226 SHA512 f496b178645a34ed65dbd4829f7bd1a9aaaf7c1e91e50e2c0e8957f20c5908728ba307c2afcbf6912fac3cb927d6e9a07ba27b4bce327c6061912f6afe883402
 AUX bliss-0.73-error.patch 14317 BLAKE2B b053cf310604c57fb4a51d3c9dee8f780b7ad55d8c2b955cb033ac342f64d50aa18c064604f68206c8fce8c08f89bdb0faeb48701c8255beff1034326f93e261 SHA512 d4adcd652016d4b62e4b366cdbd5bd60f1dbaf89619e1d8d4dad6092a3dbb4e27e12aa13c1fc1f12481f144696b2e1392ecbc67dab0485959450d39013613a14
 AUX bliss-0.73-rehn.patch 1669 BLAKE2B 6e109c0bc59c0000603dd59467b989a572f502aa352a4b09cec85a608f90163175cb4babcfbc8495a246e8a3406186feeda366131c3c637a9aab93d9c698d36e SHA512 ae70ebcd3d9ef2f744e951dfb9cc2b48bee741ee7ead557a0fdfdacbd1895b015bb9a8da986fa36b084d4c92f7a28adad1df14c0814847d84c46f73cb69123b7
 AUX bliss-0.73.1.in 1482 BLAKE2B 740fc9aa59ab9ea7819a1785aa3f0609774f0b89b08ffe3276b002f0f55eb5332ffda4952a54aa91f621ec533e1cf08b734a9686ca727e528a311d209401782c SHA512 7eb1d08f9c40358ef986d8fe31d42eb90dc57879cb399f45dcf5df85eecdc6fd86208f1bf06c21a6875e5a3fb5a634d818edd75ce2ccd855910feeb22b714f4b
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
 EBUILD bliss-0.73-r1.ebuild 1043 BLAKE2B 764f07e6857243a5d043718b3c70ee3a76809c581f514ff000ba22d6278e2561aa1f039a546d41494301fe148395ab29ced93fd9e57f58c572c975da8b9d657a SHA512 81c15201073a7151be82baeb4438f9677332c30b89f9154c55e62e4438caa8992558f307f60f068d53f216bddbf9b9fa7006d44bb1afbba29db4d7ca562b0b46
-MISC metadata.xml 377 BLAKE2B b5594a48d54d5813fff3f3fa785c528170c1892573d7e94efd0371899afbf01c357f994f8694a9d5f9d74361b15f1d560402d913ce4d2f15c425dbc86d841dbc SHA512 c1a74f1feabe9c0b1179889514cffb7bf130a483990de7d235e177e345c0d1813c09b9751a1c94ced6f9d5c19b1428a0d62ab4d2e8876502dfeb5b7f5806afbf
+EBUILD bliss-0.73-r2.ebuild 1072 BLAKE2B 33e191a48064d3a02b3626f004e2a803d998dfa21d0e1fd699d71b70756f85e1d7d43a0f4425bab89820b24657f5fee0f2fd703bcf782ead4c9fd281444cdb60 SHA512 5c059e2681445fc77f9828c508ef832d0072410c984c9962b391501744c70df8b9e4ce8c31d820071aa4279d1a45c781463a7322add743d955235bcffd0a42a0
+MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sci-libs/bliss/bliss-0.73-r2.ebuild b/sci-libs/bliss/bliss-0.73-r2.ebuild
new file mode 100644
index 000000000000..9293ac0a67aa
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.73-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gmp static-libs"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/
+PATCHES=(
+	"${FILESDIR}"/${P}-error.patch
+	"${FILESDIR}"/${P}-rehn.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die
+	rm Makefile || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gmp) $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake all $(usex doc html "")
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+	use doc && dodoc -r html
+}
diff --git a/sci-libs/bliss/files/bliss-0.73-clang.patch b/sci-libs/bliss/files/bliss-0.73-clang.patch
new file mode 100644
index 000000000000..8a2e4bb6ca47
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.73-clang.patch
@@ -0,0 +1,11 @@
+--- ./bliss.cc.orig	2020-07-10 10:34:44.946000000 -0600
++++ ./bliss.cc	2020-07-10 10:35:36.076000000 -0600
+@@ -59,7 +59,7 @@
+   else program_name = argv0;  
+   if(!program_name or *program_name == 0) program_name = "bliss";
+ 
+-  fprintf(fp, "bliss version %s (compiled "__DATE__")\n", bliss::version);
++  fprintf(fp, "bliss version %s (compiled %s)\n", bliss::version, __DATE__);
+   fprintf(fp, "Copyright 2003-2015 Tommi Junttila\n");
+   fprintf(fp,
+ "\n"
diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml
index 0668c1ada0d5..9b3cd6685a18 100644
--- a/sci-libs/bliss/metadata.xml
+++ b/sci-libs/bliss/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
 <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index 29ec3a67279c..1065c65d71d5 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,5 +1,5 @@
 DIST bmrblib-1.0.3.tar.bz2 51246 BLAKE2B e2adc970523b33c88b73451b1c3d50c218e4600e0e1019bb6fa4dbae1c6a6737bcd1661bf68b6863a1199c46f3df1b0ba36c155efe1010152e120ccc23b034ab SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248
 DIST bmrblib-1.0.4.tar.bz2 51211 BLAKE2B 4d901c085648971af0e271d5524d4fe0f0e085f9ab34cde4cbc2d7b17d1dd37ffd4051c219e769738a9eac8b11b6950c5575d1bd9b9193ef48a698560de3fd96 SHA512 579f3beaf343416c58b344a33ee94d42bcedba558b33c2b9f98662d2ffc685887617229b5f7e75acf61712fe4f03827ca4413bc08e3bd2e72f69d952310891e0
-EBUILD bmrblib-1.0.3.ebuild 423 BLAKE2B 2641bd9dfbc31b3f8ba1fc79b207126772067ba042597a906021f11db824e89642b8118e2f9ab414fd017288413e2603e5fcfba420a13732bda7d7eda45ea474 SHA512 81ce3293ee290b4c0aebbba08d3f203d5501129a13fe6b4c3733c08ba45f595ab9b8e571bcbd880599783a9e46f1170a236a23082f3cb0e07d0b8f3d5c80b74d
-EBUILD bmrblib-1.0.4.ebuild 433 BLAKE2B 95bc15a3674992928c20b4e313f031ddc427d87d08bc2438628e618d5a874eb56202c2848dafbd525c7f8e55a28d5faf1852b411a4c776482ca94050d8107b25 SHA512 45079cddd49a13a65f68cbdf9db07f6d5b2591606f85154fafdf9a5a27e0de6531c407968b95ecf4daed02410d8e1a8b81c9b831d6a4d55711dfb8dd14c112b9
+EBUILD bmrblib-1.0.3.ebuild 413 BLAKE2B 04fabbdb185f55d9b8ee1029599ada8ca9d6fc8e6ab67af917019253ecdec2583ee89e79bdb94f45ac5819804f557f00baa27566c318c76de51dd2cd75c9cec4 SHA512 56bebeb0e341bafb0cb7f7b24b5b4322c9c15c8b13ea98b16b0ae44a5dc0d76f6b81ed6d44cfd0e0b334d2722d6bf63fe2aa3461affd6e0c2f51aaf5d472c4e7
+EBUILD bmrblib-1.0.4.ebuild 423 BLAKE2B c1faf463f55358e92bd9f9bdeb175ad3e11e47330f3be985f8f6cf974ac06ed10daabd7f350c673312d9de665624f006f08e92ee90142f10cd92969e133f05ce SHA512 15114ff8bee909682384780887f7dd2227fe44e5709d8d1268db815af7240a4890f55f86d9f56154f23b148dfce504a0a8fe3a646175ac3ea1785f7a6f3accdd
 MISC metadata.xml 697 BLAKE2B 6448efc90859f836649dc91366bc8662fbccac80ee2079880078238b2c9bd7897cb3337aecc727f2dc2da2f8916e766c25bcd5703d1b0eb4b263c3e3481fffb7 SHA512 c09f4efba0b36032d60b363ff7f18a6b477f6a321c7d8069ebcc4bcd0deee1448c1230e5651371a5748cdd66c9032e8ff7c480dfa3af7a712503f3589d282f28
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
index 3211e7e10710..dbc65bf5220c 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild b/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
index c21725212608..90ffd725443b 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index bede102de565..a1ee9eeacd3a 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,5 +1,3 @@
-DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.0.ebuild 542 BLAKE2B 0c68190981b2db131e18e5c1084e0d5e6fa1db4aaa33ce417078f88b028452ca9bbc4f50b68c14879cc12e0255a1c79178621c5c025251b6f1acba71cf014a4c SHA512 740f280706e53eb3f3803dd1c6c8a9cfbc8044c4125191a68d5134c851946852553bdd0011ad38b45e2725d33b57c5a705c35f769dd61a2f990c532e0daa0b5c
-EBUILD btf-1.2.6.ebuild 579 BLAKE2B 30e1dade2df19f6d517e4b89623e44303ad091aefef04aa2991adb29bd8fcb59ae2d3bab2c05fc727d48d4c26037fdd8083f4011cf61c05e5b8769a454eea763 SHA512 df647131b4c1dd30e89c25335076694142abd12f9b4f0594c733067331e46f007ab6a62f7e408578453132c6cd437c0c4e2bea8b0158c32ac0fbc47a16122f0e
+EBUILD btf-1.2.6.ebuild 577 BLAKE2B cf610a37da10e117c9fb9fb08bd3ec5210b2aeaf4092d6a26a21abc3d36dea0a551690d364b2f6a09ec2373ad6c50deae119c4d2778c278c38eaca66bb702290 SHA512 a9ba52113f48e4792a4cc96a4cf0147f77b0c96992dd9e529b4891233984cdeb0bb4b65bac7ce018481babb76b5b46da661517ee9b01985dcdf8f3bf01b01980
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.0.ebuild b/sci-libs/btf/btf-1.2.0.ebuild
deleted file mode 100644
index 3144388ab48f..000000000000
--- a/sci-libs/btf/btf-1.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Algorithm for matrix permutation into block triangular form"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/btf/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index bf262a549295..74a9c5ca9227 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 708282c2d72d..5aa5b0e61a39 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,3 @@
-DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.3.1.ebuild 700 BLAKE2B 8426dc0e2c549807b159e0822b7574a9a12ae9ff5a52a1ce45985a6c3446b25ec45011404f1e02262b2c54f1d0c117e8002b8bdd24c44bfebb7403d00cd026da SHA512 eecedd765217b255f7301302ffc6115f0925f76244b433d3765a5feca8f1f5e96af80adc9d6f1f25fd7d2a8f6d254d6e8db301fe6c3ddedeed99a1713018510c
-EBUILD camd-2.4.6.ebuild 667 BLAKE2B 33ee7075498fd4c7c84ad09388a973b9ed02d4555d3d5dac7a38de9bb6a5a72a9739aba7a981c42ca689cf89d7c3bc9131a782ce7b41efbcebd48f58795bdd3e SHA512 852291d6bd31990419a8a13a3d1b331312fc8e1a711d074a0e69e6e3ba9a6ce3060fe9b3d457fc78dae4a0c4218a65795c997d9bcc703299e3cd34a6508d367c
+EBUILD camd-2.4.6.ebuild 728 BLAKE2B 7b81c500ff5353cc46d899d60875419380cbb802374d8b2baef0406f55b3f66bc4584b3e1949218fd60e5fdb5874e03a5960ad72cec987d687f874f9cdcd72bb SHA512 26506b332fcb761bfb50c5bc4cc7e0515e2fd13524254687f63b2ec303366b29bb02f2dbd72d9bb1aa2ff20b95ad65b9e32fc115b0c27eabea1767e289f06b44
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.3.1.ebuild b/sci-libs/camd/camd-2.3.1.ebuild
deleted file mode 100644
index c42e1b578dcd..000000000000
--- a/sci-libs/camd/camd-2.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/camd/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 88bf2cf3cb77..81a19dcab527 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -9,9 +9,8 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
@@ -20,6 +19,13 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
-		$(use_with doc) \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index b4ee5e8a3304..51c4f60a2de6 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -3,7 +3,6 @@ AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330
 AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6
 AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-EBUILD cantera-2.4.0-r1.ebuild 2929 BLAKE2B 57eb719f155c1c58024283cea0fd7a667888ce1749be056a644e80f466ac7ed66c854277ae67681a19f6d374ede9a3fb4394f80f4d5802bab77bc28e41807223 SHA512 f1d88be5b54a480735ae55da4a05267c3890abaa80776124234bb5dcb8dd539e6df9d3cf8dd29a1577f9008cc57581e0f6a575b14d1c432599e72f93cbd6967b
 EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705
 EBUILD cantera-2.4.0-r5.ebuild 3072 BLAKE2B 44b04260688a25de14ad1bd53bc5831f4f3354bc0b9cda0c857f86456b7d64e644284e7748ac0949cc5a5b50e3c297bedfdd6f162621eeb8c5d32f3570e318d7 SHA512 a4f702e5a7f4e8bf7c1147bd6a96d2bc51ef99a7c60691deb1f24fd07a78ca8cfb6427a0758912611793272c58a8bf87d66dcaa47b888dc0a3204729c0bb8ecf
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
deleted file mode 100644
index cd27ff27f637..000000000000
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="http://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	<sci-libs/sundials-4.0.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}_${PV}_env.patch"
-	)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${CXXFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-		python2_package="none"
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python3_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index e56c3d7fe4cd..9dbcc5759efc 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,5 @@
+DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
 DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4 SHA512 95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe
+EBUILD cartopy-0.18.0.ebuild 1666 BLAKE2B c6dce73d39a0d0278e00362fa7475048e0e64061f2fe02a66863972e1782a9ebe09d24a76cb4f4d86349675d73603a064df38e9c6a7c43122bbeef625334ffcb SHA512 4206796d8def5cc9bf36f260ea5df748af6fe04b6ce24d777cd409b8b4d41255b15a15c5d4a5a20888a833ee50330ca86ac703ddf82183985d91ff96f4697b0d
 EBUILD cartopy-0.18.0_beta1.ebuild 1666 BLAKE2B c6dce73d39a0d0278e00362fa7475048e0e64061f2fe02a66863972e1782a9ebe09d24a76cb4f4d86349675d73603a064df38e9c6a7c43122bbeef625334ffcb SHA512 4206796d8def5cc9bf36f260ea5df748af6fe04b6ce24d777cd409b8b4d41255b15a15c5d4a5a20888a833ee50330ca86ac703ddf82183985d91ff96f4697b0d
 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
new file mode 100644
index 000000000000..0be07b470778
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/pyshp[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/proj
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# drop test file requiring network access, which got not covered by markers
+	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+	# prepare matplotlib backend for test suite
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"
+	# drop all tests needing network access
+	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index fa210259d394..1a7ae88b15e4 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,5 +1,3 @@
-DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.8.0.ebuild 576 BLAKE2B e594eab1a608c513c2cf32270f4e4011520562610a3064460dfd771b09266ceaa15c95bb727eeef5a9e12577c74c5a2f900a4a92e2cab000f84f6b6a1c79ac23 SHA512 3f0e57a9837be8c4e44e3a07ed507a176a9672e3eca944b14573ad0cd9698b55cb05ba7e2ebdc981f6a9fdf5c5fa93ef667b0de12a743323bbc590d958ff95ed
-EBUILD ccolamd-2.9.6.ebuild 603 BLAKE2B 9cc4344db9c02f4497fd573cf8d0ba94096d5a6b53365612b1ebc2e2375d6b9173a25de02feb7cc713bcde0386e4b978ae49120bf1f3d14ba009b7567332ff4a SHA512 ef4dcba98465e40ffb28e52ea55a4b3882da1c53ec5af724211c4a2d5bbcbe58b5baf9488241385310431290bfd9b83da96d8a1fd66ad09290f76b3345447a56
+EBUILD ccolamd-2.9.6.ebuild 657 BLAKE2B 4c90822b5d78b431748dcf50590e6f3a682f9029048e9705b48d563497a3ad0534b2524cfc2e93e10eca53d047e76868e5ece49d31ce92fe1500a1776f51ac62 SHA512 9f10d4c7edd82dfc2b4b248393f149a65593d35d9b63b4886eac1d610e0ebc7899f663cdbfde217943d9280ac49b1825da46a075f7d5cab3f69fff0489cc6e04
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
deleted file mode 100644
index ec74688df75f..000000000000
--- a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ccolamd/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 1a280d3e0c9c..e86d7e510aa6 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,14 +9,19 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest
deleted file mode 100644
index 8639b6d20b90..000000000000
--- a/sci-libs/chemkit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX chemkit-0.1-multilib.patch 4694 BLAKE2B f52836ec887b9673c8eabac6ca4fb008aa23def355419f02704605438de44457f2a017a56a7fdd3ce387df08e5b57a0352052d2b88ff0e051a6cf47a192ffd1e SHA512 dedde9e5db14f088e5a70ebfcd9f46b6fbb2d60b1800a61ece1f7afef24caac502f129573823807caec050ba1515ad402a3615953b903a239c5287a5b96aa8b8
-AUX chemkit-0.1-unbundle.patch 6103 BLAKE2B 9ee0f121fec938a528abb837ab386fec62a8576b5c7d123538ce95604953f4f30d0b285b27a153ef98629f053954324f7c384329fe3ca6873f2d18700e914ff8 SHA512 9edd39008763b56eb7697562536c4c4d476880a414ae1a305d1af64cee04e4ccb82585cfd15d2f7608b5200e39863a9a97c2a152110b28e501fbd055737ce015
-DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011
-EBUILD chemkit-0.1-r2.ebuild 1904 BLAKE2B 8e047c10ed8fb80fb35bbd6176e508ba13c52e97e458783c42e0d978b001c7367e9427dd1198e86143fc6211d310fe3bb18b5bc091df0ed918f2449e1649f4f4 SHA512 1078f0af1f8b32d324e25e8bd790559f0ce8cd86170ebb52c15318b058ca490e9b85416e9ce1d11abdc607af76ca02093a4f9f356cd7ac80ba75e7be3d257ed2
-MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1
diff --git a/sci-libs/chemkit/chemkit-0.1-r2.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
deleted file mode 100644
index c687d55922e1..000000000000
--- a/sci-libs/chemkit/chemkit-0.1-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 virtualx
-
-DESCRIPTION="Library for chemistry applications"
-HOMEPAGE="https://github.com/kylelutz/chemkit"
-SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/rapidxml
-	media-libs/glu
-	sci-libs/inchi
-	sci-libs/lemon
-	virtual/opengl
-	examples? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" # requires disabled Qt4
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_prepare() {
-	# jsoncpp API change
-	# xdrf != xdrfile
-	rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die
-	cmake-utils_src_prepare
-
-	# bug 640206
-	sed -e "/add_subdirectory(xtc/s/^/#DONT /" \
-		-i src/plugins/CMakeLists.txt || die "Failed to disable xtc"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCHEMKIT_BUILD_EXAMPLES=$(usex examples)
-		-DCHEMKIT_BUILD_DEMOS=$(usex examples)
-		-DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python)
-		-DCHEMKIT_BUILD_APPS=OFF
-		-DCHEMKIT_BUILD_PLUGIN_BABEL=OFF
-		-DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=OFF
-		-DCHEMKIT_WITH_GRAPHICS=OFF
-		-DCHEMKIT_WITH_GUI=OFF
-		-DCHEMKIT_WITH_WEB=OFF
-		-DCHEMKIT_BUILD_TESTS=$(usex test)
-		-DUSE_SYSTEM_INCHI=ON
-		-DUSE_SYSTEM_JSONCPP=OFF
-		-DUSE_SYSTEM_RAPIDXML=ON
-		-DUSE_SYSTEM_XDRF=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test"
-	virtualmake
-}
-
-src_install() {
-	use examples && \
-		dobin \
-			"${BUILD_DIR}"/demos/*-viewer/*-viewer \
-			"${BUILD_DIR}"/examples/uff-energy/uff-energy
-
-	cmake-utils_src_install
-}
diff --git a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch b/sci-libs/chemkit/files/chemkit-0.1-multilib.patch
deleted file mode 100644
index b6a61d58ed8c..000000000000
--- a/sci-libs/chemkit/files/chemkit-0.1-multilib.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e531be4..e0d6b2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,7 @@ configure_file(
-     "${CMAKE_MODULE_PATH}/ChemkitConfig.cmake.in"
-     "${CMAKE_BINARY_DIR}/ChemkitConfig.cmake"
-     IMMEDIATE @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib/chemkit)
-+install(FILES ${CMAKE_BINARY_DIR}/ChemkitConfig.cmake DESTINATION lib${LIB_SUFFIX}/chemkit)
- 
- # Create a ChemkitBuildTreeSettings.cmake file for the use from the build tree
- configure_file(
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 88c6b5f..1100c3b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,12 +8,12 @@ macro(add_chemkit_library library_name)
-   add_library(${library_name} SHARED ${ARGN})
- 
-   # add install target
--  install(TARGETS ${library_name} DESTINATION lib)
-+  install(TARGETS ${library_name} DESTINATION lib${LIB_SUFFIX})
- 
-   # copy library into build directory
-   get_target_property(library_location ${library_name} LOCATION)
-   get_filename_component(library_filename ${library_location} NAME)
--  add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib/${library_filename})
-+  add_custom_command(TARGET ${library_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${library_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/${library_filename})
- 
- endmacro(add_chemkit_library)
- 
-diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index dc8970f..77029b7 100644
---- a/src/plugins/CMakeLists.txt
-+++ b/src/plugins/CMakeLists.txt
-@@ -3,7 +3,7 @@ macro(add_chemkit_plugin plugin_name)
-   add_library(${plugin_name} SHARED ${ARGN})
- 
-   # add install target
--  install(TARGETS ${plugin_name} DESTINATION lib/chemkit/plugins/)
-+  install(TARGETS ${plugin_name} DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/)
- 
-   # remove 'lib' prefix
-   set_target_properties(${plugin_name} PROPERTIES PREFIX "")
-@@ -11,15 +11,15 @@ macro(add_chemkit_plugin plugin_name)
-   # copy plugin into build directory
-   get_target_property(plugin_location ${plugin_name} LOCATION)
-   get_filename_component(plugin_filename ${plugin_location} NAME)
--  add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/${plugin_filename})
-+  add_custom_command(TARGET ${plugin_name} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${plugin_location} ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/${plugin_filename})
- 
-   # plugin data
-   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
-     # copy plugin data into build directory
--    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib/chemkit/plugins/data/${plugin_name}/)
-+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name}/)
-     
-     # install plugin data directory
--    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib/chemkit/plugins/data/${plugin_name})
-+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION lib${LIB_SUFFIX}/chemkit/plugins/data/${plugin_name})
-   endif()
- endmacro(add_chemkit_plugin)
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index b191b82..a4ea0b0 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -4,7 +4,7 @@ endif()
- 
- macro(add_chemkit_test test_name test_executable)
-   add_test(NAME ${test_name} COMMAND ${test_executable})
--  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins/")
-+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins/")
- endmacro(add_chemkit_test)
- 
- add_subdirectory(auto)
-diff --git a/tests/auto/bindings/python/CMakeLists.txt b/tests/auto/bindings/python/CMakeLists.txt
-index 9859867..70da693 100644
---- a/tests/auto/bindings/python/CMakeLists.txt
-+++ b/tests/auto/bindings/python/CMakeLists.txt
-@@ -5,7 +5,7 @@ endif()
- macro(add_chemkit_python_test test_name test_script)
-   add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_script})
-   set_tests_properties(${test_name} PROPERTIES
--                       ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib/chemkit/plugins")
-+                       ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python/;CHEMKIT_PLUGIN_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/chemkit/plugins")
- endmacro(add_chemkit_python_test)
- 
- add_chemkit_python_test(python.Atom ${CMAKE_CURRENT_SOURCE_DIR}/atomtest.py)
diff --git a/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch b/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch
deleted file mode 100644
index e8c9d18dca6e..000000000000
--- a/sci-libs/chemkit/files/chemkit-0.1-unbundle.patch
+++ /dev/null
@@ -1,191 +0,0 @@
- CMakeLists.txt                              | 21 +++++++++++++++++++++
- src/plugins/chemjson/CMakeLists.txt         |  6 +++++-
- src/plugins/chemjson/chemjsonfileformat.cpp |  4 ++++
- src/plugins/cml/cmlfileformat.h             |  4 ++++
- src/plugins/inchi/CMakeLists.txt            |  4 +++-
- src/plugins/inchi/inchikeylineformat.cpp    |  4 ++++
- src/plugins/inchi/inchilineformat.cpp       |  4 ++++
- src/plugins/pdb/pdbmlfileformat.cpp         |  4 ++++
- src/plugins/xtc/CMakeLists.txt              |  9 +++++++--
- src/plugins/xtc/xtcfileformat.cpp           |  4 ++++
- 10 files changed, 60 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e531be4..622ea9d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,27 @@ configure_file(
- # export the Chemkit package
- export(PACKAGE Chemkit)
- 
-+option(USE_SYSTEM_INCHI "Use inchi installed in system" OFF)
-+option(USE_SYSTEM_JSONCPP "Use json cpp installed in system" OFF)
-+option(USE_SYSTEM_RAPIXML "Use rapidxml installed in system" OFF)
-+option(USE_SYSTEM_XDRF "Use xdrflib installed in system" OFF)
-+
-+if(USE_SYSTEM_INCHI)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_INCHI")
-+endif()
-+
-+if(USE_SYSTEM_JSONCPP)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_JSONCPP")
-+endif()
-+
-+if(USE_SYSTEM_RAPIDXML)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_RAPIDXML")
-+endif()
-+
-+if(USE_SYSTEM_XDRF)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSYSTEM_XDRF")
-+endif()
-+
- # build options
- option(CHEMKIT_WITH_GRAPHICS "Build the chemkit-graphics library." ON)
- option(CHEMKIT_WITH_IO "Build the chemkit-io library." ON)
-diff --git a/src/plugins/chemjson/CMakeLists.txt b/src/plugins/chemjson/CMakeLists.txt
-index 0e115b5..a5e6f48 100644
---- a/src/plugins/chemjson/CMakeLists.txt
-+++ b/src/plugins/chemjson/CMakeLists.txt
-@@ -10,7 +10,11 @@ set(SOURCES
-   chemjsonplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/jsoncpp/ JSONCPP_SOURCES)
-+if(NOT USE_SYSTEM_JSONCPP)
-+	aux_source_directory(../../3rdparty/jsoncpp/ JSONCPP_SOURCES)
-+else()
-+	target_link_libraries(chemjson jsoncpp)
-+endif()
- 
- add_chemkit_plugin(chemjson ${SOURCES} ${JSONCPP_SOURCES})
- target_link_libraries(chemjson ${CHEMKIT_LIBRARIES})
-diff --git a/src/plugins/chemjson/chemjsonfileformat.cpp b/src/plugins/chemjson/chemjsonfileformat.cpp
-index a0d271e..3cd5827 100644
---- a/src/plugins/chemjson/chemjsonfileformat.cpp
-+++ b/src/plugins/chemjson/chemjsonfileformat.cpp
-@@ -43,7 +43,11 @@
- #include <chemkit/molecule.h>
- #include <chemkit/moleculefile.h>
- 
-+#ifdef SYSTEM_JSONCPP
-+#include <jsoncpp/json/json.h>
-+#else
- #include "../../3rdparty/jsoncpp/json/json.h"
-+#endif
- 
- namespace {
- 
-diff --git a/src/plugins/cml/cmlfileformat.h b/src/plugins/cml/cmlfileformat.h
-index e813223..61a547d 100644
---- a/src/plugins/cml/cmlfileformat.h
-+++ b/src/plugins/cml/cmlfileformat.h
-@@ -38,7 +38,11 @@
- 
- #include <chemkit/moleculefileformat.h>
- 
-+#ifdef SYSTEM_RAPIDXML
-+#include <rapidxml/rapidxml.hpp>
-+#else
- #include "../../3rdparty/rapidxml/rapidxml.hpp"
-+#endif
- 
- class CmlFileFormat : public chemkit::MoleculeFileFormat
- {
-diff --git a/src/plugins/inchi/CMakeLists.txt b/src/plugins/inchi/CMakeLists.txt
-index 2b25d9b..5f45f8a 100644
---- a/src/plugins/inchi/CMakeLists.txt
-+++ b/src/plugins/inchi/CMakeLists.txt
-@@ -7,7 +7,9 @@ set(SOURCES
-   inchiplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/inchi/ IUPAC_INCHI_SOURCES)
-+if(NOT USE_SYSTEM_INCHI)
-+	aux_source_directory(../../3rdparty/inchi/ IUPAC_INCHI_SOURCES)
-+endif()
- 
- add_chemkit_plugin(inchi ${SOURCES} ${IUPAC_INCHI_SOURCES})
- target_link_libraries(inchi ${CHEMKIT_LIBRARIES})
-diff --git a/src/plugins/inchi/inchikeylineformat.cpp b/src/plugins/inchi/inchikeylineformat.cpp
-index 2682f95..cec0a17 100644
---- a/src/plugins/inchi/inchikeylineformat.cpp
-+++ b/src/plugins/inchi/inchikeylineformat.cpp
-@@ -38,7 +38,11 @@
- #include <boost/format.hpp>
- 
- #include "inchilineformat.h"
-+#ifdef SYSTEM_INCHI
-+#include <inchi_api.h>
-+#else
- #include "../../3rdparty/inchi/inchi_api.h"
-+#endif
- 
- InchiKeyLineFormat::InchiKeyLineFormat()
-     : chemkit::LineFormat("inchikey")
-diff --git a/src/plugins/inchi/inchilineformat.cpp b/src/plugins/inchi/inchilineformat.cpp
-index 5b9bc42..ea5977c 100644
---- a/src/plugins/inchi/inchilineformat.cpp
-+++ b/src/plugins/inchi/inchilineformat.cpp
-@@ -42,7 +42,11 @@
- 
- #include <boost/algorithm/string.hpp>
- 
-+#ifdef SYSTEM_INCHI
-+#include <inchi_api.h>
-+#else
- #include "../../3rdparty/inchi/inchi_api.h"
-+#endif
- 
- #include <chemkit/atom.h>
- #include <chemkit/bond.h>
-diff --git a/src/plugins/pdb/pdbmlfileformat.cpp b/src/plugins/pdb/pdbmlfileformat.cpp
-index 081a4ec..2ca4269 100644
---- a/src/plugins/pdb/pdbmlfileformat.cpp
-+++ b/src/plugins/pdb/pdbmlfileformat.cpp
-@@ -35,7 +35,11 @@
- 
- #include "pdbmlfileformat.h"
- 
-+#ifdef SYSTEM_RAPIDXML
-+#include <rapidxml/rapidxml.hpp>
-+#else
- #include "../../3rdparty/rapidxml/rapidxml.hpp"
-+#endif
- 
- #include <chemkit/atom.h>
- #include <chemkit/polymer.h>
-diff --git a/src/plugins/xtc/CMakeLists.txt b/src/plugins/xtc/CMakeLists.txt
-index 98d8ba7..8c09e64 100644
---- a/src/plugins/xtc/CMakeLists.txt
-+++ b/src/plugins/xtc/CMakeLists.txt
-@@ -13,7 +13,12 @@ set(SOURCES
-   xtcplugin.cpp
- )
- 
--aux_source_directory(../../3rdparty/xdrf/ XDRF_SOURCES)
-+
-+if(USE_SYSTEM_XDRF)
-+	find_library(XDRF_LIBRARY NAMES xdrfile libxdrfile)
-+else()
-+	aux_source_directory(../../3rdparty/xdrf/ XDRF_SOURCES)
-+endif()
- 
- add_chemkit_plugin(xtc ${SOURCES} ${XDRF_SOURCES})
--target_link_libraries(xtc ${CHEMKIT_LIBRARIES} ${Boost_LIBRARIES})
-+target_link_libraries(xtc ${CHEMKIT_LIBRARIES} ${Boost_LIBRARIES} ${XDRF_LIBRARY} )
-diff --git a/src/plugins/xtc/xtcfileformat.cpp b/src/plugins/xtc/xtcfileformat.cpp
-index 0f00cb6..f8659ca 100644
---- a/src/plugins/xtc/xtcfileformat.cpp
-+++ b/src/plugins/xtc/xtcfileformat.cpp
-@@ -47,7 +47,11 @@
- #include <chemkit/trajectoryframe.h>
- #include <chemkit/cartesiancoordinates.h>
- 
-+#ifdef SYSTEM_XDRF
-+#include <xdrfile/xdrfile.h>
-+#else
- #include "../../3rdparty/xdrf/xdrf.h"
-+#endif
- 
- XtcFileFormat::XtcFileFormat()
-     : chemkit::TrajectoryFileFormat("xtc")
diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml
deleted file mode 100644
index ec37d80cac64..000000000000
--- a/sci-libs/chemkit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">chemkit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index e616391be946..08230a80857d 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,6 +1,6 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
-EBUILD cholmod-2.1.2.ebuild 1758 BLAKE2B c9c74a50027e6a07ae755ecbcfbd16b60bfdaf5597dbbe91363b8119fa5689ad8f07afb8f5fcfbce3839f8e793fed7968bd58d6aa2117a1661f64fd88f95386b SHA512 f655e8b83a6886e9596a1acc2f54d1c25dc15983a3e272f159bcd72c1e362035253f0389588c5a3b377617fed982495ace46659002cd49415405cf9a2107fe32
-EBUILD cholmod-3.0.13.ebuild 1594 BLAKE2B 8abc7d683ae2ea59c42667ad01b26096ed86570c9b01a5bd5ee4a59e139464cf7c2f99ad784a81c388ddd1428ac66c190574292a7eb0ee4b33bf8ca75df22f2b SHA512 cdbbf59454b34c91f3d748ccd92613a76192aa53cd206543737181e3c79e07d3d363104f08069facf108aa8c2ec7f184ee65636b1b76bfdba6ca053c73a4c701
+EBUILD cholmod-2.1.2.ebuild 1759 BLAKE2B d4ca1e4c852e8c96aaddf7e293019f321a8e9df9eb5d300ecbaac4a915e599d880405b5b2e0eff0900472865d92bf6c9c45f12d343a94edab08aeb5e11373ad4 SHA512 99bc36f5f1d988d4676a373149593d4b79664d1a1120698d7720acf9977426aaa611b3f8a67f67944aef45fc0fce141a9327a93a71c1f52daba2e2be722cfb9e
+EBUILD cholmod-3.0.13.ebuild 1671 BLAKE2B 8b3399232f914aee8a41d0a2ec0f96c7b69223cc40208d7d077b654814309596e876048fd77092a90a947104e7265b709a8779687e2d686d4587d7d1586a6962 SHA512 0b92dfef439259654f61b709cc5302fc8ad94c1b69b27f35bb2928b9e45b9b0749f3a57f902814449c2e37b6767d7c33c3b13314f83ae4d2c54311fde56d1c73
 MISC metadata.xml 1064 BLAKE2B b0e3376f34f051bd7cec27db2bda432e0b7bc7a941807061e93fc0ea51fdde5ebc3d2a3ca400c0d05efaa39b16bd86051dbd3e86a629c3e3b7b3dd3fe15e99da SHA512 fc1765b400dd7463fc707e50c45e1b82152de54cbf0fcc20d4c42ed71172fd7fc0f2e649642e9074f09c6af544bb4c3e9ffed16fdd971612a66de58c9f4d7308
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 16f510decc5b..0c7f5b868903 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc lapack metis minimal static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index f27553cef9f5..bf568d5872ad 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -11,20 +11,27 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cuda doc +lapack +matrixops +modify +partition static-libs"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
 DEPEND="
 	>=sci-libs/amd-2.4
 	>=sci-libs/colamd-2.9
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	cuda? (
+		x11-drivers/nvidia-drivers
+		dev-util/nvidia-cuda-toolkit
+	)
 	lapack? ( virtual/lapack )
 	partition? (
 		>=sci-libs/camd-2.4
 		>=sci-libs/ccolamd-2.9
-		|| ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )"
+		|| (
+			>=sci-libs/metis-5.1.0
+			sci-libs/parmetis
+		)
+	)"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -44,10 +51,10 @@ src_configure() {
 	fi
 
 	econf \
+		--disable-static \
 		--with-blas="${blas_libs}" \
 		--with-lapack="${lapack_libs}" \
 		$(use_with doc) \
-		$(use_enable static-libs static) \
 		$(use_with modify) \
 		$(use_with matrixops) \
 		$(use_with partition) \
@@ -55,3 +62,10 @@ src_configure() {
 		$(use_with lapack supernodal) \
 		"${cudaconfargs[@]}"
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-osi/Manifest b/sci-libs/coinor-osi/Manifest
index abbbfe17ffd0..045569cc9b85 100644
--- a/sci-libs/coinor-osi/Manifest
+++ b/sci-libs/coinor-osi/Manifest
@@ -1,3 +1,3 @@
 DIST coinor-osi-0.108.6.tar.gz 1015556 BLAKE2B b22e2afb3de728275c10163897deab7889be42bb595bc5c3a5f1163caca6da2ec454ce9c96378420bbfea272465b43d92c405a990351b05dc848dbd50dbbef5a SHA512 757a404487a58a99eaf778a08898befd3431d0a6b64e46c429d3bb83d57c99bd396736dda3a75a1f1c05d3e397925041b386280deef6e23fa1ba5277b81f1d8d
-EBUILD coinor-osi-0.108.6.ebuild 2112 BLAKE2B 408cefeb718746b5f16654ce7eb9aa259b10a7f3886865c386bae5797339b8bc17ec4a8ba6d556a81e240be499085e186561f31f647ee14555b6379e6b2bf7f1 SHA512 d268382e4ce08ceab7a88f81b8463489b7198a212d9729177d54defbcd359a2b3b988d75bf7642e591a0d659a76af9e1ad020320d616d0e7aa9883ccc2f62e31
+EBUILD coinor-osi-0.108.6.ebuild 2113 BLAKE2B c75ea4602add2ddaed5b9be280ee34a196909a63c9b89961f334f06e930e5309410f5e5f821378aa407e80c31d40bd8222817cbf000fe1ba1f5a6175d14ff47f SHA512 6fa77f554349b92741320aa6c5765fed74e90591b56f15a6d4fb87ea268747b6dc33967ba988de32cfdb9bece20cee7c4160a7254d31c55419325706401a5569
 MISC metadata.xml 648 BLAKE2B 14e6b4ce99e8b331c45c4f37c05515171039b188602b9fb3971f4531b57ffa118c616e45c42b9add91a6b6e6695ccd2844cc242387b2a66070a2494808a39827 SHA512 a323cbe619c38019c3b5c66aa00bf9ac25fc607c944debbe03defe3ad6899cac1f00b3b1c57fad83f323c56cd52ca6b78c10ffaa65751a339d77f8e94b3a42f2
diff --git a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
index 8b9cf0f637fc..12ba5bd95a6c 100644
--- a/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
+++ b/sci-libs/coinor-osi/coinor-osi-0.108.6.ebuild
@@ -36,7 +36,7 @@ BDEPEND="virtual/fortran
 	doc? ( app-doc/doxygen[dot] )
 	test? ( sci-libs/coinor-sample )"
 DEPEND="sci-libs/coinor-utils:="
-REPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
 
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 12357fa9f4f0..a6ff83ec3c9d 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,5 +1,3 @@
-DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.8.0.ebuild 564 BLAKE2B feabb3e0326d7b12d7f174b0d806515fbb155dec9f442d3a483082d7bec35ab346910d80ce7665058e7d9dd0b0f21b88a2432f6ee250745ef3afc9a05841fdbb SHA512 e8b758cb658eabb035aabc1054e2366438b63b404771e6079f00fd0b9d526a40b0cda6c9ad15c77e20243548f794e1dd755939a18e7688a588a7ec4fb930b6c0
-EBUILD colamd-2.9.6.ebuild 598 BLAKE2B f6677ce63c8debcb45568f6eafdd5a7c6c581373b7f9b059a9cd3c2d843b25e7f9e396c214e429932c4ee1464a0cdb9f9f2903d07a6f38fab3dfc30613e0b0dc SHA512 b684df13370f3a8115982ce797449a0233f187b72d32a38fa0658cda1e8680373fff527f1130150122bcbddd213c1144efcc9bdfc68830783bfaa80be49ab53b
+EBUILD colamd-2.9.6.ebuild 652 BLAKE2B 9f0379eed783a2c0187a67173af2d0767424a76fe09adc9942787b278fae68b2fdbeb6d8113b343ba60815e86226a51eb916f37136e2254ae48df016347f3091 SHA512 ec5836bcb1d59494f119e58b7a78e68ee23b6276fc6fdc52a2ab3a774ad8d6a426df2762912ef1e65975ac420d062e24b114a6332db21c9d41120c49a5023f88
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
deleted file mode 100644
index 6bcd65775912..000000000000
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ccolamd/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 975a5335078d..a656a74f5732 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -9,14 +9,19 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 76f11e8c1a6d..681446030969 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,6 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
-DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.1.2-r1.ebuild 753 BLAKE2B a3d892c3b4d585445b255ec89283b610964cf7e87bdb65a8920cebcc7c947e206bd374e6a235051c46e01afffe826ec2f4f872531bf2473ecf2fbaf30e4d34d5 SHA512 48404fb91b86177ed8c275ac1936cd03e20217e3927ac06a93c112a683040cddb5fbd5c68f954f65ef6413a5233ee1524df5dd02213d092699ff08cfa535e7e3
-EBUILD cxsparse-3.2.0.ebuild 807 BLAKE2B 17a792621c8ca0aaa84e6fb63089473b6f2df6c9c4207d543c6406c1f56c526f268cedf326acb3a08663ca5504f87e7b9308f81af863f03baeb0f0f184eccdc8 SHA512 0d6ea7183fd21d087e0b82a210957c6a61b494b29e95d9ae9f4053e3b4024a851d6d73a5af8a3cf091955538e8725ecd3c95a6d454699ecdaea7a705ec99dc40
+EBUILD cxsparse-3.2.0.ebuild 805 BLAKE2B 0b737ac020c2d7ec730f9bf129c41857bd876537223526b961efba8da5433b26323f67d091ba725f9a8fd63aeb6a03e89f9bcab0aee9eabb9172bcab32f59f21 SHA512 101487e1540bb0f8bb5dd53a7b1a640145a382061ba7ff33288fb0bd69c78800ad9908ddfcc9c13c6a6dc342b80b4aaa6633897e6e90407a2618073269fa6199
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.1.2-r1.ebuild b/sci-libs/cxsparse/cxsparse-3.1.2-r1.ebuild
deleted file mode 100644
index 2c3a3358169f..000000000000
--- a/sci-libs/cxsparse/cxsparse-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 916ab014d3dd..1f31b3ad40cf 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index 51386b99007a..95910f6b2a65 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,4 +1,6 @@
 DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794
+DIST fcl-0.6.1.tar.gz 6208928 BLAKE2B 174176b3844b18ada60884f641c49475357b1c25cb58cdfc1c4545d595add58713020ffaf148676dae14eca87397495cc971423f06fd19af5cffac1bde584603 SHA512 9d5382c1f2701f2cc6988b3e3969f44c401ea0eb4fdfc5ae69c27dd5bb59a0f17de82ef49e7dce0e1fd91a133db6f10aef9581ca2e32b919046f72921593ebf4
 EBUILD fcl-0.5.0.ebuild 856 BLAKE2B 752403368628d3d33ebaec23ed5be6a78bcce1ce172b757b063667621e5ca77f39bdace4968ec0c09f4b52d34f101d2af8fb02180b72484ae86cd93125066e2d SHA512 8e0b0f27862a5a1f621fdae61597bb900defb0e3031004692297393ed18d9654409eb0ef5ca4c4d5d51911eee371dce7f58a18d1a84be282662bd07f31d4dc7f
-EBUILD fcl-9999.ebuild 856 BLAKE2B 236ff30837ddb3b614b0e5a1fe149e308e6b4a2b0d08614e38f4598d09291ec1f1baf0d5e182f3b4230a402e48f6fd2c044d2a3e4633854d400168f1972caaa8 SHA512 a2aed79e23a003c247467a64dd3b052a09a0feda3ee5156f759039614a63f455ea1576dc8b750cb77766687ea8c90d7e3674e864e5a4cf8ae531a49146051c74
-MISC metadata.xml 344 BLAKE2B cd9476f3276e24a502e35056fe91c0791192ec1ab431d8e960d94e26865b5247944dedd5cef619e256598864e49366aec3bedf7347e95f78398416a670de9139 SHA512 d5d4ea55ebdabfcd86a1dce36974d9ca2f2746f2f8fec463486c108d58a6cf53850b511bdeef8546d05ecd7fb165d7c13b51eb834d353c25002acc1473c6b5bf
+EBUILD fcl-0.6.1.ebuild 1870 BLAKE2B 357a6f0c345eddedf3430993d830ded7bda6d27383a961db1f06a65dce11b2f2aa68f37ccf0f25fb2ac9b8deec781d47da2c03671e34dbd87bb2276daafa8c45 SHA512 6e2082a7ab5603f0f81d314b056da249b0835a030478e5f8ad39c6bd8a4e3cbab514c0c9f52360a5d1cea3883914971fe6f4e3eecf7a5fe35855e0b891becdf4
+EBUILD fcl-9999.ebuild 1519 BLAKE2B e94b02c6836e8fa55c3131401359079f832e1b12ec388e338b18ddb0b78a2d4ea5a9aca624894b544a7f2ed4256a597c86aba740ee522b31299e1bd115c528d2 SHA512 90d94cc60a95af83c71c68ed2fd544c27499f2dd7fb4a20a91686b54ffa73a20c4f61a7e04520591287c2b8c6c210a5fa5c0ee9a7379095f5d473e494c55a19e
+MISC metadata.xml 769 BLAKE2B 7c7ffe7a13124d5300e220f1fe060f20764221505d2bc07040f5e1e9caef99ba57f46386cae2d5062d8978654052e00981513f8f0f08d5fa5470fe44a5bb155b SHA512 a01195a169fbd286c3f6d6789681d3134676c4e8b7de6332f35a89751167e0132117b6588404803e8f09fd2b61578705357ea389f969a7aae227c887871b8342
diff --git a/sci-libs/fcl/fcl-0.6.1.ebuild b/sci-libs/fcl/fcl-0.6.1.ebuild
new file mode 100644
index 000000000000..8c1a80c0eb37
--- /dev/null
+++ b/sci-libs/fcl/fcl-0.6.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/flexible-collision-library/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+DESCRIPTION="The Flexible Collision Library"
+HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
+
+LICENSE="BSD"
+SLOT="0/6"
+IUSE="cpu_flags_x86_sse doc +octomap profiling test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=[threads]
+	sci-libs/flann
+	sci-libs/libccd[double-precision]
+	octomap? ( sci-libs/octomap )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	# Upstream issue:
+	# https://github.com/flexible-collision-library/fcl/issues/485
+	rm "${S}"/test/narrowphase/detail/convexity_based_algorithm/test_gjk_libccd-inl_gjk_doSimplex2.cpp
+	sed -i -e 's/test_gjk_libccd-inl_gjk_doSimplex2.cpp//' "${S}"/test/narrowphase/detail/convexity_based_algorithm/CMakeLists.txt || die could not disable failing test
+
+	sed -i -e "s/include(CompilerSettings)//" "${S}"/CMakeLists.txt || die "failed to remove compiler flags override"
+
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DFCL_COVERALLS=OFF
+		-DFCL_COVERALLS_UPLOAD=OFF
+		-DFCL_ENABLE_PROFILING=$(usex profiling ON OFF)
+		-DFCL_TREAT_WARNINGS_AS_ERRORS=OFF
+		-DFCL_USE_HOST_NATIVE_ARCH=OFF
+		-DFCL_USE_X64_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DFCL_WITH_OCTOMAP=$(usex octomap ON OFF)
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && HTML_DOCS=( "${S}"/doc/doxygen/html )
+	einstalldocs
+}
diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild
index 6d823b172040..fe367b10808f 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-9999.ebuild
@@ -1,41 +1,66 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/flexible-collision-library/${PN}.git"
+	inherit git-r3
 else
+	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="The Flexible Collision Library"
 HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
+
 LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
+SLOT="0/6"
+IUSE="cpu_flags_x86_sse doc +octomap profiling test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	sci-libs/octomap
-	sci-libs/flann
+	dev-cpp/eigen:3
 	dev-libs/boost:=[threads]
-	sci-libs/libccd"
+	sci-libs/flann
+	sci-libs/libccd[double-precision]
+	octomap? ( sci-libs/octomap )"
+
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
+	sed -i -e "s/include(CompilerSettings)//" "${S}"/CMakeLists.txt || die "failed to remove compiler flags override"
+
 	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DFCL_COVERALLS=OFF
+		-DFCL_COVERALLS_UPLOAD=OFF
+		-DFCL_ENABLE_PROFILING=$(usex profiling ON OFF)
+		-DFCL_TREAT_WARNINGS_AS_ERRORS=OFF
+		-DFCL_USE_HOST_NATIVE_ARCH=OFF
+		-DFCL_USE_X64_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DFCL_WITH_OCTOMAP=$(usex octomap ON OFF)
 	)
-	cmake-utils_src_configure
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && HTML_DOCS=( "${S}"/doc/doxygen/html )
+	einstalldocs
 }
diff --git a/sci-libs/fcl/metadata.xml b/sci-libs/fcl/metadata.xml
index fbedec0d5c16..35079633a42a 100644
--- a/sci-libs/fcl/metadata.xml
+++ b/sci-libs/fcl/metadata.xml
@@ -5,7 +5,18 @@
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+	<longdescription>
+		FCL is a library for performing three types of proximity queries on a pair of geometric models composed of triangles.
+	</longdescription>
+	<use>
+		<flag name="octomap">OctoMap library support</flag>
+		<flag name="profiling">Enable profiling</flag>
+	</use>
+	<slots>
+		<subslots>Soname version number of fcl</subslots>
+	</slots>
 	<upstream>
+		<bugs-to>https://github.com/lexible-collision-library/fcl/issues</bugs-to>
 		<remote-id type="github">flexible-collision-library/fcl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index f909bc05e636..e6d288a073b5 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -1,4 +1,4 @@
 AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3.ebuild 1819 BLAKE2B c19cc8094ed7be6ce175d54981fb8fc6a095e0a8011c5695a4386e964db8bb89d5e3ea9fe7f6c98bfc6d7f6fdf45f2148dfbce7d82b095a3f136cbeb8ecc36bb SHA512 dc29cdec219415e969068f685e606cdecac755297965bb3a5ead74d387916d81be30f1ccb3f36b279d99928e34b4cc384e8d58ac338867427c696cecd466ebab
+EBUILD fflas-ffpack-2.4.3.ebuild 1820 BLAKE2B 37b441dab876c538d8adad5a70d3fbb2b6502214d249967f9962487d9b5d0f6f11e3db7a7526c7bae8383857c45e47f4dca48213d53c6c0b2cc4cdb0b40b3109 SHA512 e1560c6a58118c19e60fe61ebd611f64c1b8e8c6250e1dadae539ae21c09e93c5b0a0182a60002fe6b1cb01c6f16bb5f3aab8eba39945f572445dd5b0990822e
 MISC metadata.xml 1461 BLAKE2B 0b4c7c31a7a82eeb2eaa33027ff25877a6f5be4155b0be0018b34ea848b270ceb8393ab9fb4c3a053abc870885da52e5f48589593f4ee8d37762443dbc51bb07 SHA512 f350c0d55e9de16789244d03371d7331e6f41d5c726b6964e3ad4d09d9b74ec83dac56adc5c645f8e90705f833faf31b301d8c39f74bfc976b1883775bd84379
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
index 4115dc61acec..dcbf5194f3b9 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="Library for dense linear algebra over word-size finite fields"
 HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
-SRC_URI="https://github.com/linbox-team/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 457ff9ba902a..fc4beaa82d46 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,7 +9,7 @@ DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
 EBUILD fftw-3.3.6_p2.ebuild 4459 BLAKE2B 0585c2fe679f1c849e60be3cf7ad87b5af8aac4d0e342fd064cd6d82c8c29f36fafc430222eb38de5f6bfaaa65547163d132635a818201b8f78d689aed33f957 SHA512 0f19ac77caf1a9e5e449b21498b582a7e6061ddc15754d4e626c89589477109cab56167aba8d9dd13c4729d390e713d5edf28095824a4a1b25520a6c8c1c37ab
-EBUILD fftw-3.3.8-r1.ebuild 4644 BLAKE2B 9e5f88d97b5ac5cdcc7d8d8f4ed730f0310ad2a128e344123690b7ea7a19993b335d327b6b447236c2fe57ded6f331448b89d784c10ec662390b2f821278b7fc SHA512 2251e51e93cc9fab3fde5302baa2806ae9da3fa2cad305925459eafbd24cdeed5a9f7f4d65c523df8eba82ed7d20124bbb25874edc7bcf7de6602f54d3f66caa
+EBUILD fftw-3.3.8-r1.ebuild 4636 BLAKE2B 3e97d8a13f6fab8915a0afd265b58ab56f53f3489f42dd0385f7bd3ef049826131ec7e976398f621be5b73fb4536a3e0ebc480bbe5194fa9f65bb8c22f5d7078 SHA512 0a1ef1c403e30e45193908f09e7f03379b4ccbebbfa1f6cf0918a0b3e147c41461c3c0434f08b591542610b9aca9d9410a94d27c38a975d5bc4129f83a7f429d
 EBUILD fftw-3.3.8.ebuild 4523 BLAKE2B e449bb3e635e45930f18e36ca1cc2989b8d6f7bb6e53f6c937406a461e16badb64833e625327e1ef0c6a39ca8c9ba6360b2712a72e23de298bd774016e6c57ea SHA512 6ac197a894ceb0f29d4e3e22ac45cc48007d62230ee9448260c54a04d77595a7c702fd7884d7f9dd4a8b737adfe99534f268f004eae91de90dbe21e7daeec220
 EBUILD fftw-9999.ebuild 4518 BLAKE2B 41047e346e12e633d2faa45341cff1eb02959295f3000d0c5dc2b74ae366a72ef9c9b5724193c3c4b9ee2e7de4a2c76f2f19451156cae8d7ca6c201c9aab60dc SHA512 122471201bc246cc815abaf074a310ec9e91a9e3bbd9b58ceb3572114318e18f6e3def64d4e027d0022163565d35ba792daa1cc7e4b85150dd4cd7c62ec59422
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 150c67d958e3..a6577c18e01f 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 454b69c178cd..b27d22a06689 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,5 +1,7 @@
 DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
+DIST fplll-5.3.3.tar.gz 1289510 BLAKE2B 116af9013a9c030301f2a37fae9c4865244c93de8d7a06e6f605387c4e421f9e0735c456291cb1e44d6da3c82dbea3a8f91709eea3f69a4aab1fee876f534aff SHA512 f69b98c9befe9f2ce15fdcb1b4c1bf83a7267f606770228e05416e13930d1ecb745824b1793ccc11ab13ddb0140c1daa6cfade50f2e79f93dee296880d98bef4
 DIST libfplll-4.0.4.tar.gz 413519 BLAKE2B afeea5a813d3d5b1b7fe3e81d5a8e9bce66ee4f8a3d265dacaa0ba7ff2f632f0f533182027322e2fd17645f5bc5816b266b167da0e36a00a38f73e794e22a522 SHA512 81cf61118f0dadca8fd82cc58df2fb5f0dc3ddd15a9b5de95a7777e0ece77d8f6a6d50d14ba7fdd6be6697cf375fac2e60792c94cc65f5a181c427dea84d552d
 EBUILD fplll-4.0.4.ebuild 704 BLAKE2B e658442fb5582e62ebd499cf7b3dddd13e5b25ae4c60b161c82661a5d5a3eda79507aaee612e4dc47d571ed839be9e50a3882f3347b350e1b39d91db603839ca SHA512 7d384773c284569c2d5a6fc4a1cc5f163ec3471f09db7949d941518a08247f2539f853c9d1ecac410523ac167e25dc554c9f0770939aa45300e75e65561d3d3b
 EBUILD fplll-5.3.2.ebuild 684 BLAKE2B dbb2bf6a338bd9b4f357aafab6737001155249d0a28fc398f37c696f4e3a1a2497b221a5426c7f252a36b9f57c26e0bab65ca134fa405407f6697aa8f17949a1 SHA512 ebd3087376ccd1be88f351be6edb6e0eaa3beeefc3a4774208133173c67ae58490c967fbe5e19349026135a1292b4711a193cec70b5ecace1f1470010d72ae87
+EBUILD fplll-5.3.3.ebuild 686 BLAKE2B 0d64f9ea109773b2a30183b36782c5a1de018fdf951991f57efe5af75d55db14a071746f9dda3d2bcf1a57cd0b7a575ed31458579b3e0e857c943dc2a031dc66 SHA512 b38e8689fbf82b9d75648ab3e3448848b448d35be34e4284e38705d69e0ea28bc43367e278281b30aeeb339f7408f3d83e6790eff7adbc53e0bebd70cab2080a
 MISC metadata.xml 731 BLAKE2B 64e80fd07c1887f4478cbd116254222a26b79a90037007fe4c99e3bef59036168de165468d3c4c39c2e4c7dae5392aa51de6d4b3cf97d76c7c6687d7cfb0685c SHA512 0ff3088ed94924291b47ffbe624f54b493755f941ab59fe23f67eae01d8e79ac4c8699ce23db4ffd8bc9012290da379b19dd4a0772a9e0e2c6312387a93e01b7
diff --git a/sci-libs/fplll/fplll-5.3.3.ebuild b/sci-libs/fplll/fplll-5.3.3.ebuild
new file mode 100644
index 000000000000..2757d1e1f4a1
--- /dev/null
+++ b/sci-libs/fplll/fplll-5.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
+HOMEPAGE="https://github.com/fplll/fplll"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+BDEPEND=""
+DEPEND="dev-libs/gmp:0
+	dev-libs/mpfr:0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# Support for --with-qd is problematic at the moment.
+	# https://github.com/fplll/fplll/issues/405
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5a5bd941abf5..acf58f9137ca 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,6 +2,7 @@ AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
 AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
+AUX gdal-3.0.4-poppler-20.08.patch 1857 BLAKE2B 676b951dae6a374e2897549ff604fb8e7d49bae5aa1d5b51f808a6e9098f951eacc5d5ce736ab2346da2fb2d8c1c12592d8011d1f1d379321a5bc535f7b876b4 SHA512 a1e3d63885cceee3dc56febcbd8837818e956207b9fe9da3409b19d972ee338a0c22b7ad8694f742a94fdf5c26597099a5cfaf8d5212f641b32174bbdd31fd8c
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
-EBUILD gdal-3.0.4-r1.ebuild 7305 BLAKE2B 91aeba00048f346e542a228020fa6bc8c6f4e6f55c3b2b581a175669889b415f66c6120166dfadde0a0b230bb02fe813f0b6fef1affb334c89cdfc49ca95b5ea SHA512 a98c91005dc6714352a2ca5f18f8487aca49ab3240abde0f30035b6ec48408f7e3d4a1d714b0d414060c23c3c366834e577546f2944154b275045e4c58772d48
+EBUILD gdal-3.0.4-r1.ebuild 7360 BLAKE2B b870ded1680c0f1d9ccf47fce7ca85682d73eed11f007839b8203eea43893f3b08a5356b55cf85c42812a62973551de9b5d83f88044536c0639bc0c9a75f5b18 SHA512 01aac1edcc6d4c83beff43ef4b3ae9bed64331eade66847b7c2bbefa5ec2dcae570a5a513cd5f35a959ab4a745b024636383f65af42dbf68f2201eab9771da02
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
new file mode 100644
index 000000000000..0fd8051c365c
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
@@ -0,0 +1,42 @@
+From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 3 Aug 2020 14:52:25 +0200
+Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
+ with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
+
+Authored-by: @chris2553
+---
+ a/configure    | 4 ++--
+ b/configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 4d618db8149..69d46182a26 100755
+--- a/configure
++++ b/configure
+@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; }
+ fi
+     if test "$POPPLER_VERSION" != ""; then
+         HAVE_POPPLER=yes
+-        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+-        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
++        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+     fi
+ else
+diff --git a/configure.ac b/configure.ac
+index 0f4124e6431..7f337e77c1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
+             [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
+     if test "$POPPLER_VERSION" != ""; then
+         HAVE_POPPLER=yes
+-        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
+-        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
++        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+     fi
+ else
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index b8e390e8e00a..7a83f0bb9fc5 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
@@ -89,6 +89,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.0.2-complete.patch"
 	"${FILESDIR}/${PN}-3.0.2-datadir.patch"
+	"${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828
 )
 
 src_prepare() {
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 6c8a2a4aa155..b4e439e4685a 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2813 BLAKE2B d219ef180297f018cb3eab02d2fcb7361f6802ffbc7c4480e102ac8c9e1341c5c5e63c92fc85a9f8db909d98028d19b4396d8ba480b7f4e00b00a38729798382 SHA512 9a0e076667ebd917f2b825070d291d8435821da66fae453ec47993e4e5bf4aa4e9dcee3fcd61f0184ed66be23c293ad0f583cadcb7c5c6ccf09ccbb589288dd4
+EBUILD hdf5-1.10.5-r1.ebuild 2808 BLAKE2B 4419ea4fa305c0ea3d1793edc380b4e5912a25492eaab28901133a2e8e4be358d3e076fdbf3921fe490b55d32903f58f1fee2f3b088904947fd25cd9c648cf4f SHA512 04f37efdbbe8e91f5ad1713ce2c272ca910a19f64ae4e7ea762a3a3f0ba476c7966d66f3ad56e9b0b9981724f20b0f7c5ddf3a040c721ba307e78176f22359cd
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index c2f1f217d63a..47f24fba7d92 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 367d9aa3cd48..3f1f8ecec673 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,5 @@
-DIST htslib-1.5.tar.bz2 1051132 BLAKE2B 90c6aeeaa2a2692228aa1f530d775a6e81f9275d321e8b2d6005b86b9a25e5967acca19dd898311a5bc4f3c17d4e8ea36d18da4602e18fadee47666350122077 SHA512 fd58552ddbd178f9797123fdaf47914ccd0e2aefd055fc6557ac8f479c600775616107cfa871c3acd93079f45974a19f443941a79f2acfd2a8c2983ef35b8917
+DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075
 DIST htslib-1.9.tar.bz2 1178859 BLAKE2B a0229313d3572717101f4f23d39fa124f3bb38d8b2e65055f4f801dbb5f1549df95115e8beadd8fa024171b3ff8a874d20087bf71819c36700666f168dbe41ab SHA512 ddb0e2d970e4c2c27e203b064898f95cb7c187cd497c02fc7b4312dcea25669d0b6063d537687521e7a065f6daefa1ae897add2df4981037a187b499d08fdef7
-EBUILD htslib-1.5.ebuild 769 BLAKE2B 0a40bc1059beabd9671df35ea8febf7b5a11c8b46aa0f66891879962698789b36326fd91423200312497b2f9691766c1dc8aae5dceab5626a7e8de119881793a SHA512 e5df03c2dfa5088743674af125f7464a6e2add8d9c092060d7ddfc914cac4cff16d65eabb35ca3c199290461b92f7424a4347fded4f76dce763801b2b70f91c2
+EBUILD htslib-1.10.2.ebuild 1041 BLAKE2B 12d35fa9397f441d9e1ee444abca8c56cf87bf16aa2b82b0d6d0bad6ec27546dccdb4b540eaca322f5208eb7c0a6b9f6de5cfa8762641d73a3f40fd8bee5ea47 SHA512 99c54c20f1f01fc243bc7cb25325265e1d959fdc23a3d2db4c2cef29fb9f74cc423835a25d9f5fa1b5af027413caeb6ee8fff2f517ae2dbe8119b80c504b87d9
 EBUILD htslib-1.9.ebuild 943 BLAKE2B 7aafc2a82f264c4bffc1fc527f41ee336bba5b92b02c0a7e5dd3ed752b24fe3f398a375b159a1f6d9630af05b73815cb7bf748a6637cceac13cc13006daaceec SHA512 f865568b71ccda72f1c40622dc51f5e7bba5c9f958d1c7f5637373241655c9d013d2e454f39ca4a803f1ed6d6303b4b6f33df388046b400a1a656d50d8fa9ced
 MISC metadata.xml 349 BLAKE2B 0a67c5034cea0b990b01f90cf319622a73d2c8c23b89d207f013f1ac27fbfd2f267f4d0a8d331b9ab9de792cea9914671cfb2568a56fc09aeec890f69934e943 SHA512 9108691a0c4c68ececa5e93d1719b4a6fc42c423c0b7dca3c037007873a40c86a44610c54139c6868391bb903d509b0202a87640d7114815d07ef62e478ffce7
diff --git a/sci-libs/htslib/htslib-1.5.ebuild b/sci-libs/htslib/htslib-1.10.2.ebuild
index d9957ce3a171..67a341be70e3 100644
--- a/sci-libs/htslib/htslib-1.5.ebuild
+++ b/sci-libs/htslib/htslib-1.10.2.ebuild
@@ -1,23 +1,34 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="C library for high-throughput sequencing data formats"
 HOMEPAGE="http://www.htslib.org/"
 SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
 
-SLOT="0/2"
 LICENSE="MIT"
+SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 curl +lzma static-libs"
+IUSE="+bzip2 curl +lzma"
 
 RDEPEND="
-	bzip2? ( app-arch/bzip2 )
+	bzip2? ( app-arch/bzip2:= )
 	curl? ( net-misc/curl )
-	lzma? ( app-arch/xz-utils )"
+	lzma? ( app-arch/xz-utils:= )"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	# upstream injects LDFLAGS into the .pc file,
+	# which is a big nono for QA
+	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
+		-i htslib.pc.in || die
+}
+
 src_configure() {
 	econf \
 		--disable-gcs \
@@ -28,10 +39,13 @@ src_configure() {
 		$(use_enable lzma)
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	default
 
-	if ! use static-libs; then
-		find "${D}" -name '*.a' -delete || die
-	fi
+	# doesn't use libtool, can't disable static libraries
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/sci-libs/kim-api/Manifest b/sci-libs/kim-api/Manifest
index 98b3ffead8a1..dff67f7037f3 100644
--- a/sci-libs/kim-api/Manifest
+++ b/sci-libs/kim-api/Manifest
@@ -1,5 +1,3 @@
 DIST kim-api-2.1.3.txz 296492 BLAKE2B 707ae2eaeaa737865d9b4f48a7f1ed53fb6453fc3680dee3b5b41f315b60710dfa9546105bc871cf1a4667644434e4a8eab0c95976feef3bed73ff8401613ac3 SHA512 efbc0214234b43a65ed40d23d8faa5264ac1dbd056e9e340548ea7ee5dc530f9cfb2d85a1d9d47fba9dfc7aa660a8ec20374daf4aa8ee605e7c097ae2a12512d
-DIST kim-api-v1.8.2.tgz 1634997 BLAKE2B ab2db24b9bb619aac3fdad6868d36d9615f0b08a8325613cd311d32dadab2f23105fe92b73e32c442d0f64364fde32d1293cc063637ff49eb49760a46bcb4f4b SHA512 fed930d147bfbb7936548eb129fcc403df90d1a8010f0fd5b85eaa35c1529d76c9c7c10b098b8eb74d9878e6d3ba0fad3c10d2a3e5bc9b673841a2abc290bac3
-EBUILD kim-api-1.8.2.ebuild 642 BLAKE2B 8aee22e3c2032ca6df812a1c548420e84296d5a4ed78a499b61f5703ef0d40427b64fdedd705834df508251091ca5ba0f7ef74ed7d4cf59558fd88c1bdd45cee SHA512 3a6a1f11f40af004330ebb4a55edcd12a93249e8c816f695e5a42044096e864c23154dbdb4d0f024d8882e538ef29269fb0c3ab56f4b516ce79b7f5408530405
-EBUILD kim-api-2.1.3.ebuild 404 BLAKE2B 6473d91267bf97d51779a6f2f63a413f5c7f21a4e72e2e6c1f6e0ca3fa79235124d020fc3f708d43bfbe45141151fc2888fed459a1349ad06720adbd7f8dcc5c SHA512 1da030e9a8f23fc06146dbefe08ecc9775ef00872e987137b8e977e1bb820e235f635a4436deb02569d3a7db01465db9122a19cec2cf75c2479e18d14ba95fe5
-MISC metadata.xml 367 BLAKE2B cc3fc8e9dbc98eef49a88d43c68b358b5d2f658316247637a9a3925de3784eb2e82de849e0a49217d5b49be74c280b81a66abbfdd9310fd18b77d67451a480c2 SHA512 455c79e8837ba1ed980967e3236d4a0ac0edbd1b88b056a06d715894e03e7fc802079440752e60a06c9ce4acb62fd68d4020a7847a154a14065afd995257f685
+EBUILD kim-api-2.1.3-r1.ebuild 398 BLAKE2B 55f05b6a719b35786e54f33091bb5c2c8fd89e57040da0c001b49193a5941c9edc732633a6858da4888395999e1dbbbcad46b2179561402cd50f2dd4307ec330 SHA512 c9bdf61a482e18cb52adf2b58ff531421492c0060ab3da448ca9c9711eb2bde04984c1abd5f610806aafefdaa228aa212cabd9241c30d0bd8896d142b617d93d
+MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-libs/kim-api/kim-api-1.8.2.ebuild b/sci-libs/kim-api/kim-api-1.8.2.ebuild
deleted file mode 100644
index b15535489e2c..000000000000
--- a/sci-libs/kim-api/kim-api-1.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="Application Programming Interface for atomistic simulations"
-HOMEPAGE="https://openkim.org"
-SRC_URI="https://s3.openkim.org/${PN}/${MY_P}.tgz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	#https://github.com/openkim/kim-api/pull/2
-	sed -i 's/libDir/libdir/' configure
-	default
-}
-
-src_configure() {
-	#not an Autotools configure
-	./configure --prefix=/usr --libdir=/usr/$(get_libdir) || die
-}
diff --git a/sci-libs/kim-api/kim-api-2.1.3.ebuild b/sci-libs/kim-api/kim-api-2.1.3-r1.ebuild
index b97d6cf0670f..b1edca4f5a16 100644
--- a/sci-libs/kim-api/kim-api-2.1.3.ebuild
+++ b/sci-libs/kim-api/kim-api-2.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils fortran-2
+inherit cmake fortran-2
 
 DESCRIPTION="Application Programming Interface for atomistic simulations"
 HOMEPAGE="https://openkim.org"
diff --git a/sci-libs/kim-api/metadata.xml b/sci-libs/kim-api/metadata.xml
index 903883b48f16..ae9640ffb9f1 100644
--- a/sci-libs/kim-api/metadata.xml
+++ b/sci-libs/kim-api/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index a11cf50816d2..c4689cc3f223 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,3 @@
-DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
-EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 648 BLAKE2B 514ada94433a3788a082a24ae67e35c085d5dfeadf6103ff06d813682b2f0f75d0d8a9cafa3549ac1602878f7759ca9aa0e793ce33242afa9b3fa2d869adfef0 SHA512 336daaaaff329a069a14e8af1427096afa5b790b4b4eedeae28109b2fbd98025efe9a60ef08d70065605b1716b8d8e568933508056e00ac53d5080df4149d46f
+EBUILD klu-1.3.9.ebuild 647 BLAKE2B eabc5e77cf16d8cffec88197d8c75c4cbf29df7c8e7adb52cad596a247eeb0e2422f610724a66abe40a1464d8d1e3f283c5dcc7fac16e037ed4c1385873ecd2d SHA512 b7ddd8b1bd95a1395abb14a5fe43fb7952cf547b9ad72ffba66a2553fb53dabdf872268bedddea0c8abbd465773fffc9f236c1ac3d5755435beef27ddc782c8f
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.2.1.ebuild b/sci-libs/klu/klu-1.2.1.ebuild
deleted file mode 100644
index ee3f2f53374a..000000000000
--- a/sci-libs/klu/klu-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Sparse LU factorization for circuit simulation"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/klu/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="
-	>=sci-libs/amd-1.3
-	>=sci-libs/btf-1.2
-	>=sci-libs/colamd-1.3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 555188448255..63bce3c1c125 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index f4c10efc1db9..086bade8b942 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
+EBUILD lapack-3.8.0-r1.ebuild 3011 BLAKE2B a8efb95f7d55e08b16cd1e784fdf25b57f45ce1182fd5b461384bef75ae3abc5efc49066ab9f1e015c2861f0ff1fb5039db079bb48bb18899ce521a6f07798d2 SHA512 d46ec6260889139d1b721a88de7e2b428742238fde74555dc933d02820835fe804394f401ebf6d605b08016da803ac33f726545fea2f567ece89c99d0113cb2e
 EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index bf8ffd460297..fe759a13f358 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke deprecated doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index d7eb1fd4e3bb..124258334d8e 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,5 +1,3 @@
-DIST ldl-2.1.0.tar.bz2 336442 BLAKE2B 8516e37ac66c329397739fb5d7ee0b3a5cc1a286d780062a749901a13b30dca52e131647e66a721be1f1e2ddd022ecc7c9d6ec5da81acc9c98afa53a06978367 SHA512 ad532e3481e48b9c3587ca0cba3d58a89a2174e3a0d523dcac6d420e04aa5da1cb8517bb14556d0a593110350fdc02aea3677eec41eb74821a3a63552418d0b5
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
-EBUILD ldl-2.1.0.ebuild 676 BLAKE2B 304a185bf67e6d05cb2de2f94fe4c62f773aa4bb9e93e20f20f766afcd49426ce7842f8397654a39e01c1b7741552720c8a8e4a83f29da724cd57db0ceb52d3c SHA512 d11d0a25d7dc3d54045b3dbb0fbb0a489f609d066122261a4b0531dfe33552c129a6ff57afac41c7d0d0a93385886c00d8c8b8004df5ecef19a9d23157b96a07
-EBUILD ldl-2.2.6.ebuild 640 BLAKE2B cb0115e8bd91c007b60a8067e01f6fd37bec84b4b88798f33d794a9d0fd22a671110b447bcf146a520857e96f9810cf6c9dc4cef82ba9e1ba83e12f7ee29845c SHA512 c918362b140eeabfcaa399d1bf3628e3ab546e01f858f1e3e54af40bd6c86a2364d207a1b6e68339b89d3a73355fb595c10206c91e557835c119b7665c0c0e8f
+EBUILD ldl-2.2.6.ebuild 639 BLAKE2B d781841728015476db308bad93d3d51e2693face37245ba6413d9b2a5318536346825205ab7b462ab0cb7dfd2acacdc65cff7959225a048deff85606204340d1 SHA512 a22a0755cb2c8b6adee48e2fe2e92745357a202260127d1693ddb653626b6b7c659e38ad1200b05f0063cb63b531cb81bdab766dfcf3d4cc775bffdd266d02f5
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/ldl-2.1.0.ebuild b/sci-libs/ldl/ldl-2.1.0.ebuild
deleted file mode 100644
index a6d196f6e604..000000000000
--- a/sci-libs/ldl/ldl-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 59660d008192..d29a5c1298df 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 2b8b5a97061b..345ddaa4b510 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1,4 +1,6 @@
 DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
+DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
 EBUILD libccd-2.0.ebuild 1129 BLAKE2B 656f1592c08b5747a911939696afb80d8b85a1668b462d8dbc4ef91845bb45ea1a2f62e8540d7ac0939a1569b6f28c951bb968815b1fd5d1974f452959fa9522 SHA512 bb7d70c13dd6871be004c309c5adb92953ecd4fb73613fe34abad10dc8050dace2169d10f8da49d7ba96edd11153149b1edef5078cebeba4d5fa41e82292c7e3
-EBUILD libccd-9999.ebuild 1132 BLAKE2B dff0a19ab8ed0307c495c1ebc7f267239a47671433c57eb46d232657386bc1ae14d972dbbe22c322fbd26e233c148ad3972ff8171cac9ba4fb85ff4d8a79c5d6 SHA512 68295196d780ac574edc043165e51683258ad453d28a78a357ceb76a853e6532d653f5a11d39e033d0f24fa9e34f737d4c8c97351a524ae2bba2a196888bfce2
-MISC metadata.xml 320 BLAKE2B e5481a628c8ccd0751807384ad8bf4f8044e802a81a0b40fb8ea759bc46c268d8cc7237313f8a67fa93de1ec4acbe1a115a59867d5e324da48c3ecc3279a472a SHA512 76ac27595041183f73ae8b7c0a8c653ffd4609bfe780a3931b81a1222f9563b9af0e0c51fab757a16772f3ec285357772c3e5df36fb0058c34f21c8ae1b014bb
+EBUILD libccd-2.1.ebuild 1300 BLAKE2B 23cc9c165588a2d3a368a989f483dc06cd4586221ee364f8624426765c86908e2ddf0e0af17851169a3d450a9d8edcd91cf935b53f2ee2f3146740cb7d4c9780 SHA512 2964261d0268750a495f70e09b401d2656fa7c0c29dd86f150f1a658b09a0383f47138e34717ccd38f912aa245f48e562a7ee5e36de86e9a4650977f382a895f
+EBUILD libccd-9999.ebuild 1055 BLAKE2B 0f1a439abcc3f1a8963d4dae843865a8118209610df25e63f477508ac71a3ac54d00b2b1e3e4d30c286a8954911376bf811deb7031329e270937e4c8cd04c662 SHA512 5a4e556da14ab3980af8ad10c96692c2ade98636636838d1e1048a661e0d1ac4ccbf1fce1195533f62da7d1efe31b55f7f49dbf45d71e57122aa288b0581cc8f
+MISC metadata.xml 974 BLAKE2B 0f267202a50f7e56124878ff2f01990c83fb07b36f69db357b8e8786c3fb9720d0090adbb2916c40c1ab53b391af9f458d1732b3c907e256c06dcde9052750ef SHA512 b53567e44a76b4e123b7883fee66868f05ed25448c369ec77eae8ff4c4d93debf798d71db3623d3cc680cb2064cb96d20de8bd590b9d8f1f75eaadd0a8649238
diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild
new file mode 100644
index 000000000000..8691045954d5
--- /dev/null
+++ b/sci-libs/libccd/libccd-2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [ "${PV}" = "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+else
+	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+DESCRIPTION="Library for collision detection between two convex shapes"
+HOMEPAGE="http://libccd.danfis.cz/
+	https://github.com/danfis/libccd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+double-precision doc +shared test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+src_prepare() {
+	# upstream issue 72
+	# https://github.com/danfis/libccd/issues/72
+	sed -i -e "s \${CMAKE_INSTALL_DATAROOTDIR}/doc/ccd \${CMAKE_INSTALL_DATAROOTDIR}/doc/${PF} g" \
+	CMakeLists.txt doc/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
+		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		local DOCS=( "${BUILD_DIR}"/doc/man )
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 6d2690e84ba0..6f8c7c9f77b5 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -1,59 +1,50 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/danfis/libccd"
-fi
-
-inherit ${SCM} cmake-utils toolchain-funcs
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
+if [ "${PV}" = "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
 else
+	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
-	SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz"
 fi
 
 DESCRIPTION="Library for collision detection between two convex shapes"
-HOMEPAGE="http://libccd.danfis.cz/"
+HOMEPAGE="http://libccd.danfis.cz/
+	https://github.com/danfis/libccd"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="double doc"
+IUSE="+double-precision doc +shared test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
+
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-DOCS=( README.md )
+	doc? ( dev-python/sphinx )
+"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCCD_DOUBLE=$(usex double TRUE FALSE)"
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
+		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
 	)
-	cmake-utils_src_configure
-}
 
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd "${S}/doc"
-		emake SPHINXBUILD=sphinx-build html
-	fi
-}
-
-src_test() {
-	cd src/testsuites
-	tc-export CC
-	LDFLAGS="-L${BUILD_DIR} ${LDFLAGS}" \
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake check
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${S}/doc/_build/html/"*
+	cmake_src_install
+
+	if use doc; then
+		local DOCS=( "${BUILD_DIR}"/doc/man )
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html )
+		einstalldocs
+	fi
 }
diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 20ea537dd9ae..62004119dcce 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>aballier@gentoo.org</email>
-<name>Alexis Ballier</name>
-</maintainer>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <longdescription>
+    libccd is library for a collision detection between two convex shapes.
+    libccd implements variation on Gilbert–Johnson–Keerthi algorithm plus Expand Polytope Algorithm (EPA) and also
+    implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7.
+  </longdescription>
   <use>
-    <flag name="double">Use double precision floats.</flag>
+    <flag name="shared">Build shared library</flag>
+    <flag name="double">Use double precision floats</flag>
+    <flag name="double-precision">More precise calculations at the expense of speed</flag>
   </use>
+  <upstream>
+    <bugs-to>https://github.com/danfis/libccd/issues</bugs-to>
+    <remote-id type="github">danfis/libccd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/libhomfly/Manifest b/sci-libs/libhomfly/Manifest
new file mode 100644
index 000000000000..2c2beaf07d0a
--- /dev/null
+++ b/sci-libs/libhomfly/Manifest
@@ -0,0 +1,3 @@
+DIST libhomfly-1.02r6.tar.gz 359354 BLAKE2B 7b60c54e56777dc4b81240cbdd63726591323dc6d841f8d56d641ea304d9a4c1c3ffb3078fc54861f22b5007b36bd32c5f397e2fe8d40f10362eca8d08ba4915 SHA512 44f81815a0ba4c0358d433eb9769944af2ee02790d78aaa08e791d03ba68ba3dcf0389b4287f687211e6a7ba84e1bea3d2ebe69fc8bb4f12d677b7f54872d618
+EBUILD libhomfly-1.02.6.ebuild 629 BLAKE2B 4e9a0560888226fd10610c23de888c3d4120647a4c6bd38f854a11462c0e21fb11aa41dad2ceb26f9849db93754af5f0c123d1ad103df6d71e5807b28844a8f6 SHA512 695335d4244ca0ec15d4c8668d88061bb579b016e3dae2fc33a9a7609db427f8f9aa135b8755cc998921024956f9691aff54763b053cf3fa7bf7e4e712c55873
+MISC metadata.xml 743 BLAKE2B 9e02f3f11fb1a8a7046d7f88eaaa81adf870c93b576701a5bcee6b444887583e24bffdc5ac308e95c9b8f257115b70e06b7352d0bc8b425c3ad72fcb2b82e953 SHA512 449fa0dbd599814a98166cdf770f23d57dfe8a398083936e7772fb374fc9f6819af1512d90c09d51534b8518dd2c8741e8c30875ecc349411e4f532756fff1af
diff --git a/sci-libs/libhomfly/libhomfly-1.02.6.ebuild b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
new file mode 100644
index 000000000000..717bc354d1d4
--- /dev/null
+++ b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_rs 2 r)
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Library to compute the homfly polynomial of a link"
+HOMEPAGE="https://github.com/miguelmarco/libhomfly"
+SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+DEPEND="dev-libs/boehm-gc"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure(){
+	econf $(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libhomfly/metadata.xml b/sci-libs/libhomfly/metadata.xml
new file mode 100644
index 000000000000..e02bf222cf6c
--- /dev/null
+++ b/sci-libs/libhomfly/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+    <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <upstream>
+    <remote-id type="github">miguelmarco/libhomfly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index edad3d3994f8..9c7fc1cf9096 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,12 +1,10 @@
 AUX libsigrok-0.3.0-configure-flags.patch 6291 BLAKE2B 24ca94ea005a1148fc3492c90aed9823a63620416e441d2a183573a1627a99a47fc76ca751b3903bc68664c5e117fb44bf693934794885db7fdd12370d9b934f SHA512 a7df284a3598dada9ddd63c7fe84b99fdec11a36724656c444a9deb80d0e29c633d85166d926279f3870d800b07816b50198c285a985304041134ad0c84f89c1
 AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9b2a1edb27d66713699765aa90955c4ef408fef8f8c06d9ca314acb40780c66992245e167f7c0a615e31d1b5ae76b455bbc9b180 SHA512 45d31733c9942cedd916819baa842ae9b68de7ac9f7fc5d440f93d5eb2ea13975c3a4ac7116d80d669c7f942f5342e616da208b83a98ea005fe6a62fab3db373
+AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
+AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
-DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
-DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1732 BLAKE2B f3f00fd50eeedfdf542d4205c633433d70cd3a3638932505cc6576eef7216a27b5ba677aa2281d692f250df458f1b4b33a67cf7f0ca3355ac52f4269623be20e SHA512 aa54d6ef4f33da4498432d84fdfd390134b7ccc2715af7e74ae91a7307348eeec73b5787fe39dd20a35572fa8316a0d504bea9ea413e71821f9fb4d974d58b5e
-EBUILD libsigrok-0.4.0.ebuild 2223 BLAKE2B 8febecd45ce5095e6e59edf3d209d3378ea6d22046b6569ec68e74e74c619bcb9ee6f2fc4d99a01c3d747e33b5fc189d3945b56b6ffccb4309302ccd8f4b0e3c SHA512 3e657768771c04a3818d4acc301fc1a893822a1a1181126ef1021d199003b44b072d42e5e0df4f7e1dfe43bd96ea0bc814d260613be6c388b4642d396fca46e3
-EBUILD libsigrok-0.5.1.ebuild 2453 BLAKE2B 640406797fe99e1bdb574ce0cb5f22b32622efd733c48b39a7b6f3f459d5e3980f1489ec923e05d8c80912f1b566635e3496f018e5c109e764169d62e7e8c375 SHA512 a4ac2f0e3b65a388b22a8dbc3d7d5148e06fb4d598cae2b95ffd070ea57c33c6a89eba609fcf61724041fdfd8802b116779f462cd5e5c62839c7a32d62786a8d
-EBUILD libsigrok-0.5.2.ebuild 3643 BLAKE2B 5b1e373564026b2af6891ae8320214be69b8463198f7cb41f4627ecbdeac2c769828a97294e97fdaa59d0a66a46e3451fc170ab2430c6c09e7bb3c970cb4f6c0 SHA512 6d019edbe7c1311dd9bd1e84f0e389778effaa3617fc7b69709a0b44f9a4ce0042a9425c936b2b39ab5c3ffc3da64c3dd8022710de5ae7a7a196a9adec556a2c
-EBUILD libsigrok-9999.ebuild 3646 BLAKE2B d388ecfcc1a744e034c1596903cd3d0170bd5a88e10982cac29523d1a823fe0ddded89e5429d622a1c56bb067682d6a120a73d741e6ddc7382e8c681e14245f6 SHA512 36f779ef5d94debe39e528f40c182aca3ce24f720a41eae2df524531f84b9c39f9d7862364ce7e30a7ff883327985c3a954811f98a6331eafe868469c630e8c0
+EBUILD libsigrok-0.5.2.ebuild 3879 BLAKE2B d7fc2234bb89bad437a60d27e71d47dd17d0ee7ce7b6455391e3f982e103c8fba15ffd6beb682fb4e56d1ee082335dffbb443b70f010b189d1bb3ab489c7a916 SHA512 91ff1e2ac0eb21bfd2769cc7c2bfc3a793edd27fd4e225d66b8bedf2b0051845c05d344be603847284021a18b2c3306757375ec10e29976e277a95957f68faf3
+EBUILD libsigrok-9999.ebuild 3679 BLAKE2B 7c80f57e327ebac43dbda70a5f07147d49db55bc6640f7f22a82709bc0527cc76a8744ca314b79952ee6fc291462b988668d6ca7ad297246932a4f92c720c0dd SHA512 0182a0ba019d158e2c1c66889e8d97c0857f946357fa2704946b024bece3e43d4410b8d147cbd71c82506264f7b3d38f98a165558e3a515522724f1575ff41fb
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
new file mode 100644
index 000000000000..808227a2fffb
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
@@ -0,0 +1,63 @@
+From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Mon, 8 Jun 2020 20:46:44 -0700
+Subject: [PATCH] Fix ruby SWIG bindings generation
+
+bindings/swig/doc.py generates a swig interface file for ruby bindings
+that includes docstrings with comments braces ( /* and */ ) like this:
+
+  %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n";
+  %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this channel. */\n";
+
+SWIG generates *.cxx and adds its own braces to the docstring:
+
+/*/* Document-class: Sigrok::Error
+Exception thrown when an error code is returned by any libsigrok call. */
+*/
+
+this causes compilation error for Ruby bindings.
+
+To fix the error we should not add extra braces to the docstring.
+With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2.
+
+Fixes bug #1526
+
+Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+---
+ bindings/swig/doc.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py
+index e8767af8..182f5477 100644
+--- a/bindings/swig/doc.py
++++ b/bindings/swig/doc.py
+@@ -46,7 +46,7 @@ for compound in index.findall('compound'):
+         if language == 'python':
+             print('%%feature("docstring") %s "%s";' % (class_name, brief))
+         elif language == 'ruby':
+-            print('%%feature("docstring") %s "/* Document-class: %s\\n%s */\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
++            print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
+         elif language == 'java':
+             print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic class"' % (
+             class_name, brief))
+@@ -77,10 +77,10 @@ for compound in index.findall('compound'):
+                             for name, desc in parameters.items()]) + '";')
+                 if language == 'ruby' and kind == 'public-func':
+                     print(str.join('\n', [
+-                        '%%feature("docstring") %s::%s "/* %s' % (
++                        '%%feature("docstring") %s::%s "%s' % (
+                             class_name, member_name, brief)] + [
+                         '@param %s %s' % (name, desc)
+-                            for name, desc in parameters.items()]) + ' */\\n";')
++                            for name, desc in parameters.items()]) + '\\n";')
+                 elif language == 'java' and kind == 'public-func':
+                         print(str.join('\n', [
+                             '%%javamethodmodifiers %s::%s "/** %s' % (
+@@ -111,4 +111,4 @@ for compound in index.findall('compound'):
+             print('%}')
+     elif language == 'ruby' and constants:
+         for member_name, brief in constants:
+-            print('%%feature("docstring") %s::%s "/* %s */\\n";' % (class_name, member_name, brief))
++            print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, member_name, brief))
+-- 
+2.27.0
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
new file mode 100644
index 000000000000..3c5dd85a5100
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
@@ -0,0 +1,37 @@
+From e803574173bdac8a7f33085a648c29eaf248a394 Mon Sep 17 00:00:00 2001
+From: Uwe Hermann <uwe@hermann-uwe.de>
+Date: Sat, 4 Apr 2020 21:54:13 +0200
+Subject: [PATCH 1/1] bindings/java: Fix build issue with SWIG 4.x.
+
+Tested with SWIG 3.x and SWIG 4.x.
+
+This fixes bug #1527.
+---
+ bindings/java/org/sigrok/core/classes/classes.i | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
+index 75793b25..e953fe5d 100644
+--- a/bindings/java/org/sigrok/core/classes/classes.i
++++ b/bindings/java/org/sigrok/core/classes/classes.i
+@@ -94,10 +94,18 @@ VECTOR(std::shared_ptr<sigrok::HardwareDevice>, HardwareDevice)
+   "java.util.Map<JKey, JValue>"
+ 
+ %typemap(javain,
++/* SWIG 4.0.0 changed the std::map wrappers in an incompatible way. */
++#if SWIG_VERSION >= 0x040000
++    pre="  $javaclassname temp$javainput = new $javaclassname();
++    for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
++      temp$javainput.put(entry.getKey(), entry.getValue());",
++    pgcppname="temp$javainput")
++#else
+     pre="  $javaclassname temp$javainput = new $javaclassname();
+     for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
+       temp$javainput.set(entry.getKey(), entry.getValue());",
+     pgcppname="temp$javainput")
++#endif
+   std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
+ 
+ %typemap(javaout) std::map< CKey, CValue > {
+-- 
+2.24.0.rc2
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
deleted file mode 100644
index df9318757a57..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils python-single-r1 java-pkg-opt-2 ltprune
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-		>=dev-lang/swig-3.0.6
-	)
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable python) \
-		--disable-ruby \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
deleted file mode 100644
index 078e9f5d9ab5..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 ltprune udev xdg-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-		>=dev-lang/swig-3.0.6
-	)
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable python) \
-		--disable-ruby \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	use udev && udev_dorules contrib/*.rules
-	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-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 49ca96068ac4..7ee8b26cb480 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -3,70 +3,89 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
-USE_RUBY="ruby26 ruby25 ruby24"
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ltprune ruby-ng udev xdg-utils
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+LIB_DEPEND="
+	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
+"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-lang/swig-3.0.6
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 	ruby? ( >=dev-lang/swig-3.0.8 )
-	virtual/pkgconfig"
+	test? ( >=dev-libs/check-0.9.4 )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
+PATCHES=(
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+	"${FILESDIR}/${P}-swig-4.patch"
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+	"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+)
+
 pkg_setup() {
+	use python && python_setup
 	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
 }
 
 sigrok_src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 each_ruby_prepare() {
@@ -74,9 +93,12 @@ each_ruby_prepare() {
 }
 
 src_prepare() {
-	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	if use ruby; then
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		ruby-ng_src_prepare
+	fi
+	default
 	sigrok_src_prepare
-	eapply_user
 	use python && python_copy_sources
 }
 
@@ -102,7 +124,6 @@ each_python_configure() {
 }
 
 src_configure() {
-	python_setup
 	sigrok_src_configure --disable-ruby --disable-python
 	use ruby && ruby-ng_src_configure
 	use python && python_foreach_impl each_python_configure
@@ -142,15 +163,15 @@ src_install() {
 	use python && python_foreach_impl each_python_install
 	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index d4e9bf2291f2..1449357471e6 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
-USE_RUBY="ruby26 ruby25 ruby24"
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ltprune ruby-ng udev xdg-utils
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
@@ -17,56 +17,68 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/9999"
-IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+LIB_DEPEND="
+	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
+"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-lang/swig-3.0.6
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 	ruby? ( >=dev-lang/swig-3.0.8 )
-	virtual/pkgconfig"
+	test? ( >=dev-libs/check-0.9.4 )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+	use python && python_setup
 	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
 }
 
 sigrok_src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 each_ruby_prepare() {
@@ -74,9 +86,12 @@ each_ruby_prepare() {
 }
 
 src_prepare() {
-	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	if use ruby; then
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		ruby-ng_src_prepare
+	fi
+	default
 	sigrok_src_prepare
-	eapply_user
 	use python && python_copy_sources
 }
 
@@ -102,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-	python_setup
 	sigrok_src_configure --disable-ruby --disable-python
 	use ruby && ruby-ng_src_configure
 	use python && python_foreach_impl each_python_configure
@@ -142,15 +156,15 @@ src_install() {
 	use python && python_foreach_impl each_python_install
 	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 140c8a23956b..3428b4b8066a 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,8 +1,4 @@
-DIST libsigrokdecode-0.4.1.tar.gz 751546 BLAKE2B b1625714a75e481d94956bd64af264c87b440c0a236f19ff02d18cc16964b701de8799a81943f4e9ec1181b1906c5e62deca98fbbbc30dfbdf8bff2208f86bc6 SHA512 b072001190e80a194986524fd4de4d32f4559d618b151a3dbfa2c63b292c8a490535cb7479cfa665c4e8d3798251a5d6f5ecfa456ca669237237ffced3e88272
-DIST libsigrokdecode-0.5.2.tar.gz 852133 BLAKE2B 7a73c3766582d6fd33e597ca286b0125ece3e5e9f5f3b70dcd79dd42693b9688df674dd5d1876ddef798a5b3aee97f47df4d40b52c5a24b9b8c09a347cda96ad SHA512 49d0cba3a5fe17593165c3669dc8530e4e68497369b461f39b63c903f41a3060766c23d44c4112c9b9a5e740ae1e2c03a735494ac798dc631f3913079be04e22
 DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e
-EBUILD libsigrokdecode-0.4.1.ebuild 1069 BLAKE2B 767447cb1c71299f6334d2bf78e02c3070db3af0954f87ab924fa0f89c2c0ec1c6edc502f0f46f9eae48db2275d54529c089556e63e36167d320a28a7d7e2768 SHA512 aceb222493fe9a825281efe62df88a1d17d77b62e32bc0a2c188d530a37c7ba5717892b8147dea61cb7e6a14aa89e6f4990f19f10ca7516f3a50c6f7fe27340f
-EBUILD libsigrokdecode-0.5.2.ebuild 1073 BLAKE2B 2234d2e84808117205da926b48b4a35e967f2796f4be04be42a3a3bcce816de99c79e434b24fddf2f3195a4bbb90623cd3f7553dd5287e265608e2eb9839fdab SHA512 61c85d4d25f78894b9f3aaaa34b75597faaf67c1afad6668a48cdb3e85370e5f9881161c7395668be030635b05697a305f2d08512a328345187cf44a4987d8a2
-EBUILD libsigrokdecode-0.5.3.ebuild 1073 BLAKE2B 2234d2e84808117205da926b48b4a35e967f2796f4be04be42a3a3bcce816de99c79e434b24fddf2f3195a4bbb90623cd3f7553dd5287e265608e2eb9839fdab SHA512 61c85d4d25f78894b9f3aaaa34b75597faaf67c1afad6668a48cdb3e85370e5f9881161c7395668be030635b05697a305f2d08512a328345187cf44a4987d8a2
-EBUILD libsigrokdecode-9999.ebuild 1076 BLAKE2B be6105ae547f1e83927f0c0706a294387b6f1dd9dca5b320ffe757d4b10685ceb9f3cc710a1340ab16521a580c45f142ae42ea70ce0ee69d0ec55368a936e34a SHA512 6b1fac5b543f80c852d8020ae34520e9fdba0198742852c26c8ae16ba62d159c0ec720025224c50f6adc8e1cf78fd4beab4d6d34e75d19078017d78077ca44f8
+EBUILD libsigrokdecode-0.5.3.ebuild 1095 BLAKE2B acc69ee79d208fce6e9c6a8f350fe06108ebc7747f73d08be0289c01a79471a56df6d9c5007745701600529c1ce31bb30cbf4865b3746ee00190b6678f5af1aa SHA512 1f2c106c94c2039bcb5970b95e2d05ae57daf8d43c80b73fce24fc21b66c4219b0441586e471539c641bc926520e2aeb1f3e224e917b395917e8d2c8f29cb6a6
+EBUILD libsigrokdecode-9999.ebuild 1098 BLAKE2B 97f35908341b7437e3d2a0e22b064b429bd6618a71854875c5c9e149f3a14618545b8c4cff70cfbbc949029333d43f566bac931f3ad49a6f1b5daaeb60b23562 SHA512 1eb6a3ab50152816497e60e1c5cc9bb2e1da4cf36eaa8adea86386d67e50da6817860899320c384132eb3eb724a90b0fdaad4ddd74bab378c2ed5c93d18c3eb0
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild
deleted file mode 100644
index d8561c945b2f..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils ltprune python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.28.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-
-	# Only a test program (not installed, and not used by src_test)
-	# is used by libsigrok, so disable it to avoid the compile.
-	sed -i \
-		-e '/build_runtc=/s:yes:no:' \
-		configure || die
-
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
deleted file mode 100644
index 1b1d6710e99f..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils ltprune python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.34.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-
-	# Only a test program (not installed, and not used by src_test)
-	# is used by libsigrok, so disable it to avoid the compile.
-	sed -i \
-		-e '/build_runtc=/s:yes:no:' \
-		configure || die
-
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
index 1b1d6710e99f..fe9dbe023f88 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-single-r1
 
-inherit eutils ltprune python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
@@ -15,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="provide (streaming) protocol decoding functionality"
+DESCRIPTION="Provide (streaming) protocol decoding functionality"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
 
 LICENSE="GPL-3"
@@ -23,21 +22,23 @@ SLOT="0/4"
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-libs/glib-2.34.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.34.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
 
 	# Only a test program (not installed, and not used by src_test)
 	# is used by libsigrok, so disable it to avoid the compile.
 	sed -i \
 		-e '/build_runtc=/s:yes:no:' \
 		configure || die
-
-	eapply_user
 }
 
 src_configure() {
@@ -50,5 +51,5 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index d4b8425482e3..4ab1fd8f07d5 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit python-single-r1
 
-inherit eutils ltprune python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
@@ -15,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="provide (streaming) protocol decoding functionality"
+DESCRIPTION="Provide (streaming) protocol decoding functionality"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
 
 LICENSE="GPL-3"
@@ -23,21 +22,23 @@ SLOT="0/9999"
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-libs/glib-2.34.0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.34.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
 
 	# Only a test program (not installed, and not used by src_test)
 	# is used by libsigrok, so disable it to avoid the compile.
 	sed -i \
 		-e '/build_runtc=/s:yes:no:' \
 		configure || die
-
-	eapply_user
 }
 
 src_configure() {
@@ -50,5 +51,5 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 9d5c0c4abcab..465ea54d2d93 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,4 +1,7 @@
 AUX libspatialindex-1.8.1-QA.patch 549 BLAKE2B 273b4ba9beff743a7b55b14ef42e744232ed10d26c8ce7e26389c1c16ef6d147d65b929b08dff58bd535866faaecaa11986a42d0b444030cac1f6820d1663045 SHA512 8dbaa89a8128d1209cb1e4d45f26ebf0ed635e896ee8470ed52eeb121894a0cfa344b888dbac58c96c62137e9750553d892833bdbf76959f9c51219360eb0170
+AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
 DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B 936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1 SHA512 d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
+DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
 EBUILD libspatialindex-1.8.5-r1.ebuild 714 BLAKE2B e81aef4ca738c44bbe9280aeaf1acba05a48e4e5a1fd3a987485a3022622960d87754ead7ce128a18bf6ec67ef18c0f8658fc9fca5bcdd29884b275954803118 SHA512 d43910a1fe0fc5bc642f60f9a784914885832f0d70e029bf8e8add405d95262acfc882507bebcd8526ad685f1c586d198c5e7293a64b9a058c15688aec341d17
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD libspatialindex-1.9.3.ebuild 705 BLAKE2B 93f01dd32e5f002058b4c3d7365da3dd397583b36cbbb6dee4b30b43a79e2e510ac45801cd4aad1c863875d4bdd1568fb2a90c6e57344d983de3a63197d591e8 SHA512 75aec783855d912af5f11fe6d07514e4d99c65aa3ff0a125a148b5c18ab8eca49778efcb72dc74b123a36b801d1fb9248d9bd7ea7f39886fc360dd944b0293ca
+MISC metadata.xml 429 BLAKE2B 7d67fb9320bb961ce97867327bbc4b629e198813582671526425e5715c2c43916e5726fffab0bb6fdcba5b161168a22830db1a31915e7befab9c5b4056b97788 SHA512 3c8459343a95fcb49fb8b5e487ab126fc41db7a15a0e83624d00b82101b13197007d5eed0cc35d38a389e580bfe69fe2e4134581f1b78c16e5377ac9dd38a8af
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch
new file mode 100644
index 000000000000..f96fbe11c94c
--- /dev/null
+++ b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,12 +117,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SIDX_BUILD_OUTPUT_DIRECTORY})
+ # Platform and compiler specific settings
+ #------------------------------------------------------------------------------
+
+-if(NOT WIN32)
+-  # Recommended C++ compilation flags
+-  set(SIDX_COMMON_CXX_FLAGS
+-    "-pedantic -Wall -Wpointer-arith -Wcast-align -Wcast-qual  -Wredundant-decls -Wno-long-long")
+-endif(NOT WIN32)
+-
+ if (APPLE)
+   set(SO_EXT dylib)
+   set(CMAKE_FIND_FRAMEWORK "LAST")
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
new file mode 100644
index 000000000000..b923ee62d39f
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="spatialindex-src-${PV}"
+
+DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"
+HOMEPAGE="https://libspatialindex.org/
+	https://github.com/libspatialindex/libspatialindex"
+SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.3-respect-compiler-flags.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIDX_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/libspatialindex/metadata.xml b/sci-libs/libspatialindex/metadata.xml
index 6f49eba8f496..1e4ffa79ebdb 100644
--- a/sci-libs/libspatialindex/metadata.xml
+++ b/sci-libs/libspatialindex/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D print</name>
+	</maintainer>
+	<slots>
+		<subslots>Soname version number of libspatialindex</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="github">libspatialindex/libspatialindex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 7871337e5d8b..32d820645c8e 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -3,5 +3,5 @@ AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d4025
 DIST libsvm-3.22.tar.gz 850563 BLAKE2B 824451dd2cafb7f2546d510d2c516dee67c27e586d5b16557a3c23e0c372cd577af5a322e24f70df6cda66e0a58f2e4d70017e6155a1d211ad3c728f840bfa2b SHA512 80a22fd2c2a82f70b8279fa5d8c5a2838b10ee439cf6d725816d608f8e45990ba1780ae6750cad78b25c1c18daf2c2315b342b9e329affbd5729d6fd7da87f7a
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
 EBUILD libsvm-3.22.ebuild 2668 BLAKE2B c1172520f22ec7f86e77aa6fcb564067c1ad055a5ce9b39a003342ee2e15378d09c19a56dcf2f76571bda62679038eb6d08c6d47533b0e2a88f37738e9e359fa SHA512 fd1d93c0b88763c0ce8e9e798bf46345debf7d00e76fb0f815e2cfbd8ce57f2b3d37a79b236699045421fefd98bdb7cd8ac66069d0ae493315af6c3cb6294637
-EBUILD libsvm-3.24.ebuild 2678 BLAKE2B acd76a68d807cfd2cd4f1bee6b6731ee5713d3e50b35fda2d8dbd304c14858f5f9c7ff0ab6ae0d4b5a2f9af37361f3caa76012d8f8533c049f550036b96bc0c2 SHA512 964b86e17b70ab4de7d81083169132b56721441babe02ee44fc8199aaeb04be8ca9a244015934c39e072e1283b93b0c35e3835337614a201e1ce9ef3f80dc09e
+EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 3223dc3048815cb3e4743985c2275022153663093bbd3d164a48def3dcc9568584d335af65a10409540be829460906c7108650baeeb6bcb932cd9d22b6655910 SHA512 65f5a3954b52b0fd1a940855467fa6e22d10f58a29352ec22268c27642570af74ea07f3f4300750b670e8239a0f02c4ca2fd46bb2f8c1363a2c4c0079d99fe83
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.24.ebuild b/sci-libs/libsvm/libsvm-3.24.ebuild
index e68a5236b219..ecc085bc1c87 100644
--- a/sci-libs/libsvm/libsvm-3.24.ebuild
+++ b/sci-libs/libsvm/libsvm-3.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index d2871875d654..74b7d0879289 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -3,7 +3,7 @@ AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab16527
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
-EBUILD linux-gpib-modules-4.3.0.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
-EBUILD linux-gpib-modules-4.3.2.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
-EBUILD linux-gpib-modules-4.3.3.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+EBUILD linux-gpib-modules-4.3.0-r1.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
+EBUILD linux-gpib-modules-4.3.2-r1.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
+EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
 MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
index 388a9a97a8c8..388a9a97a8c8 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
index 031ea6766820..031ea6766820 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
index 5b209c4c2813..5b209c4c2813 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 75598f0540ed..442ebc5ed2ad 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -5,9 +5,7 @@ AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e015b77c5523ed60343f5b7cc737c79b2f9420c42d7a60819c23322ad34770d1dcb93f0f1dea461bca3e7c831 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-4.0.3-r1.ebuild 842 BLAKE2B 436b4eef63e9e4b8c48c7ce2c989c6614354acfc5f5a6dfa920b78915aea3e808ad3a99b39c16748011f100e4165f05ff7ff95e438261930786c3e4f35991c2d SHA512 8518a8b773bafaaa98c4f238c183ccaf88be585b88e6dec1efaa2eb609832e633097943560438b080934668eb968e3b669c14aa20017512faa91f2a92e7f122a
+EBUILD metis-4.0.3-r1.ebuild 843 BLAKE2B d20fe57aeaecc542db25429495efff913b9c33719d08626686bdaddeac1e54d84cd0cabe2ebb2837b283a823bd54e7f0c513e7863a208199afdd918723db422a SHA512 b61f5b756ac0c31e509c825cb52464ea43e71764cb4431c36aed09a180ee36523c5b00e78cedd532459231674d7456947999f97f0d7433cf01bb61ba4c959dc0
 EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
-EBUILD metis-5.1.0-r2.ebuild 1905 BLAKE2B 4bffcbb4a902c84b843a7398491242ec6a6c37a3c9a9353e28b4debad79edf95332db9578cd098b5469c8a9d144a05d4864333a29f888f46c061dd125bf59579 SHA512 7c2b0b9cece1f4842babea6cf02492584b79eb965acffe9135f43372ceabb3a87fa3514e29fb1edf061b579196a0664ee8ae5e133375e7793d06fb529b9bae5d
-EBUILD metis-5.1.0-r3.ebuild 1936 BLAKE2B ef3740f53f426b5ab9e241963a5a1401e776008a311b999297b2ec267bf59902efaff5d21a0ded45084de967de9b7ee14fd6a9ecdcf12d9601fac9b59f26747f SHA512 c42713219592ce941c56230c7b7181053c41d80ad476671115909e09ea02d7d631b485874ab348712f9867c2c0a2b4c11e13b71db4667f0591b09e694248167d
-EBUILD metis-5.1.0-r4.ebuild 1481 BLAKE2B 1fcc848c42773c37f808ce1e42104204df60fe344148815576230fb0d784da1e5c32f1d4b8ad1d51bff1400c079120fb24526fe719f3063a43cd0b3b1ea897f9 SHA512 62004079f5d2c81823a0185670ed6f15a6c3f55ac2c75e6144cf39df6e119a0db9f1fe23aaafcc6a4363df4ddd161ee6c44152fb70b5971ada676ba5a4a44797
+EBUILD metis-5.1.0-r4.ebuild 1479 BLAKE2B 40880ea6432947d892720bb1b31f29d38d59d8a41a420f4b443299e663fac7e6ef9658673267008d872bc37d503b5e6782eb4907a173ebb0c2b3afb84b7bae5f SHA512 6df2841404d1d80901319ce9d932b4b44f118ff05bd63cd4759e85f315d959b0182ed58fc4657a2a2d9dbe20bdec8fb33c1bdcdf4816e7d94dd7009f5dcbd636
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-4.0.3-r1.ebuild b/sci-libs/metis/metis-4.0.3-r1.ebuild
index 2f0d76f02d59..649d419b4124 100644
--- a/sci-libs/metis/metis-4.0.3-r1.ebuild
+++ b/sci-libs/metis/metis-4.0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 RESTRICT="mirror bindist"
 
diff --git a/sci-libs/metis/metis-5.1.0-r2.ebuild b/sci-libs/metis/metis-5.1.0-r2.ebuild
deleted file mode 100644
index a006742a7f5b..000000000000
--- a/sci-libs/metis/metis-5.1.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fortran-2
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="Apache-2.0"
-IUSE="doc openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sci-libs/parmetis"
-
-DOCS=( manual/manual.pdf )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-datatype.patch
-	"${FILESDIR}"/${P}-shared-GKlib.patch
-	"${FILESDIR}"/${P}-multilib.patch
-)
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i GKlib/GKlibSystem.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGKLIB_PATH="${S}"/GKlib
-		-DSHARED=TRUE
-		-DOPENMP="$(usex openmp)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd graphs || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib ndmetis mdual.graph || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib mpmetis metis.mesh 2 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis test.mgraph 4 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis copter2.graph 4 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib graphchk 4elt.graph || die
-}
-
-src_install() {
-	cat >> "${T}"/metis.pc <<- EOF
-	prefix=${EPREFIX}/usr
-	exec_prefix=\${prefix}
-	libdir=\${exec_prefix}/$(get_libdir)
-	includedir=\${prefix}/include
-
-	Name: METIS
-	Description: Software for partioning unstructured graphes and meshes
-	Version: ${PV}
-	Cflags: -I\${includedir}/metis
-	Libs: -L\${libdir} -lmetis
-	EOF
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${T}"/metis.pc
-	cmake-utils_src_install
-}
diff --git a/sci-libs/metis/metis-5.1.0-r3.ebuild b/sci-libs/metis/metis-5.1.0-r3.ebuild
deleted file mode 100644
index 249aad35b805..000000000000
--- a/sci-libs/metis/metis-5.1.0-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fortran-2
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="Apache-2.0"
-IUSE="doc openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sci-libs/parmetis"
-
-DOCS=( manual/manual.pdf )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-datatype.patch
-	"${FILESDIR}"/${P}-shared-GKlib.patch
-	"${FILESDIR}"/${P}-multilib.patch
-)
-
-src_prepare() {
-	sed \
-		-e 's:-O3::g' \
-		-i GKlib/GKlibSystem.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGKLIB_PATH="${S}"/GKlib
-		-DSHARED="$(usex static-libs no yes)"
-		-DOPENMP="$(usex openmp)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd graphs || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib ndmetis mdual.graph || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib mpmetis metis.mesh 2 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis test.mgraph 4 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis copter2.graph 4 || die
-	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib graphchk 4elt.graph || die
-}
-
-src_install() {
-	cat >> "${T}"/metis.pc <<- EOF
-	prefix=${EPREFIX}/usr
-	exec_prefix=\${prefix}
-	libdir=\${exec_prefix}/$(get_libdir)
-	includedir=\${prefix}/include
-
-	Name: METIS
-	Description: Software for partioning unstructured graphes and meshes
-	Version: ${PV}
-	Cflags: -I\${includedir}/metis
-	Libs: -L\${libdir} -lmetis
-	EOF
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${T}"/metis.pc
-	cmake-utils_src_install
-}
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index 1883a113d0e2..73cb6ab6964c 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc openmp"
 
 RDEPEND="!sci-libs/parmetis"
diff --git a/sci-libs/minfx/Manifest b/sci-libs/minfx/Manifest
index 6b7e392877e6..1e7d3ead46b7 100644
--- a/sci-libs/minfx/Manifest
+++ b/sci-libs/minfx/Manifest
@@ -1,15 +1,3 @@
-DIST minfx-1.0.10.tar.gz 61533 BLAKE2B 8d50b220d8a869a228e1ab8e1eeca0351543da4ab1ca02d27d2a692d6982a950b71cb1e1241a742a891eb6aae98a9a0085260ce2c9492cec71fbe2a70785d954 SHA512 200b8b163a5e02f5c2e6935382418642a8fd6d02cf99da015fb267ad598182036e2605174da8e49421ec49fbe00f1148aebc16a7ccfc0a8b18f7a7bc09185755
 DIST minfx-1.0.11.tar.gz 62102 BLAKE2B 1a7a7be4d3a9290be84ec73786712ff99b605d72c13a0c32cd6965df3412d8a1f0de4f0bd9ebc0e4fd231b573fe8b3b9e6862586598452de1a4088cdbd2ffb85 SHA512 1eb3136f363be4e8798bc01e638777ef4713ddc33521980923f0157c7b25cbbb03762b571cea9231f64764a93085ce90b4c521b32d71845a18d5be60b8318976
-DIST minfx-1.0.3.tar.gz 57287 BLAKE2B 4df27ced9636d2b141b4e5297a46d53f0160896bb7c6b9efc90ac88e9186f8d229c72feba2bfa8445869bdcd22c8fa319814b7e078d05226d298b5c5491a5759 SHA512 c5bc696d2720df3af67cae3700fecc318848d8bf3186c64477b193cf8eedeb3afdbb2d49ad067efcd73b28d8f00c48d0a0c1dd6cc6eeb8fae613d3c235e28e25
-DIST minfx-1.0.4.tar.gz 59363 BLAKE2B e69e43e6bf59d413ec7c4f64c53646ba24f7efcdd6739c20654a2ffbce6b613a315afd01d36b639ce903348036e34aa72ba07ce0b63b83c48cfc66d9f72d83eb SHA512 cb67747122bc1ec20c67e200aedf9763fe3ca8cf1adefd1d46008df371d3b8c327864c5257467161d7878f03ab24f5d89e1dfedc42c62e1e6a88c9426bb5fd52
-DIST minfx-1.0.4_pre98.tar.xz 51072 BLAKE2B 08d42fd22640670e60155d1985a05db11de3e8bc929ebb638c8b17439969a24990c1785fbf19911dfd9aad553955b24a84cac82d5e1f5a9c29ba799c74eea35e SHA512 734ce5d6596cf4ef91ad5ccbee3bffc1bb121a448cb78eac373b412fc1aa7ba2227ee0bce108ade45d037558a7692f67c504bf5aa1d6462dfcee05cee0cb9b9f
-DIST minfx-1.0.5.tar.gz 60700 BLAKE2B 33b77c6620fb3fa2abc0390bb80c0c67ba132868ea3da5550d868d28ea56650ada6efcffb1d5e200a3b821dc7e34e0ab48c67325621f59fadf7a3705f7154404 SHA512 86b48f3cde26d141e3b9e43decd1c01a7cc78a51165e964090e0db7ea73a31fa34ca383a4f2b6df9394c1f00cc4fe4eb52b32b721d2bad7cad622e74b8aa3742
-DIST minfx-1.0.6.tar.gz 60776 BLAKE2B b9cfde680d9e3734b5dd068092d3ed2e6652bceca27c6cc7b92e22e16234211151ce1cf7f8b935fb51c05aac4302f3e86a619a945c0a093da69490f74dbacbfd SHA512 f98a64d2a34db1d7d1df5c93f89fad13ddd3f4d2d27a170c76236284276de573b543b365af45030076f4c49e9d26cc67375dfe351c830f98c1580fb0dbaabee9
-EBUILD minfx-1.0.10.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.11.ebuild 389 BLAKE2B 812a0bfe91c50d6aafc11e9091cbce103d21ff435e500805bd1fc365a439895d15d5079b48f63ba38c3f0cad269d9a62691cc59f96e759bb5d0ee41b1ef3c395 SHA512 00c4b517631feea7a1fb4317f5d0abcaf08d2422d9fde05eb84199b06730a8575d57b26d86ed614d5ceeadc1cd0f0024537ce785d85ac90a1ebf5c03d82f6821
-EBUILD minfx-1.0.3-r1.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.4.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.4_pre98.ebuild 445 BLAKE2B f8b795a653fad4a45b50346df5a824d88f422378bdf401cc451bf4ade7a728f99249b1c454822c377b519207d8f4aa77baf45f36db8a65754b8d02e32c6282f0 SHA512 1cf8d6a683d95ade1e65904015d3a426b01b7c6d87af112e8f5a73fea7ae3f07c9de20c9bc74f369f8c84183236b618e92cb96499d0f867831ddecbd61e4c69b
-EBUILD minfx-1.0.5.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.6.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.11.ebuild 383 BLAKE2B cbc41df86f45983fdca9a9680c755f5e0f44faa4f21969145c149196e26a10bbb62ff7c409748a6160f77eabb89e4616d8027ea6a35699aa754fb884afa306ab SHA512 b48b6650b4d70d2bee6e828a9b5ae7bca5f4b192adf1369a21e2ca850d846b94dfb07c5703afff9c84ce5692b8b6daab53b814d48cc46b55ec4d4f1ab936bf17
 MISC metadata.xml 517 BLAKE2B 0716933a4c886a8245b8a93d2d2e8a7378124f420a6e068b57472de3dc977aab93848b16635f162ffea8a8770e3bf9cba5b0a7a803ef1e01de03c40961f62667 SHA512 656aaca8e83634c0dd4669bc62c9ada5db7a5882eafc33cec13f20dd5429bc7a24c34641f65ecb68bf39d9152fee381747ad1f15234a9e6a16e82d1cd0b160b1
diff --git a/sci-libs/minfx/minfx-1.0.10.ebuild b/sci-libs/minfx/minfx-1.0.10.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.11.ebuild b/sci-libs/minfx/minfx-1.0.11.ebuild
index 00c79c67cadb..af544263d47d 100644
--- a/sci-libs/minfx/minfx-1.0.11.ebuild
+++ b/sci-libs/minfx/minfx-1.0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.3-r1.ebuild b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.4.ebuild b/sci-libs/minfx/minfx-1.0.4.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
deleted file mode 100644
index fbf89ca2eb46..000000000000
--- a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-#SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.5.ebuild b/sci-libs/minfx/minfx-1.0.5.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.6.ebuild b/sci-libs/minfx/minfx-1.0.6.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 00c58303e7fb..e497a875f58a 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1722 BLAKE2B 0d356fc5762aa25d8dff40d72ad031201d6a1c01fd10107f815ae2cb4f6abbb5b2806b9097f87f916ea892f246d0ccf9e0f00cfc88b65f7b1d8ab4eab775e0ad SHA512 43d1bc825f15e4386a163860ff62917ccdffc7cc3d1ed4cc767e101ca78f86a6212fa618b92439d7f308108c4e71bb55d2a2cb7738d8b275b6714e6ac3e21b6c
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1842 BLAKE2B 232747c585153b4b71a8aa08574a4c4e41fb3f5c6d3c9cdf6e3dea34a7e330fb5a42dbbc740b02c36ae0261f251d3494bba29775280882fdd048c1d6dcefa9b8 SHA512 92bcd6e52bbbc97f3ac203c2d9afd5694cdf9c96ce18b716dc5d9e8e74615d0ecb162b61028cdb75c3502347810b199ae8b1c1fcfcafb8ffd6f939b6c2439792
+EBUILD mpir-3.0.0.ebuild 1861 BLAKE2B 96176019bfcf1bd0aa11a9c830b53c2d2f1da620adc6503fc4a7ada7cc776a5d287d20514f7f58975f09bb8964aa8319b1342955358aee5bf65d1a6f5b7cff58 SHA512 b17b67253c8f5c43ee9627848ec0604b3d0cce93a50204966ef65d53df7ad1184a879a24ad66c99d407bf7070333e1d0f4b4ee4494db9ee98dd0f79ba23702b1
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index b22fb7b36036..cdefac106b6a 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 5b902d46582f..27b3d1db2aff 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,10 +1,3 @@
-AUX nlopt-2.3-as-needed.patch 1062 BLAKE2B 69bb06372cdd37ba86e107eb1c9c545d084906495b3e20a223ed93a712663310e32d5fb37713450f957c76d9921ae6b8baba8a36f196b7b997e966442ebba9c1 SHA512 755e04b0e9d2ab5b1256c14015980b051716756777b910a9273a0dced4108e19a8f3030c1d03c6d96561a7edb3e883fdbc2822e1d6c1b74fa2794c336612cc47
-AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac53a877128c3a99ad0c200ec35326c09881bf0f8726817637c612aea81b6d57ecc5544d4cf86245493082b575a0 SHA512 923b20e177a842643b1022d68168978d5fb35e987c6781d8b0b368a6c707f4b42a4141c4ca7cf33cd7067a39147ae87220adeaaa545a8731bb6a5d2f3d11a5bc
-AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19
-AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4
-DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
-EBUILD nlopt-2.4.2-r2.ebuild 2714 BLAKE2B 3939763ab3da6e8708c10b3ca39f1c001f2d9913e883648cade9d58b83c3242804991373fdd36599474715840562533881c8ab0ffd98cda54ad71d3d4c12cbe4 SHA512 c2a7e3336ccb1887c2c6074aed5fffb254dd11e607d871bd3ed864794d04cdfb7a3aff711b8cb5f7f0a98629f34a196f4f5fa7221f5c07324b2439b48cc9e5c9
-EBUILD nlopt-2.6.2-r1.ebuild 2301 BLAKE2B 92872c3fe8856a81648071c2f4fea997c96f3e8590ccf9d5bcfc27dafc73bdff822e18768521c8ce42e1eb4e3ebca1a4ccd15038e4688ebb179907ab422c71ae SHA512 68a32c60540e17cb91ed86987e3981ad519656ab2bab83fbacc98fb01e439ca65e85a8c75c8d06860b4fc47329e08f19b591e1fae25192510f9a5d44216bf749
-EBUILD nlopt-2.6.2.ebuild 2412 BLAKE2B 722391655b7a5cebb487bf893efe1203a440affc3739282ba26e7a5202edff01d953a43a157da5c6c7d5f809135674089f8179edc2be43498daa8aaa5d8c4a19 SHA512 462bb900b0eaa779bf29c6dfb99f52b432e7c3c29c4c997e3fb8019b94ba0885fbab8b57e0d7673fc561407923942e7026febe1d3c196a10f9d53cd11feea02d
+EBUILD nlopt-2.6.2-r1.ebuild 2299 BLAKE2B 1785464bdd62a15a21e9172acf1113f1c501e866eda1f159885fe04e8afbed3341113c0f0e0e6acfbde8972bd2742815897f5b4db9f17b35fc110143087c1a47 SHA512 9b819bffce1da6f62efb61dcbb11837af6b57923906ddb39894aa406a9889902f9f2bd6d771dc1428275ba38b5f86e933b714833e43088c28f89c720cfb9e934
 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7
diff --git a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch b/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
deleted file mode 100644
index 928ec174b771..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur nlopt-2.3.orig/Makefile.am nlopt-2.3/Makefile.am
---- nlopt-2.3.orig/Makefile.am	2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/Makefile.am	2012-08-03 02:13:13.000000000 +0100
-@@ -25,6 +25,7 @@
- 
- if WITH_CXX
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libnlopt@NLOPT_SUFFIX@_la_LIBADD += -lstdc++
- else
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
- endif
-diff -Nur nlopt-2.3.orig/swig/Makefile.am nlopt-2.3/swig/Makefile.am
---- nlopt-2.3.orig/swig/Makefile.am	2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/swig/Makefile.am	2012-08-03 03:04:30.000000000 +0100
-@@ -9,7 +9,7 @@
- # Guile wrapper
- 
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api
- 
diff --git a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch b/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
deleted file mode 100644
index 8a072b15e2e2..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nlopt.pc.in.orig	2012-08-03 01:41:30.000000000 +0100
-+++ nlopt.pc.in	2012-08-03 01:42:29.000000000 +0100
-@@ -6,5 +6,6 @@
- Name: NLopt
- Description: nonlinear optimization libary
- Version: @VERSION@
--Libs: -L${libdir} -lnlopt -lm
-+Libs: -L${libdir} -lnlopt@NLOPT_SUFFIX@
-+Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
deleted file mode 100644
index beb9dd4de815..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix underlinking issues, caused by missing -lpython27 and -lpthread
-
---- nlopt-2.4.2/configure.ac
-+++ nlopt-2.4.2/configure.ac
-@@ -161,33 +161,17 @@
- dnl Python:
- AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
- if test $have_python = yes; then
--  AC_ARG_VAR([PYTHON_CONFIG], [python-config program])
--  AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config],
--                [unknown], [`dirname $PYTHON`:$PATH])
--  AC_MSG_CHECKING([for Python include flags])
--  if test "x$PYTHON_CONFIG" = "xunknown"; then
--      pinc=-I`echo "import distutils.sysconfig; print (distutils.sysconfig.get_python_inc())" | $PYTHON - 2>/dev/null`
--      test "x$pinc" = "x-I" && pinc=""
--  else
--      pinc=`$PYTHON_CONFIG --includes 2>/dev/null`
--  fi
--  AC_MSG_RESULT([${pinc:-unknown}])
--  PYTHON_INCLUDES="$pinc"
--  save_CPPFLAGS=$CPPFLAGS
--  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
--  AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers]) 
--                                   have_python=no])
--  if test $have_python = yes; then
-+  PKG_CHECK_MODULES([PYTHON], [python-2.7])
-+  CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+  
-     AC_MSG_CHECKING([for Numpy include directory])
-     pinc=`echo "import numpy; print (numpy.get_include())" | $PYTHON - 2>/dev/null`
-     AC_MSG_RESULT([${pinc:-unknown}])
--    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_INCLUDES -I$pinc"
-+    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_CFLAGS -I$pinc"
-     CPPFLAGS="$save_CPPFLAGS $PYTHON_INCLUDES"
-     AC_CHECK_HEADER([numpy/arrayobject.h],[],[
-       AC_MSG_WARN([disabling Python wrappers])
-       have_python=no],[#include <Python.h>])
--  fi
--  CPPFLAGS=$save_CPPFLAGS
- fi
- 
- fi # with_python
---- nlopt-2.4.2/swig/Makefile.am
-+++ nlopt-2.4.2/swig/Makefile.am
-@@ -9,7 +9,7 @@
- # Guile wrapper
- 
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = -lpthread ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api
- 
-@@ -23,7 +23,7 @@
- # Python wrapper
- 
- _nlopt_la_SOURCES = nlopt-python.cpp
--_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @PYTHON_LIBS@
- _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
- _nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
- 
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
deleted file mode 100644
index c82d99497e67..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fix issues caused by Octave-4 renaming Octave_map to octave_map
-See also
-https://bugs.gentoo.org/show_bug.cgi?id=569996
-https://github.com/stevengj/nlopt/commit/5326ab410c978f9d8c3cae7e4917f55c10ef2c2e?diff=unified
-
---- nlopt-2.4.2_old/octave/nlopt_optimize-oct.cc	2014-05-20 20:35:58.000000000 +0200
-+++ nlopt-2.4.2/octave/nlopt_optimize-oct.cc	2016-01-09 16:10:53.358491776 +0100
-@@ -30,5 +30,5 @@
- #include "nlopt_optimize_usage.h"
- 
--static int struct_val_default(Octave_map &m, const std::string& k,
-+static int struct_val_default(octave_map &m, const std::string& k,
- 				 int dflt)
- {
-@@ -40,5 +40,5 @@
- }
- 
--static double struct_val_default(Octave_map &m, const std::string& k,
-+static double struct_val_default(octave_map &m, const std::string& k,
- 				 double dflt)
- {
-@@ -50,5 +50,5 @@
- }
- 
--static Matrix struct_val_default(Octave_map &m, const std::string& k,
-+static Matrix struct_val_default(octave_map &m, const std::string& k,
- 				 Matrix &dflt)
- {
-@@ -141,5 +141,5 @@
- #define CHECK1(cond, msg) if (!(cond)) { fprintf(stderr, msg "\n\n"); nlopt_destroy(opt); nlopt_destroy(local_opt); return NULL; }
- 
--nlopt_opt make_opt(Octave_map &opts, int n)
-+nlopt_opt make_opt(octave_map &opts, int n)
- {
-   nlopt_opt opt = NULL, local_opt = NULL;
-@@ -196,5 +196,5 @@
- 	  && (opts.contents("local_optimizer"))(0).is_map(),
- 	  "opt.local_optimizer must be a structure");
--    Octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
-+    octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
-     CHECK1((local_opt = make_opt(local_opts, n)), 
- 	  "error initializing local optimizer");
-@@ -217,5 +217,5 @@
- 
-   CHECK(args(0).is_map(), "opt must be structure")
--  Octave_map opts = args(0).map_value();
-+  octave_map opts = args(0).map_value();
- 
-   CHECK(args(1).is_real_matrix() || args(1).is_real_scalar(),
diff --git a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
deleted file mode 100644
index 5a937cd80edd..000000000000
--- a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit python-r1 autotools-utils
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="http://ab-initio.mit.edu/nlopt/"
-SRC_URI="http://ab-initio.mit.edu/nlopt/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	guile? ( dev-scheme/guile:* )
-	octave? ( sci-mathematics/octave )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-pkgconfig.patch
-	"${FILESDIR}"/${PN}-2.3-as-needed.patch
-	"${FILESDIR}"/${P}-fix-dynamic-underlinking.patch
-)
-
-src_prepare() {
-	# fix #569996 due to renaming of Octave_map class
-	has_version ">=sci-mathematics/octave-4.0" && \
-		epatch "${FILESDIR}/${P}-octave-4-map.patch"
-	autotools-utils_src_prepare
-	use cxx && BUILD_CXX="${S}_cxx"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with octave)
-	)
-	if use octave; then
-		export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)"
-		export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)"
-	else
-		export MKOCTFILE=None
-	fi
-
-	myeconfargs+=(
-		$(use_with guile)
-	)
-
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_configure
-	else
-		autotools-utils_src_configure
-	fi
-
-	if use cxx; then
-		myeconfargs+=( --with-cxx --without-octave --without-python )
-		BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_compile
-	else
-		autotools-utils_src_compile
-	fi
-	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile
-	#-C "${BUILD_DIR}_cxx"
-}
-
-src_test() {
-	do_test() {
-		local a f
-		cd "${BUILD_DIR}"/test
-		for a in {1..7}; do
-			for f in {5..9}; do
-				./testopt -a $a -o $f || die "algorithm $a function $f failed"
-			done
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
-	fi
-	cd "${BUILD_CXX}"/test
-	for a in {1..9}; do
-		for f in {5..9}; do
-			./testopt -a $a -o $f || die "algorithm $a function $f failed"
-		done
-	done
-}
-
-src_install() {
-	# build cxx first so the c lib overwrites the pc file
-	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_install
-	else
-		autotools-utils_src_install
-	fi
-	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 416022d0dc54..6fa9dea93bbe 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
deleted file mode 100644
index 21c2ada3624a..000000000000
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit python-r1 cmake fortran-2
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	guile? ( dev-scheme/guile:* )
-	octave? ( sci-mathematics/octave )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' -2)
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3)
-	)
-	"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	"
-
-src_prepare() {
-	cmake_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNLOPT_CXX=$(usex cxx)
-		-DNLOPT_FORTRAN=$(usex test)
-		-DNLOPT_GUILE=$(usex guile)
-		-DNLOPT_OCTAVE=$(usex octave)
-		-DNLOPT_PYTHON=$(usex python)
-		-DNLOPT_SWIG=$(usex python)
-		-DNLOPT_TESTS=$(usex test)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_configure
-	else
-		cmake_src_configure
-	fi
-	if use static-libs; then
-		mycmakeargs+=(
-			-DBUILD_SHARED_LIBS=OFF
-		)
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_compile
-	else
-		cmake_src_compile
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
-	fi
-}
-
-src_test() {
-	do_test() {
-		local a f
-		cd "${BUILD_DIR}"/test
-		for a in {1..$(usex cxx 9 7)}; do
-			for f in {5..9}; do
-				./testopt -a $a -o $f || die "algorithm $a function $f failed"
-			done
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
-	fi
-}
-
-nlopt_install() {
-	cmake_src_install
-	python_optimize
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir nlopt_install
-	else
-		cmake_src_install
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
-	fi
-	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 9437f5a73037..20043f85f1c0 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,5 +1,7 @@
 AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
 DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
+DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
 EBUILD octomap-1.9.0.ebuild 2015 BLAKE2B 2f504d3e91d967338f6831af1e93a38d3d59949f470f52e41a1ae2914fc52814c532bb8db3ae1a9f5e35ba4280c4643b29101c077c05847753eb229343f9effa SHA512 71af329bdd24260600d9fd79f474b0e587ce674c8746935eb673b50a9374347d340bf00313dc32b71575f3ea92900cacf04a2f369da47387010188da4a666899
+EBUILD octomap-1.9.5.ebuild 1690 BLAKE2B 6870c1c4024896a857df097d4c61620993b37aaaf4faed6167e79677407e61971bd74285dd69b1e1a73019ec402c17ab608a2617765a9845c4f673efd018f862 SHA512 edfee4f4e8e0a5c78c05c5b6e5dbb54c8a0a7e2b5311facfc091aceb0c5e97a87a704af9b13f0637ada6fc6d304106e0fadaebdc4aabacf6683f1f033a17dd68
 EBUILD octomap-9999.ebuild 1975 BLAKE2B 63b34fd1c61e447e16c9e4b988e5b564d421cea9f15fad3a5e8579222c0f7f174e6c84167d7960c1e6e7d660aaa645ce88d92eba0ceb33c5254db3ef6bea7793 SHA512 018a25e757235bb8509c2e502bd87b286d484037aa4738e06014051675da58a24562580fc284276f18cbe2492779fa4214dd361aed49dbfa8170df6e81ea9f8d
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild
new file mode 100644
index 000000000000..230100c81764
--- /dev/null
+++ b/sci-libs/octomap/octomap-1.9.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
+HOMEPAGE="http://octomap.github.io/"
+SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm"
+IUSE="qt5 dynamicEDT3D doc"
+
+RDEPEND="
+	qt5? (
+		virtual/opengl
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		x11-libs/libQGLViewer:=
+	)
+"
+BDEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+# https://github.com/OctoMap/octomap/issues/194
+PATCHES=( "${FILESDIR}/qglqt5.patch" )
+
+src_prepare() {
+	rm -r octovis/src/extern
+
+	sed --in-place \
+		--expression='s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+		*/CMakeLists.txt */CMakeModules/InstallPkgConfigFile.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+		"-DOCTOVIS_QT5=ON"
+		"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build docs docs_dynamicEDT3D
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		docinto html/octomap
+		dodoc -r octomap/doc/html/*
+
+		docinto html/dynamicEDT3D
+		dodoc -r dynamicEDT3D/doc/html/*
+	fi
+
+  insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+
+	if use qt5; then
+		insinto /usr/share/ros_packages/octovis
+		doins "${ED}/usr/share/octovis/package.xml"
+	fi
+}
+
+src_test() {
+	# override parallel mode only for tests
+	local myctestargs=( "-j 1" )
+	cmake_src_test
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 2b4f034efa61..3c13249fa7c1 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,11 +1,5 @@
-DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
-DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
 DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
-DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
-DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
-EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
-EBUILD proj-7.0.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
+EBUILD proj-7.0.1.ebuild 1219 BLAKE2B 8852ed09c9a0b6ed39693f322d57fb1e447a0640af80b90831eb4c837913e345f1b4e69064f1d7409ece14794c7bb4b389a5555ca08327efcc9c6368bc854f67 SHA512 c0c17b2dc10b480e7cebad6a059e18ccb53a7bca93b68bdfec7737cb0ae20d66712a50bfb347fb1ea8b19c2d696b6bce93298fbf7f1336d70ab2938a3c553b5d
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
deleted file mode 100644
index a249436269b5..000000000000
--- a/sci-libs/proj/proj-6.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.4.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( !europe )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/proj/proj-6.3.0.ebuild b/sci-libs/proj/proj-6.3.0.ebuild
deleted file mode 100644
index f8a951b32218..000000000000
--- a/sci-libs/proj/proj-6.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.5.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( !europe )"
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 5a90105f20d9..5d236f000813 100644
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index 6ecb99b2636e..a421547a037f 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -2,5 +2,4 @@ DIST pyshp-1.2.0.tar.gz 58993 BLAKE2B f7cb69976b6dd089be45d7984765f803ce94300dc1
 DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb
 EBUILD pyshp-1.2.0.ebuild 590 BLAKE2B 331661c6e5e7cb380fa36822c7ae6f9c3b1e2a3b36362ee7c6cb25ac3f52c3b196a19f93968657a07f435ea95c77bfaf9296fa598a2689c2ef518ca73cd2c36c SHA512 03ff5d90f4b896fe0d40f783a24879b2f33a725d3d9d67c6cac60a21542cfe530f48e5aaa8304a32405fee603048c3e5a72026b235b028cf82f5bb1ce16f6f45
 EBUILD pyshp-2.1.0.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0
-EBUILD pyshp-9999.ebuild 590 BLAKE2B 331661c6e5e7cb380fa36822c7ae6f9c3b1e2a3b36362ee7c6cb25ac3f52c3b196a19f93968657a07f435ea95c77bfaf9296fa598a2689c2ef518ca73cd2c36c SHA512 03ff5d90f4b896fe0d40f783a24879b2f33a725d3d9d67c6cac60a21542cfe530f48e5aaa8304a32405fee603048c3e5a72026b235b028cf82f5bb1ce16f6f45
 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/pyshp-9999.ebuild b/sci-libs/pyshp/pyshp-9999.ebuild
deleted file mode 100644
index 708ad5092d3f..000000000000
--- a/sci-libs/pyshp/pyshp-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.org/project/pyshp/"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk"
-	inherit subversion
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/scipy-python2/Manifest b/sci-libs/scipy-python2/Manifest
deleted file mode 100644
index fbaf34f82f5c..000000000000
--- a/sci-libs/scipy-python2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
-DIST scipy-1.2.3.tar.gz 23335997 BLAKE2B 183a0e8266a6fa08ca4fa05511d28f51a5ff9b3e8d00c24a355d2db00327eb973befbefbcf47cb288aafd60718db903ac29f775f519484a7c6d0919693c0a21f SHA512 d7739fa2f25689fc14ddf09477207c990b39b593a85f5c74687df1ffe097f6eee1bb2123aaa286189309f6d3b25cdd7757053d8b1008d1d6b3367a8e3a0a53b1
-EBUILD scipy-python2-1.1.0.ebuild 3628 BLAKE2B c4fc9703dd9ca163fe298bb3d1d37c72ed7a0bd0b559029cbe988b91b2f705df438d5a8f3fc2e7a78975c93d8cdefc35cf05abfead68177a391e8ff2f0e16ea4 SHA512 dcacd321b5828901290078a4e41618d19d21a6253ee0d8db6c73c247477f31343b8a3c86e9f2098f04abc70f2bc27772b2e41d09722d2d5631cc7f9595d40395
-EBUILD scipy-python2-1.2.3.ebuild 3645 BLAKE2B 1046f2e2bf1fc8ca276706c50f7043ee83d105a384f6b473bf649d738a4f6201ccd719756d4bc77a91b8afb56cde1414a0c14e9640f7b6d8e497bf294a9fcf9d SHA512 2c629e5b399e8a86b15f0b12b1657c5e3cc362a79415ae75f20ba037f36037b39ebcfb3531fc7d3206bae060c7be82954d04fa3b96e8c7f3291dc4cbbc354d7b
-MISC metadata.xml 945 BLAKE2B 52bc24aea94ec233940c12969222f7ad3c8b9760b08a608bf6dc6d320b4a519a27103c2f11d720490c933f90a31fe3fb503694bd067136975617c50efa3c5d47 SHA512 7ab95c274799a7852968c63ca6f05c302d4e478d9e195980859b960ec2f2b1146c1c12674d737f324101383155387429ec1c05f779888819503feebf1e38e6c4
diff --git a/sci-libs/scipy-python2/metadata.xml b/sci-libs/scipy-python2/metadata.xml
deleted file mode 100644
index 2425e896a8a0..000000000000
--- a/sci-libs/scipy-python2/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    SciPy is an open source library of scientific tools for Python. SciPy
-    supplements the popular numpy module, gathering a variety of high level
-    science and engineering modules together as a single package.
-    SciPy includes modules for graphics and plotting, optimization,
-    integration, special functions, signal and image processing, genetic
-    algorithms, ODE solvers, and others.
-  </longdescription>
-  <use>
-    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">scipy</remote-id>
-    <remote-id type="sourceforge">scipy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 7910e0790e21..0d594184be31 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,7 +7,15 @@ DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91
 DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
 DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
 DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
-EBUILD scipy-1.1.0.ebuild 4122 BLAKE2B 6c4d91c33b7f02a461f0b2805a859e160687d8a4e4792f3a12a44dcadfb33b056a705e836b2ef4fa9da36a41e7e79e285da6571b97e0172262b991dc5aa715f2 SHA512 0df59214221d5ad19b70ee60e965008f9ba598d234e1b6bda0c8f2cd99cf0eba7dc3a718bc32d01b3f5f194b2858fa04eabee4aa0012519ce43c322887a04b2c
+DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850 SHA512 eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
+DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b SHA512 c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
+DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c SHA512 d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040
+DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
+DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
+DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
+EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
 EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
+EBUILD scipy-1.5.1.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
+EBUILD scipy-1.5.2.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index a4576826f4cd..119210dc4f00 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild b/sci-libs/scipy/scipy-1.5.1.ebuild
index 05b35f960a41..21948a8eb2c5 100644
--- a/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild
+++ b/sci-libs/scipy/scipy-1.5.1.ebuild
@@ -3,51 +3,59 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+DOC_PV=${PV}
 
-MY_PN=${PN/-python2}
-MY_P=${MY_PN}-${PV}
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
 
-DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="https://www.scipy.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="sparse test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
-	|| (
-		>=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	)
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
 	sci-libs/arpack:0=
 	virtual/cblas
 	virtual/lapack
 	sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
 	dev-lang/swig
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
+	doc? ( app-arch/unzip )
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${CDEPEND}
-	!<sci-libs/scipy-1.4
 	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
 pc_incdir() {
 	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
 		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
@@ -91,6 +99,10 @@ python_prepare_all() {
 		library_dirs = $(pc_libdir lapack):${libdir}
 		lapack_libs = $(pc_libs lapack)
 	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
 
 	# Drop hashes to force rebuild of cython based .c code
 	rm cythonize.dat || die
@@ -98,8 +110,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
@@ -108,13 +128,18 @@ python_compile() {
 python_test() {
 	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
 	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
-		|| die "Tests fail with ${EPYTHON}"
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
 }
 
 python_install() {
diff --git a/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild b/sci-libs/scipy/scipy-1.5.2.ebuild
index 23d6871c6c37..a3d305b08469 100644
--- a/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.5.2.ebuild
@@ -3,51 +3,59 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+DOC_PV=${PV}
 
-MY_PN=${PN/-python2}
-MY_P=${MY_PN}-${PV}
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
 
-DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="https://www.scipy.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="sparse test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
-	|| (
-		>=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	)
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
 	sci-libs/arpack:0=
 	virtual/cblas
 	virtual/lapack
 	sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
 	dev-lang/swig
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
+	doc? ( app-arch/unzip )
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${CDEPEND}
-	!<sci-libs/scipy-1.4
 	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
 pc_incdir() {
 	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
 		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
@@ -91,15 +99,33 @@ python_prepare_all() {
 		library_dirs = $(pc_libdir lapack):${libdir}
 		lapack_libs = $(pc_libs lapack)
 	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
 
 	# Drop hashes to force rebuild of cython based .c code
 	rm cythonize.dat || die
 
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
 	distutils-r1_python_prepare_all
 }
 
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
@@ -108,17 +134,23 @@ python_compile() {
 python_test() {
 	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
 	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
-		|| die "Tests fail with ${EPYTHON}"
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
 }
 
 python_install() {
 	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index d2e40b447170..2fc1c6b42165 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,13 +1,8 @@
 AUX scotch-5.1.12b-as-needed.patch 4878 BLAKE2B 1fa95b1d7e03a8d2c3fe6840428b07974dcb2bffe30f17ace62e7998397a27f77b12c497d6bbf9c568b1b81bab785fc7588ac33567e82b9c5a84721bd7a1ac85 SHA512 9f5bf65999978d851b0c61de2235af982e6d1d057af5906d328f2a4b83775f8dd567f1386eecc186d6ec1287d8e84215a88b879ec77de4ac6de5b129ad263411
-AUX scotch-6.0.0-as-needed.patch 5874 BLAKE2B 8a960ff5658d0087600f62f3554e9288a4509502649d1e7e8a10b2dd920449f4f55c115e8f32e9d7b23d9a0b4753333ab291656d0eaafa9d62d74fb7b9ea2275 SHA512 efb458b53ceaa40c140e0920a3e31ab563f347a3bc21d727c338f4b971e4312ef680bb248e99dd609b5191f9e91460a1aa2149932d4277c5bc6406ef0206c24e
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch_5.1.12b_esmumps.tar.gz 3989632 BLAKE2B c529601d68bf7a5497d363a746ad46e0c5b4d0831cd9e128ce10a09580215d5370e3766ceb1c2550985b554e2ae6c125149b11f376b32881fc66c052885c814d SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671
-DIST scotch_6.0.0_esmumps.tar.gz 4534976 BLAKE2B 3d66076a520ea0f515c689c64eade13884f09ee6c58ac38e57635c405e2bd525ac144c8e36e6e86264b89480eba48f1b6bbe0049c58e1146dbb2e2216177a0f6 SHA512 4509a58363957b009cfc56a0a1ade31e2cb718f50edf7674d00471ee375251d03630e988036e14f545f9f4f270ff4a8b4ebe66a6f9e05b5d769b643bcf9d6067
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-5.1.12b.ebuild 4446 BLAKE2B 6c02eb7b272e22e2c62e95daf9a99745420a69233d0b95bc9479556ba08b6cdc36339272a0cd16eec51934125c3f50afa9873a5a03b21fbd63a87592889726bd SHA512 8020ca4ed7709607e1bc9f4cf21b96efd03ad413912304d70bde02606b1c2cba6abcb6e3a14ae0ff59c19ab82a40efb02567bafe1bce53d0e39d192f3aff1dbb
-EBUILD scotch-6.0.0.ebuild 4628 BLAKE2B ebc43748190e1da73de26e45ef1d43c314eb6e267c36dc5eb803dd3d3654b568c3136fa557c4ec5c370b849e2d89983c09b55c9921550fc5e71016ad9076c818 SHA512 f7f348526f0ae65c3154e432cef738131b9b6d1cb8cba66bc3dfc25cbfe5138c0cd05b0f0a20fa2f572c7d92532ad3d5e90db574ff13b28c1980eb6b041ae1f3
-EBUILD scotch-6.0.4-r1.ebuild 4824 BLAKE2B c49f659384cfece6fe15ea4476cc5e5c1194f3bbc3ac205eab9eddb54a9480e972868c602b5a74d9c0e921910b4442e9055744760f4d0f6520dbd4703aa175b7 SHA512 71110eb916825346450636f7f78a84032dd1a51405654ad50c77e4b717f9bc71c55f6a3f3a7d874ae23fadddbd2c8e3e3a2b8706c895da7eacbac00da9e068ab
 EBUILD scotch-6.0.4-r2.ebuild 4910 BLAKE2B b71de7fd6f6471efe2dbd3037d78aaeb5e6dcda6b1e529014335eebf5714775a79dc4a342e1793042f5e82c2ad181546a2a8a74c067ecec86d1f65e0ea7126e3 SHA512 9909700133b6c8a5ef4094066b19c69fe85a07f413dd0e970f9016567aa161a1963f453cd11aa0e96c1f569b2681aa498cac6b5469a05cff3f614d8b4123412d
-EBUILD scotch-6.0.4.ebuild 4628 BLAKE2B ea17389d6ee48c40ebb66064ed478886cc94b237e806d458f323f2d2a9c8333552256ae4bc25b492ef9b828c5f8c3cceba67fb4ef48b2a1d02497b51864869ef SHA512 0dd2f53982da1fc085f4cca6be9c0ca2c7b0c98548171ed3ad1bb2159389ebd55c6654d95372f47709c108aa7258c291f5f3e23e9e5054a5ebe0b16316fbe14e
 MISC metadata.xml 1199 BLAKE2B c5d721a43a47c20cf10d18bf0f9e1a2db04a2473bf772d6b64a8360a897ddfea8904b0bb65443fbf0738a4580d867477d9b58f8e720c8bd39933d461bd744b85 SHA512 78345510290afd5d47a88595c3d2b07cbdb6f99d1341c6433095750bd27bb0f81fbe5e98cb6ffd23b5c8c2e0a346d1a2f25b5bf2f83093dff471906fdadc4eee
diff --git a/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch b/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch
deleted file mode 100644
index ad41380de884..000000000000
--- a/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nur src.orig/check/Makefile src/check/Makefile
---- src.orig/check/Makefile	2013-02-07 17:27:00.000000000 +0000
-+++ src/check/Makefile	2013-02-07 17:27:21.000000000 +0000
-@@ -48,7 +48,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) $(SCOTCHLIBS) $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile	2013-02-07 17:27:00.000000000 +0000
-+++ src/esmumps/Makefile	2013-02-07 17:28:11.000000000 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit -lm
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -57,7 +57,7 @@
- 					libesmumps$(LIB)							\
- 					main_esmumps$(EXE)
- 
--ptscotch			:	clean
-+ptscotch			:	clean common.h
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
- 					libesmumps$(LIB)										\
- 					main_esmumps$(EXE)
-@@ -160,6 +160,6 @@
- 					order.h					\
- 					symbol.h				\
- 					esmumps.h				\
--					lib$(ESMUMPSLIB)$(LIB)			\
-+					libesmumps$(LIB)			\
- 					$(libdir)/lib$(SCOTCHLIB)$(LIB)		\
- 					$(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
-diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile	2013-02-07 17:27:00.000000000 +0000
-+++ src/libscotch/Makefile	2013-02-07 17:27:21.000000000 +0000
-@@ -43,7 +43,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS)  -o $(@)
- 
- ##
- ##  Project rules.
-@@ -2908,14 +2908,14 @@
- 					mapping.h				\
- 					order.h					\
- 					parser.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+			 		$(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
- 
- ptdummysizes$(EXE)		:	dummysizes.c				\
- 					module.h				\
- 					common.h				\
- 					dgraph.h				\
- 					dorder.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+			 		$(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
- 
- scotch.h			:	dummysizes$(EXE)			\
- 					library.h
-diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile	2013-02-07 17:27:00.000000000 +0000
-+++ src/libscotchmetis/Makefile	2013-02-07 17:27:21.000000000 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -o $(@)
- 
- ##
- ##  Project rules.
-diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile	2013-02-07 17:27:00.000000000 +0000
-+++ src/scotch/Makefile	2013-02-07 17:27:21.000000000 +0000
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
- 
- %$(EXE)	:	%$(OBJ)
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- %$(OBJ)	:	%.c
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -205,7 +205,7 @@
- 					$(libdir)/libptscotch$(LIB)		\
- 					$(libdir)/libptscotcherrexit$(LIB)	\
- 					dgmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LIBS) -o $(@)
- 
- dgscat$(EXE)			:	dgscat.c				\
- 					../libscotch/module.h			\
-@@ -315,7 +315,7 @@
- 					gout_o.c				\
- 					$(includedir)/scotch.h			\
- 					$(libdir)/libscotch$(LIB)
--					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
- 
- gpart$(EXE)			:	gmap.c					\
- 					../libscotch/module.h			\
-@@ -324,7 +324,7 @@
- 					$(libdir)/libscotch$(LIB)		\
- 					$(libdir)/libscotcherrexit$(LIB)	\
- 					gmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
- 
- gscat$(EXE)			:	gscat.c					\
- 					../libscotch/module.h			\
diff --git a/sci-libs/scotch/scotch-6.0.0.ebuild b/sci-libs/scotch/scotch-6.0.0.ebuild
deleted file mode 100644
index c88bdc8a91c5..000000000000
--- a/sci-libs/scotch/scotch-6.0.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=31832
-SOVER=$(get_major_version)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs tools threads"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MYP/b}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	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() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	use int64 && append-cflags -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-	sed -e "s/gcc/$(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-e "s/LDFLAGS/LIBS/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null
-
-		pushd man/man1 > /dev/null
-		for m in *; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/scotch/scotch-6.0.4-r1.ebuild b/sci-libs/scotch/scotch-6.0.4-r1.ebuild
deleted file mode 100644
index 28112e3244c3..000000000000
--- a/sci-libs/scotch/scotch-6.0.4-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=34618
-SOVER=$(get_major_version)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs tools threads"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/-/_}
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	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() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	use int64 && append-cflags -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-	sed -e "s/gcc/$(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-e "s/LDFLAGS/LIBS/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	#install metis headers into a subdir
-	#to allow usage of real metis and scotch
-	#in the same code
-	insinto /usr/include/scotch/metis
-	doins include/*metis*
-	rm include/*metis*
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch/metis
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch/metis
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null
-
-		pushd man/man1 > /dev/null
-		for m in *; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/scotch/scotch-6.0.4.ebuild b/sci-libs/scotch/scotch-6.0.4.ebuild
deleted file mode 100644
index 9ce7d7b3a14b..000000000000
--- a/sci-libs/scotch/scotch-6.0.4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=34618
-SOVER=$(get_major_version)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs tools threads"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/-/_}
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	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() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	use int64 && append-cflags -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-	sed -e "s/gcc/$(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-e "s/LDFLAGS/LIBS/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null
-
-		pushd man/man1 > /dev/null
-		for m in *; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index bbe7a68f69dd..5db0ee0ef71a 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,8 +1,3 @@
-AUX spqr-1.2.3-autotools.patch 7204 BLAKE2B 52d4a84bddc1fa24f4d783f72ce20a3f058d179f917b4fb5c3be590067ad93b9090679273dd9b34505587794470f7283d858effd9ce8c8d5b165be6bb7f01379 SHA512 23b07ce5bbc993dbb8c7811f04d0c8997c4293ad2ffb6fee07b4fc23d5306499bfe5a84683add88a8d7050cf0ae5ed5e9d5a3d03064ef8a049918b5f2a2d1250
-DIST SPQR-1.2.3.tar.gz 1090017 BLAKE2B 7ecd180f2147229bea7d9230c5f645c1d835e7260d58930ab8021c7d90b3b7992d708af942beaa728bce86e83e008db9ecb7d69cb7a3b1245bab1c9c9bf7c4c6 SHA512 1abcde88e157bc99445e3589cacd6aba875429f1cdef87e36e1d6943c1474a2f8df9a65eff99e92d72e346c02f11194b6ec6829c158f42f689f95845c9b11599
-DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008fabb84448ba559b561269861be97d86ec841674c2bc944eb86623675b223947fcccf0716052a899ce17850d32 SHA512 1c7644da2bb7a14b9bc26066b84355626ce5d7c396afe5ce496ae72a5ef54431dc817178bfe7dd69ddf586b661c44066ee0850c91dba846a32787d52607749bf
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
-EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1019 BLAKE2B 3eae137cc4399e2d5793de65bea5838d3891a680c42272eda8a1c921de4e5345c1fb0792403adb1db4ab7d405e8dfa75701f622765916759da94273141674e37 SHA512 be62092f8accc27143fde71126c53c65d571edcc6ba14c664fd3c61aa01c646bb919ab8073bf5885c078c8da212b216126af41be6cd9b5f7f57c29200d403c6d
-MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
+EBUILD spqr-2.0.9.ebuild 1084 BLAKE2B fc8915b515cac36436d02c89f36d6fc707685095cfba07602a81c0bd7735f9557b40ffc7696f276c45bc5db3ae08eda8aea0c0077ccbaf25be807f98511f1875 SHA512 54ba1edac7a24f2750fd18d73ee883f00b6c0a5447948140802826d969db8b1ea6a6c078cb3010957dd35af15df641b821698192df742ada788c445e0335ff8d
+MISC metadata.xml 851 BLAKE2B 9fcb15232c55f46ea54af4b61f977e2c4f98e34950b30ed63a559c28c82f8d2b29882224e08121a47dd5b9ff245aaeaafcb03545c6567fbe5462e941ed650654 SHA512 de53a20986b9063a61fc548fdd1c059ac598b9a7db72bca683494fe6d82701e69e30d682e98adf4a72a43f30157f71d37c29930f00156626d369b6560b6ccda6
diff --git a/sci-libs/spqr/files/spqr-1.2.3-autotools.patch b/sci-libs/spqr/files/spqr-1.2.3-autotools.patch
deleted file mode 100644
index be5d15f188c3..000000000000
--- a/sci-libs/spqr/files/spqr-1.2.3-autotools.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- Demo/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Demo/Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,78 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+LDADD = $(top_builddir)/Source/libspqr.la \
-+	$(CHOLMOD_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \
-+	$(COLAMD_LIBS) $(CCOLAMD_LIBS) \
-+	$(METIS_LIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(TBB_LIBS)
-+
-+check_PROGRAMS = \
-+	qrsimple qrsimplec \
-+	qrdemo qrdemoc
-+
-+qrsimple_SOURCES = qrsimple.cpp
-+qrsimplec = qrsimplec.c
-+qrsimplec_CFLAGS = -ansi
-+qrdemo_SOURCES = qrdemo.cpp
-+qrdemoc_SOURCES = qrdemoc.c
-+qrdemoc_CFLAGS = -ansi
-+
-+
-+check-local: $(check_PROGRAMS)
-+	./qrsimple < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrsimplec < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrsimple < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrsimplec < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/r2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a04.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/c2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a0.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a4.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/s32.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/c32.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a1.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/young1c.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/r2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a04.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/c2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a0.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a4.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/s32.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/c32.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a1.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/young1c.mtx || exit 1
---- Include/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Include/Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,5 @@
-+include_HEADERS = \
-+	spqr.hpp \
-+	SuiteSparseQR_C.h \
-+	SuiteSparseQR_definitions.h \
-+	SuiteSparseQR.hpp
---- Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,2 @@
-+SUBDIRS = Include Source Demo
-+EXTRA_DIST = README.txt
---- Source/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Source/Makefile.am	2009-10-22 23:43:03.000000000 -0400
-@@ -0,0 +1,48 @@
-+AM_CPPFLAGS=-I$(top_srcdir)/Include
-+
-+lib_LTLIBRARIES = libspqr.la
-+
-+libspqr_la_SOURCES = \
-+    spqr_rmap.cpp \
-+    SuiteSparseQR_C.cpp \
-+    SuiteSparseQR_expert.cpp \
-+    spqr_parallel.cpp \
-+    spqr_kernel.cpp \
-+    spqr_analyze.cpp \
-+    spqr_assemble.cpp \
-+    spqr_cpack.cpp \
-+    spqr_csize.cpp \
-+    spqr_fcsize.cpp \
-+    spqr_debug.cpp \
-+    spqr_front.cpp \
-+    spqr_factorize.cpp \
-+    spqr_freenum.cpp \
-+    spqr_freesym.cpp \
-+    spqr_freefac.cpp \
-+    spqr_fsize.cpp \
-+    spqr_maxcolnorm.cpp \
-+    spqr_rconvert.cpp \
-+    spqr_rcount.cpp \
-+    spqr_rhpack.cpp \
-+    spqr_rsolve.cpp \
-+    spqr_stranspose1.cpp \
-+    spqr_stranspose2.cpp \
-+    spqr_hpinv.cpp \
-+    spqr_1fixed.cpp \
-+    spqr_1colamd.cpp \
-+    SuiteSparseQR.cpp \
-+    spqr_1factor.cpp \
-+    spqr_cumsum.cpp \
-+    spqr_shift.cpp \
-+    spqr_happly.cpp \
-+    spqr_panel.cpp \
-+    spqr_happly_work.cpp \
-+    SuiteSparseQR_qmult.cpp \
-+    spqr_trapezoidal.cpp \
-+    spqr_larftb.cpp \
-+    spqr_append.cpp \
-+    spqr_type.cpp \
-+    spqr_tol.cpp
-+
-+libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS) $(LAPACK_CFLAGS)
-+libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS) $(LAPACK_LIBS)
---- configure.ac	1969-12-31 19:00:00.000000000 -0500
-+++ configure.ac	2009-10-22 23:42:32.000000000 -0400
-@@ -0,0 +1,55 @@
-+AC_PREREQ(2.59)
-+AC_INIT(spqr, 1.2, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CXX
-+AC_LANG(C++)
-+
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_LIB(lapack,zlarft_)
-+AC_CHECK_HEADERS(UFconfig.h)
-+AC_CHECK_HEADERS(cholmod.h)
-+AC_CHECK_LIB(cholmod, cholmod_solve, [], \
-+            [AC_MSG_ERROR([Cannot find libcholmod])])
-+
-+AC_ARG_WITH(metis,
-+    [AC_HELP_STRING([--with-metis],
-+		    [Use METIS for partitioning])],
-+     [with_metis=$withval],
-+     [with_metis="yes"])
-+if test x$with_metis = xyes; then
-+    PKG_PROG_PKG_CONFIG
-+    if test -n "$PKG_CONFIG"; then
-+       PKG_CHECK_MODULES([metis], [metis])
-+    else
-+	AC_CHECK_HEADERS(metis.h)
-+    	AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
-+		[AC_MSG_ERROR([Cannot find libmetis])])
-+    fi
-+    AC_DEFINE(NPARTITION)
-+fi
-+AM_CONDITIONAL([METIS], [test x$with_metis = xyes])
-+
-+AC_ARG_WITH(tbb,
-+    [AC_HELP_STRING([--with-tbb],
-+		    [Use Intel Threading Building Block for multithreading])],
-+     [with_tbb=$withval],
-+     [with_tbb="yes"])
-+if test x$with_tbb = xyes; then
-+    AC_CHECK_HEADERS(tbb/task.h)
-+    TBB_CFLAGS=""
-+    TBB_LIBS="-ltbb"
-+    AC_SUBST(TBB_CFLAGS)
-+    AC_SUBST(TBB_LIBS)
-+    AC_DEFINE(HAVE_TBB)
-+fi
-+AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes])
-+
-+AC_CONFIG_FILES([Makefile
-+    Source/Makefile
-+    Include/Makefile
-+    Demo/Makefile])
-+AC_OUTPUT
diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index 0d8618db4112..080353cff1a4 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -13,10 +13,8 @@
   peak performance of a multicore computer.
 </longdescription>
 <use>
-  <flag name="metis">Use <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> for partitioning</flag>
   <flag name="partition">
-    Use the partition module of <pkg>sci-libs/cholmod</pkg> for
-    partitioning
+    Use the partition module of <pkg>sci-libs/cholmod</pkg> for partitioning
   </flag>
   <flag name="tbb">Enable multithreading with the Intel Threads
   Building Block <pkg>dev-cpp/tbb</pkg></flag>
diff --git a/sci-libs/spqr/spqr-1.2.3-r1.ebuild b/sci-libs/spqr/spqr-1.2.3-r1.ebuild
deleted file mode 100644
index 9f722944c3d0..000000000000
--- a/sci-libs/spqr/spqr-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-MY_PN=SPQR
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc metis static-libs tbb"
-RDEPEND="sci-libs/cholmod[supernodal(+)]
-	tbb? ( dev-cpp/tbb )
-	metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README.txt Doc/ChangeLog )
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
-
-S="${WORKDIR}/${MY_PN}"
-
-src_configure() {
-	myeconfargs+=(
-		$(use_with metis)
-		$(use_with tbb)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && doins Doc/*.pdf
-}
diff --git a/sci-libs/spqr/spqr-1.3.1.ebuild b/sci-libs/spqr/spqr-1.3.1.ebuild
deleted file mode 100644
index a22737b28bfa..000000000000
--- a/sci-libs/spqr/spqr-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc metis static-libs tbb"
-RDEPEND="
-	virtual/lapack
-	>=sci-libs/cholmod-2[metis?]
-	tbb? ( dev-cpp/tbb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs+=(
-		$(use_with doc)
-		$(use_with metis partition)
-		$(use_with tbb)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index ae9b6c3adc4b..72475fd658a1 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,8 +9,8 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc partition static-libs tbb"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
@@ -18,7 +18,8 @@ BDEPEND="virtual/pkgconfig
 # USE=lapack, and cholmod has to have partition support if spqr is going
 # to have it (the ./configure script for spqr checks this). Note that
 # spqr links to metis directly, too.
-DEPEND="virtual/lapack
+DEPEND="
+	virtual/lapack
 	>=sci-libs/cholmod-2[lapack,partition?]
 	partition? ( >=sci-libs/metis-5.1.0 )
 	tbb? ( dev-cpp/tbb )"
@@ -26,8 +27,15 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_with doc) \
-		$(use_enable static-libs static) \
 		$(use_with partition) \
 		$(use_with tbb)
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index e5c0636f67d9..a59e61cce6e7 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,2 @@
-EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
-EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 776 BLAKE2B 99f423fec8a78e6b7e594c39ccc559b43a7765f1889d4831a7850d3b52d44c3afe0d757d269ad90f5b4dc230dc142d722b59351c26ea5b64b08731a6561515d8 SHA512 876eda545bc973008eca4ef1ff322fcfe9dd901a7f35bcc1a8c62c3ef2aeac5bbda5277f5db92133b70a22bac41e0fa3af04dc82f4eaf7fdc686a6a062317281
-MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
+EBUILD suitesparse-5.4.0.ebuild 775 BLAKE2B c62ad76b7b483d24097013e9d753b2ebca7e7837fe0f4b977afa988682857ba9970984f89bd20dbb9ad18b7803fe37bc28ec9ad2aa8555b0b236467c8bdd2365 SHA512 737efaa2d4ada9a3c0771306db06c82c6b93148f7ff7ee82f8e37ba50e4a96ddbff2cae4372487e29d63fd11eaed8c8fdea9c15a437f6c6ec50609db1be12a87
+MISC metadata.xml 1888 BLAKE2B a62df893d5cf6ca03c42eab18220fde29cf92ecc53222be7488c9e2bf4cdc259890fbe7734126f76cdf256e4c9a00570ee85ab1c4f4941448f13f071e4974ca3 SHA512 c892aa1b84b7dc94157ae9e2008913d385978a59db9d35b76aced538f15343222449412d0d2fe117757390d0be698f90f4519eaa45aca366052459c631b3cb96
diff --git a/sci-libs/suitesparse/metadata.xml b/sci-libs/suitesparse/metadata.xml
index d8c0d9a2971e..191d8a97ea10 100644
--- a/sci-libs/suitesparse/metadata.xml
+++ b/sci-libs/suitesparse/metadata.xml
@@ -32,9 +32,6 @@
   <flag name="cuda">
     Enable nvidia cuda toolkit for speeding up computations
   </flag>
-  <flag name="metis">
-    Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg>
-  </flag>
   <flag name="partition">
     Enable graph partitioning and graph-partition-based orderings
     through <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg>
diff --git a/sci-libs/suitesparse/suitesparse-4.0.2.ebuild b/sci-libs/suitesparse/suitesparse-4.0.2.ebuild
deleted file mode 100644
index 6f7a3d86447f..000000000000
--- a/sci-libs/suitesparse/suitesparse-4.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta package for a suite of sparse matrix tools"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc metis tbb lapack"
-DEPEND=""
-RDEPEND="
-	>=sci-libs/suitesparseconfig-${PV}
-	>=sci-libs/amd-2.3.1[doc?]
-	>=sci-libs/btf-1.2.0
-	>=sci-libs/camd-2.3.1[doc?]
-	>=sci-libs/ccolamd-2.8.0
-	>=sci-libs/cholmod-2.0.1[cuda?,doc?,metis?,lapack?]
-	>=sci-libs/colamd-2.3.1
-	>=sci-libs/cxsparse-3.1.1
-	>=sci-libs/klu-1.2.0[doc?]
-	>=sci-libs/ldl-2.0.4[doc?]
-	>=sci-libs/spqr-1.3.1[doc?,metis?,tbb?]
-	>=sci-libs/umfpack-5.6.1[doc?,cholmod]"
diff --git a/sci-libs/suitesparse/suitesparse-4.2.1.ebuild b/sci-libs/suitesparse/suitesparse-4.2.1.ebuild
deleted file mode 100644
index 844fddcc7de5..000000000000
--- a/sci-libs/suitesparse/suitesparse-4.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta package for a suite of sparse matrix tools"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc metis tbb lapack"
-DEPEND=""
-RDEPEND="
-	>=sci-libs/suitesparseconfig-${PV}
-	>=sci-libs/amd-2.3.1[doc?]
-	>=sci-libs/btf-1.2.0
-	>=sci-libs/camd-2.3.1[doc?]
-	>=sci-libs/ccolamd-2.8.0
-	>=sci-libs/cholmod-2.1.2[cuda?,doc?,metis?,lapack?]
-	>=sci-libs/colamd-2.3.1
-	>=sci-libs/cxsparse-3.1.2
-	>=sci-libs/klu-1.2.0[doc?]
-	>=sci-libs/ldl-2.0.4[doc?]
-	>=sci-libs/spqr-1.3.1[doc?,metis?,tbb?]
-	>=sci-libs/umfpack-5.6.2[doc?,cholmod]"
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 83d8940a3b86..17adeab9975c 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 0e126dac7318..a63ed7f91c4e 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,5 +1,3 @@
-DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
-EBUILD suitesparseconfig-4.2.1-r1.ebuild 703 BLAKE2B c24f133a3a9b6b89521f8874c7259f54b3ce69f49e003fbd607d8340f9eb0f0b01b0b39fa0b1ae611f4ea22a75bf3762798ea19e743f399ed00a0a5fb398beb6 SHA512 36174e7f3e8024980d71e971c6b329f9cfe9d67f8b88f720a323d04f36d57e303510a4646d5e696122c6b31ac9c56d393209b143d4ffa6ad3949f9e702bd2118
-EBUILD suitesparseconfig-5.4.0.ebuild 791 BLAKE2B ea9f2b184821029385104d95f6d7a389072a98f0b588d9b9a2ed858f317dfa5429667cac20767b9f3eb2a051f9777b9ac4b7ff0de9940ec7ae95e7b24e75ddcb SHA512 6040bd537cc5afb7bf88e5c86cdb5c9bcbcbdf336de7ddf41e9a60b1b52f316ff99e9710cdf99b299ed3560994fccbe06a4c0e1863c5ddda99f975007f729e16
+EBUILD suitesparseconfig-5.4.0.ebuild 789 BLAKE2B 182d30c28c5f0f29e4e94ce1f99573edc6d577884161934869f8f9d5f6f5b5fe3c5aca84680bb887e629be9966c00311afbe07a34ecd01be5e6e2ef95b859ba9 SHA512 b9755384398eba837809d2b99976d035b90d1396930627dbba31154756a2043841daf4ae1baba651af0c8b1272c6db30754acdd71d962077d1b2dd546c57a456
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
deleted file mode 100644
index 4c9ba78b501a..000000000000
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Common configurations for all packages in suitesparse"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse_config"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-		econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 69191629f724..ca2f33e39997 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 93b17f5411eb..269e4f6dc814 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,5 +1,3 @@
-DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
-EBUILD umfpack-5.6.2.ebuild 869 BLAKE2B d838942a6fd5ff1af5d10bd2015b3931f8f2e56009e4f5cd7d89ee38dd4fbb5fa5806c01ce597882310f7d5315d3c5386970661939bd31bbb9b4437ee833cf6f SHA512 4d94dbe622115b30d2bc3d9bf5ed7fbd65cae24361311b7fb52814c357dea1d6e7f3d66ae776ed937eed6cf4a813333bde0a6edc1acaa6603bde2c1331e96ca3
-EBUILD umfpack-5.7.9.ebuild 903 BLAKE2B c2b69a5cfbe9f480d215ba3679bf4cd59f271ec1a6e941ef3aca585fd2a7fac89c49d1294badfd7b76cd9edf27a529ec3fc2d6573161ca4544c872837e54e7d3 SHA512 4d6cc5ae0fe76d53a6bc2990aa1a4f045e3d563ac6c1234a23a8ad4e51eee07749456d23a2ddac8d46165e3a287e8379893d2d3e06861fbc969664305a4c5057
+EBUILD umfpack-5.7.9.ebuild 967 BLAKE2B b781679848dd4c9921b43c28342c0a75d9672ce0214e663a3457b8388da6f86639328397e65c0f278794bbcb0ae9ffd91a383c1b9a92eec722d8aeb8ccc443d2 SHA512 3df2a8d58dabdcc55c502006b0a1eb897ceaab747dcf74a6b96876697a267adff1595f06d22dde4c092f494d217dd7d4a06533bb6610617ea1d628d7b5683a20
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.6.2.ebuild b/sci-libs/umfpack/umfpack-5.6.2.ebuild
deleted file mode 100644
index c9b20c73412f..000000000000
--- a/sci-libs/umfpack/umfpack-5.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/umfpack"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc +cholmod static-libs"
-
-RDEPEND="
-	>=sci-libs/amd-1.3
-	sci-libs/suitesparseconfig
-	virtual/blas
-	cholmod? ( >=sci-libs/cholmod-2[-minimal] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs=(
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		$(use_with doc)
-		$(use_with cholmod)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index f173d42739a6..aab341988959 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,12 +11,13 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc +cholmod static-libs"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
-DEPEND="sci-libs/amd
+DEPEND="
+	sci-libs/amd
 	>=sci-libs/suitesparseconfig-5.4.0
 	virtual/blas
 	cholmod? ( sci-libs/cholmod )"
@@ -24,9 +25,9 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		$(use_with doc) \
-		$(use_enable static-libs static) \
 		$(use_with cholmod)
 }
 
@@ -34,3 +35,10 @@ src_compile() {
 	use doc && export VARTEXFONTS="${T}/fonts"
 	default
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index aa27518e35c0..a9716f49ad3c 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,3 @@
 DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
-EBUILD volk-2.3.0-r1.ebuild 931 BLAKE2B 669d58f3e8f8bdba23bab9b92d52a5a0694fcac5b4d88edeefe74082352e481649ab27979294bfca79f7cfbad78c098de267277c0ef95f8265242e2d48d3c671 SHA512 ba79c624b9f7faf67feb2b2d0fbbe9d856b36fbc2f319f2a3340a1d61ecf145e29712e8ce8b7e1ac3d8ce85d689f6a30926a4e797e7c9519f43ea7147109321a
+EBUILD volk-2.3.0-r2.ebuild 985 BLAKE2B a330acb57bd0b0f5bda21a0542cce07f085f81138e04efa3fec7402650dd4d3c6610c28b2d3ba613f411a7735e27e21af80bc5ad6cb3aca9ce8937ec5e3ac03d SHA512 3f9aef0f1993d56a89182cc9b048023376765be01d8e63b54373f448ee6473d9ed9ae91c2a9efc5a8e7537fbcbd66bc6c1980f2259b1b60de17e59da0474b01c
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.3.0-r1.ebuild b/sci-libs/volk/volk-2.3.0-r2.ebuild
index e8f45f0f6f9c..c9841926b90f 100644
--- a/sci-libs/volk/volk-2.3.0-r1.ebuild
+++ b/sci-libs/volk/volk-2.3.0-r2.ebuild
@@ -18,7 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="orc test"
 
-RDEPEND="!<net-wireless/gnuradio-3.8
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}
+	!<net-wireless/gnuradio-3.8
 	dev-libs/boost:=
 	orc? ( dev-lang/orc )"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index ec62e33fb1b6..85b627164aab 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -4,6 +4,7 @@ DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda9
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
 DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
+DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
@@ -11,7 +12,8 @@ EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
 EBUILD votca-tools-1.6.1.ebuild 828 BLAKE2B c81919d0f05f61e825af2cebe22e19da437e7e7ccd99f2a935e8425ca5dd71d8f7dd5571720621b86db8a6e0a9ec966c048d1e68b2d672bbb4f57a2415ce03c7 SHA512 2fa333854dfdc8af689080233ebb185b0fa1fe4ff6ba2d3e49d5b5f484ccb0e2041bbe58e3fe06e1e2bdf618c81dd1265495945fc15ddc059ce9687fc5f5201b
+EBUILD votca-tools-1.6.2.ebuild 805 BLAKE2B f487636aae7ff3cc5cec8088a898608217fbe74efe80a527d42bc9700601406b2785fa5ace686f7e1655f17fbd72f3b9b0ef13df85767ecbb0a1fe0ac8afca62 SHA512 349c6c7d07592b9d7fcabe871b353b28ad5e62f76fd7812bee5267afb88dad87af3fa3321af533d097d7b3f063b157c2f7e39d269f76d9b9bf282d8506ca2e5f
 EBUILD votca-tools-1.6.ebuild 824 BLAKE2B 12abb2c899f4f473ddc42d30f1f43618f759373a5530228c7b08deb512b3bd273ba9d0d5611c0de34de9ddcd96784b8339b1c46dc7ad00179e6983fb3bd11e2e SHA512 c463a1b68e8e5a44f1d3688059a4291cdedc54de7883233ff828ac61b177fad92ebafc21c2d4d022488174a2512b41465cc1e2f4369df2297bc20d47aca381dc
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
-EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
+EBUILD votca-tools-9999.ebuild 805 BLAKE2B f487636aae7ff3cc5cec8088a898608217fbe74efe80a527d42bc9700601406b2785fa5ace686f7e1655f17fbd72f3b9b0ef13df85767ecbb0a1fe0ac8afca62 SHA512 349c6c7d07592b9d7fcabe871b353b28ad5e62f76fd7812bee5267afb88dad87af3fa3321af533d097d7b3f063b157c2f7e39d269f76d9b9bf282d8506ca2e5f
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
new file mode 100644
index 000000000000..4c25081de7a1
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_RC_FILES=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 6088d1e095d9..4c25081de7a1 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit cmake-utils eutils multilib
+inherit cmake eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -40,5 +40,5 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_RC_FILES=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 2d3e28d3f680..32f1846346ad 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -7,5 +7,5 @@ DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.2.0.ebuild 9331 BLAKE2B 05cbcf1bf05e64e529efcabd092d9a4ef8e9b50e1b734eda3b03eff3f63973a51ecafb2d500271dba7b96669782f255b73d4f2ff2f20db5a584ba9b37391a102 SHA512 aa613e41002ec63bb311cbdf1be2313f78ff748599035802862fdec5960211e406ae3b4dac6dbc6eff3eeaefa563965f09cb87b1cc192d815fe713b40f6e6a0e
+EBUILD vtk-8.2.0.ebuild 9336 BLAKE2B 3ab298e9f884d3d816f7fd2af7606242f73b775f118b7f73abf730a955e46efde711d6b326f007dcf79e45395307b6310faf1531680d11a1b4cce719d17fcced SHA512 6ebb43154c78e61b32b8570a70b3aadece5cf87bec1acd7628a36d370182a06bf99c44185f258060a30ffbf947d940f93971b98648f417b58de7a8e91657797e
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index ea05c1e55496..b0aa1a26e408 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
 	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
 	video_cards_nvidia views web +X xdmf2"
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 99e68f6c0eb4..1dc1a7205d22 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -2,5 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987
 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r4.ebuild 1152 BLAKE2B 7243e0c54008dfe0a141a4f97fe9d2ef0975e81696176220a4cbfed9783f021dd15a7d4f7f442f253ad361b38dfd7b1e4ba92c6abe07e09afd800f3bed1433f0 SHA512 28f7106ede60193dc0d8d9272e37b1ec13e7682f874521cbc69cfec66a92ce3fcfaa615db414419a4d91ee727e4dc31d7b4e276dc181d05323280620503b71e2
+EBUILD xdmf2-1.0_p141226-r4.ebuild 1157 BLAKE2B 885458fae20420a493700308c7202d322bf0386f122a883bb819cfbf354572a79000debdaa3f54b2d9c7456bc89dca363766c3f0396ebf4ee0fcce0abe09f6f4 SHA512 a8dfc99e35d20c39412c6a6770b0bea351baa86e69405217251254f56b68518b3bb3f7eda099870a182651c4a67292d55e7d39048a2dc3bf6e3f9cc06ae8e682
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
index e196d6f8dd2b..36177a862d6a 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="VTK"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/xkaapi/Manifest b/sci-libs/xkaapi/Manifest
index 3af0cca23a8e..69fb6f39a894 100644
--- a/sci-libs/xkaapi/Manifest
+++ b/sci-libs/xkaapi/Manifest
@@ -4,7 +4,7 @@ AUX xkaapi-3.0.3-flags.patch 1141 BLAKE2B 89ab53d83fb5b3feba3b49e47093fdd037a3c4
 DIST xkaapi-2.1.tar.gz 2916405 BLAKE2B a3bbba6ed5575ed617b2fdbfec435c72ac12e8f464e5a25263fac38f049bd1b89bb5df6e526c2fa537e16fd5bd04fa3cd1ad39f56cf1a58da0f3ba75fd55c580 SHA512 5d4db7576d449b086677bcc686595da773da2c0db155aa0d0039f57fb379bfc166a35b139992416a3f44bdbccbf9f48688b3d3050eea77a258f2a395d7867b26
 DIST xkaapi-2.2.tar.gz 2858464 BLAKE2B 909ea71e3fe86ee6614724793a5a41edd03151025b50e1e99dcf262be9022dfdc8cfef636de4814db1fec99e97015b73f4e5ed8f45ad377e4a3a4ab46b54ee93 SHA512 1be98c4e3c50cf198ec3522c7ccbe7757464889b32fb39e53447548fc2975e727fb2b68b25ae99c367b155588b1ab2181e3280d099ceb991929aa2f0e9c83f0c
 DIST xkaapi-3.0.3.tar.gz 1535482 BLAKE2B 6f10395b66d334e235df8dec7cfa4fa128aceeac10846e78c02cc96867fb2c649a0dc88f6a64d9c5afbfb97a02221f4e6971f313bb6ca52d217aae39caa26327 SHA512 28fb02a73269e55eec90b5c2c82e4ade3bfb24d55a1f61ac6bf47da4c7e2d864cfa1389772baca9ebef4f24b3373fb6971f3fe98a4d232187e9d29a88110eda1
-EBUILD xkaapi-2.1.ebuild 1220 BLAKE2B ac1ed87127faa96930923bb7576507a7f365354e61a125f8c788d2f1442cde28287c1e6eb7e1caeb20edcd123394bb48f9933aa6b9462579bbe18fbd6d95e35b SHA512 7908a3968fa205434e2b3d504324c19800a39ce9e7294ae50d0e7a9f94a35bf678fa3111b451429bb2641f9444ffbe13f91700f139cd11e4bfe91fc4e1e358df
-EBUILD xkaapi-2.2.ebuild 1228 BLAKE2B cf5319afd7a8c45ef7bcfbb72814400115138683e67a9af219bdec9b90d4e8576b72f8302c1de967dea11d35a118cd0c1b7944369d109d42651f01c10cd1d53d SHA512 b2889520f2f91275c58708c74bf5b668789e93367a377b058b5ac15c061a1073c03a44243b1b36a5d4ab3898316d6f2a767b952c9b678b6a624e4980f2383e04
-EBUILD xkaapi-3.0.3.ebuild 1046 BLAKE2B 39435ecd647a84c4b021db301dab731d4eddf4360c5a9fabeb8e5c3f07e37440b2ec0c1215ce007796623f417bd4a4e7e9d35f42af78c44502ce0367648e7b69 SHA512 934874ca878fb774e417a212a044c6d6e08937925c6c357639fed361135902eb4cdff161f0f08c40dbb7625c625e04c32b1238871b61120f13556931e4fb17ae
+EBUILD xkaapi-2.1.ebuild 1218 BLAKE2B 23a96ebe2ab314cf26cc460f2f0dd660faf8a7180c5ba44d409855bc5dbe91862518be7f51b56643f6231e675e38897f02102e7f34839cad15fb79bd56b64d8e SHA512 156beda3bb355b4d2172aa631b201d055b558707a056090917b34211fb0b1d30ae9c72adc9fb8d35830d6f0f4889a6af0cf0d75aa8e73199d278b5a26b323a4f
+EBUILD xkaapi-2.2.ebuild 1226 BLAKE2B 8da6ea7a4d8b57c1d04c2aa95327549ccfa4771330b07cbe9b28f2e02ef6ec5c83bd4ac22b1c0d77ddcc24a67e308688f2c9394c8155cf440f90eefacc6c2463 SHA512 6a172bd57cd1d0dcb8925ef9fa021c1962dfc0d3d30ea435dc42483e5b0be479574c71b1476741a700f78b7d3a7f800bf1e15ff3319faabdd64e8ff352dd69e6
+EBUILD xkaapi-3.0.3.ebuild 1044 BLAKE2B 37e637d56e7e117b25f3e9850aeaaef708d4fd244801618fc5115dfac494b54a8e0cfb490f47b5b2496bfb1b344c872aa257f14d36dd082fbb29b2a99a4b2f5d SHA512 92ca7883d124e5f9a9529b1e8bded15a9f22bb659af3ee5f6e46578f0be774285e5c1c7ae90d82fb36d1f3bd5918cf4a20cd5cf07ffcc9d6edca10402ded1368
 MISC metadata.xml 393 BLAKE2B 0b20ade325e20eee3e300047296b3aedfe9fca66f78f6514da288d4561c6282d57ecda4f9e912dbc4ebb34a5023b545ace898fc12cca92bc57d108979e31cc70 SHA512 a0fd2c3db31172b8cf83e02118bff28776e8c33dff45a46db79499f9dd57162d37e75982022618b1f505d260276ad5b3f74dbc8ed8db0be330a321ba8fe25e87
diff --git a/sci-libs/xkaapi/xkaapi-2.1.ebuild b/sci-libs/xkaapi/xkaapi-2.1.ebuild
index 8fda1c5d4b41..02fd2e035000 100644
--- a/sci-libs/xkaapi/xkaapi-2.1.ebuild
+++ b/sci-libs/xkaapi/xkaapi-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ IUSE="blas cxx fortran gpu openmp static-libs"
 
 RDEPEND="
 	sys-apps/hwloc
-	virtual/libffi
+	dev-libs/libffi
 "
 DEPEND="${RDEPEND}
 "
diff --git a/sci-libs/xkaapi/xkaapi-2.2.ebuild b/sci-libs/xkaapi/xkaapi-2.2.ebuild
index 2481baec666d..951d383e8c02 100644
--- a/sci-libs/xkaapi/xkaapi-2.2.ebuild
+++ b/sci-libs/xkaapi/xkaapi-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ IUSE="blas cxx fortran gpu openmp static-libs"
 
 RDEPEND="
 	sys-apps/hwloc
-	virtual/libffi
+	dev-libs/libffi
 "
 DEPEND="${RDEPEND}
 "
diff --git a/sci-libs/xkaapi/xkaapi-3.0.3.ebuild b/sci-libs/xkaapi/xkaapi-3.0.3.ebuild
index 738863617afd..a7c8c25b27ac 100644
--- a/sci-libs/xkaapi/xkaapi-3.0.3.ebuild
+++ b/sci-libs/xkaapi/xkaapi-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ IUSE="cxx fortran openmp static-libs"
 
 RDEPEND="
 	sys-apps/hwloc
-	virtual/libffi
+	dev-libs/libffi
 "
 DEPEND="${RDEPEND}
 "
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sci-libs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)