gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /sci-libs
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
126 files changed, 491 insertions, 540 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3f6db8231fb7..c4092bea9936 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 32b4be8a8aaa..0d258d6db8d7 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,3 @@
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6.ebuild 781 BLAKE2B b07e0751789864426dc9de9fe7ea21f65f0227e9278ddde3a15755765fbd2b51fcddb3c885490999187529a567e4d8759685e7b46c94cc933ec67ddd1c7bdac5 SHA512 ae9059477e218c250782fe61a3347deac00c2757d31cca26d39560f8d336d3cf1df9a2607f7ebdda373b785bc686710b586fa657eaf255279c357acdc446adf0
+EBUILD amd-2.4.6.ebuild 770 BLAKE2B b4cd6552357a25f2bb55316203cd34af09909621a7336d3f6eb03af974d2fe00193b0459536af8d4d961c41f769ae77131395a568b75823ec05c40efbc7d61bb SHA512 1608629f558dc14a4cf4a99beeb9973b9475332902311e16cdc0fff2a51f0b950ff5e6f64f602190cb4c76481eac0425f2c665171ec68531c445c984989641ed
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 97354db25ab8..4bdd81880c37 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 393861ca0c0f..695feba7df30 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,8 +1,6 @@
-DIST arpack-3.7.0.tar.gz 989570 BLAKE2B bdab72f080d223ebbe5a279102d54fc196aac3ad1b8360be0e3814cb5e14e8f26a1f37b4b27b66db4b88b0c651c039666aa94a98fcdb34977feea7fc7d10808c SHA512 cc07cdd1fba4881907b507ff6b6c9bce9e3dadd8ef744194f08ee718a6210c039ac0c51c12edd720503f8e59bcd11c178fc323e1a59696be8c3b8262cf47a452
 DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B 6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd SHA512 8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
-EBUILD arpack-3.7.0.ebuild 1498 BLAKE2B d949ed75d793e6158ef2c75169a160c1cc6cf028c1b958341063453ef558d365c153f882ccec5275162403079592480052a3f7e3035573b54017a3a842b6c23e SHA512 345b83614edbaa0f8303da238faf05777c11c44829ff04bf501a8060e85e7dcd4a8f40f44f06bdc13ba414058cac448eb35afdc2cc38ec89649ac923176e6a62
-EBUILD arpack-3.8.0.ebuild 1377 BLAKE2B d3f2280ab61c6dca7379f8ce8867a81fe6060c0a82a837e46dd901cf6a502faf32328910e7751debb56d8d377cbe084438a21af393bcf82a9809edc74087dbe9 SHA512 2e0c8225e44af23003f0a0d8e5fb5c70fbc74be864b2bbc062605d0f9f12a21e212d468e244fa8820cc0d1047bd3d354aa67a2e6ae2ff12c4e49e82f334a9226
+EBUILD arpack-3.8.0.ebuild 1371 BLAKE2B 1f08fa2ecd79c6cd3ab90d89a99e7fffcefef0f9e936e216fafc94329efa7731858bf85d2f81869f7a26581bb6d3573f34835fb94a4a078a690b61e8ae4b61d2 SHA512 cd5f4eceb41a956bef0339def569bf103a1cae9b7d5379e4e4996ab3e08219d197b7495f8d7639b91762128e2a62f1152463c4677c71c7ea8841b7cb41982fe9
 EBUILD arpack-9999.ebuild 1312 BLAKE2B a0d2b9895489d5072ff6127d4df0cefb9ea9ede42d826edda67c1bf46aafc443fa5fb640dafb213e10eab3acde4d13e5d1ba6f86434df2541263fdbf3303fc32 SHA512 3ea7dc8d88cd389fdea1096fbd34a4961f29460b7d5ab6a5b11bde3653652e3296af5ee6b0f4dabba9c21b80c9bccefd98c1fa3b37ca9a17154f95b63fbdc890
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.7.0.ebuild b/sci-libs/arpack/arpack-3.7.0.ebuild
deleted file mode 100644
index 20a36754ea12..000000000000
--- a/sci-libs/arpack/arpack-3.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
-SRC_URI="
-	https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz
-	doc? (
-		http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
-		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[fortran] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Fix should land in 3.8.0
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-
-	econf \
-		--disable-static \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		$(use_enable mpi)
-}
-
-src_install() {
-	default
-
-	dodoc DOCUMENTS/*.doc
-	newdoc DOCUMENTS/README README.doc
-	use doc && dodoc "${WORKDIR}"/*.ps
-	if use examples; then
-		dodoc -r EXAMPLES
-		if use mpi; then
-			docinto EXAMPLES/PARPACK
-			dodoc -r PARPACK/EXAMPLES/MPI
-		fi
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/arpack/arpack-3.8.0.ebuild b/sci-libs/arpack/arpack-3.8.0.ebuild
index e5986de25b70..44b5bce59959 100644
--- a/sci-libs/arpack/arpack-3.8.0.ebuild
+++ b/sci-libs/arpack/arpack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi"
 
 RDEPEND="
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 3ae2506db329..a440211f61ec 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,5 +1,5 @@
 DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
 DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
-EBUILD brial-1.2.10.ebuild 983 BLAKE2B 64e08bbdb530f70243a503e5e243e859c74d6c53961a964a9af3089c2922110653db946a2e512ac37fd5dbfec5107e753c52568d8f70fb98ae1ee6d5168462c6 SHA512 953d52de88b03cacd45dcfe7a77b2a94bc8fdc80f5c81bc212f03b9270f6b006daf63ecc1fffcb0cdd8aeee5f7f4f424d6c27ca30b89eaa57a5dc5f2a777a337
-EBUILD brial-1.2.8.ebuild 979 BLAKE2B 1c72e16b99e8f3512b3b16bb4c30525c09772e7702029f43a3b1ad10b7e1d218cf72af004003b867eb486b0731d924ddd1de5edc66eb5f1b28e3f1da924ea596 SHA512 65aa634cb876a4ac84fc04ac33c66157d8c8dd727b88a2018c935be54adebfa4fa9d77ff352933e6731e30c1352b62ff1b68d5b436a823fe9d2e8b0c58983c40
+EBUILD brial-1.2.10.ebuild 972 BLAKE2B 4130821312dfdb49170b21b18d7a4d3d3106618519f4e67d8c0d1a6dcf444ad4a1b1db04323ecb84190648079dd872a16e494c9c90e4e138ba635ec71dd41f54 SHA512 f5fafa09f47ecc7e00b691ba62f01c3a3ac12e9ce17b2daa6aa67e46c2f33d0ddbfe78732c1fa7b2a181128412f247750d66293312cefd40fdf3c1f7b071ed50
+EBUILD brial-1.2.8.ebuild 968 BLAKE2B d012afb4bdba5a8c49167340b1f40c21e6f7dfc74422373e418ca33506b1d439f8c9b7fe6aaa67e0b37a56d4741565521a317ed338a2e48a7683a7b43301f985 SHA512 8b180e2256f46ca9e4919aaab683f72880d9d61d7a7d686e3a5ddd973b7c5707f8be426f08149809d16ecaf5865bd1f39b4b264efefa4cfa31265927d7dbe27a
 MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.10.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
index e1831c017fc6..8abd8547852e 100644
--- a/sci-libs/brial/brial-1.2.10.ebuild
+++ b/sci-libs/brial/brial-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/brial/brial-1.2.8.ebuild b/sci-libs/brial/brial-1.2.8.ebuild
index 69b0340dc6fe..26e826d9b26f 100644
--- a/sci-libs/brial/brial-1.2.8.ebuild
+++ b/sci-libs/brial/brial-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index a39da8ff75c1..cb3d14b61ea2 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.6.ebuild 583 BLAKE2B 5593f2c41578da661ebd78924904134f9e193834520c53fb15eeedc15699334a3d42b5aad569dd25de48329e9049b7f01fb53649b884bf5a4d9e32baa2e08f9d SHA512 04596259fc612a2e1d53d34610cd56846c2a51e21ab88fd5fd295a32d35a197295578f3c9c6da5476397259417f3ecacfa7cb039bdc993b4452e18aa784aa526
+EBUILD btf-1.2.6.ebuild 572 BLAKE2B c39f39496d63f558ccd49a8100f0f0cb7406419cb98e1c28c372902c7826ab7770cc69e0ebf8e7cb1cf57e301c9099556deb80bbdb750e5b3d180eb81a7160e7 SHA512 a44ae3362c0ebb724415cab85bd438558ff84cf4cd9d51e801912c60fa594145915fc0f9d4748b20461aeadba7c5a5fb5f4c7baf9b779f8849601bfacfbb3889
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 2ba8aa986ce9..66bd6a7db7b8 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,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"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 2242bd9e8f1e..c1a8e0651cb7 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,3 +1,3 @@
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6.ebuild 728 BLAKE2B 1df7960dd020411c35ab57e1ce0500cd3ef887891ae7774e5a544e5af9bdfc46b02252b06cbc5ad8c6a4e943cbb3c9b9477630b52224e3d31d94a738198c22c1 SHA512 8b9cb89601700474ad4f8eb22ced91a270f62a7cb406430a38d115bb4b5fc160f4cd6f9ef7e6a2c65c86e5cee1922e325013b34acf90e70618a96e3b78231aa8
+EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index b2702e44ebc6..78e606743466 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 4c6c329064a9..aec3283fc94b 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 657 BLAKE2B 30b23d3d98ce5908705e29aca518dde2a2ba0716362718412858b87e7be306104f44a0fb5a9eed006aac712be57c402533a73ec88cbc47416b6c7db92c2f7dd4 SHA512 7b2e76c60b8969e8421953d137b129fb90576226afbc0b858b3793412b7212f6523edeb95f069141d009c4e18ec412efd4621a2c8f2f2a94ce28a44cec07ac53
+EBUILD ccolamd-2.9.6.ebuild 646 BLAKE2B 8efdebb1b2b8625c5cf7a7ddb7269ea1578da6783b3d867654735373caeafc9206f29329e29bfd2f2eed18996b36f3b9a97ec17da579d4ca726f184d7d0c443c SHA512 3e24429b62dc4450369da335b7b3cf1c2135f5d7805b8d8fb7a795c17c5451d464f5d4e3ba643da1d09100b22150c6c8ba12137cf1b717bf1f4ef4ec4fcd4b68
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 34fa1fbb8b4f..dc269a9c4432 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 044f58bc95c2..149ffa3a2792 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,5 +1,10 @@
+AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2
+AUX cfitsio-3.490-pkgconfig.patch 613 BLAKE2B acdaedb24b8a06019346b44eade4cf9f8cdce93578a08354dab61bfa5e7979fd22ab5214676d0f08a8dde5bb70b10c0ec54527d25b73892aa6bbbe935614ee92 SHA512 46c2f7ae36529c4d3afc17afe2f22b2f21b1d5ecfa1d460fca8a95335bf94017c322412da67b57cd052ab98701e5f7776845fe30171cb400f97e2b4411497387
+AUX cfitsio-3.490-system-zlib.patch 2816 BLAKE2B eb16c43cc5be95877424469eeebc085a46fb37e78d0b2fb48db72d71c2bb05d5b85eaf6d7341ed07da25858765cb9902e1dcf8ef33f3ab42b191d2b7689976ed SHA512 4f05a0a35d6bcdc03676d9142d2cc46dd4df69aff4759464c2dc441753e7e3085c756059d2218e9deef9da91c27e760c0f73562bbc02b5a73e0044f47560ded8
 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
-EBUILD cfitsio-3.360.ebuild 1464 BLAKE2B 124a1331c7a494995e8cc91f6f5a0c2a6b9c6e71a40556b00162c40330bdb366ce21a70cde10817cecf0a73aa7d139f2e65aae1c40c1fab5ecb9fb9a98d49b11 SHA512 270f4fe29b970cc87a9ba6bda72e00df8667a80efc8b8b87e3827c1e46744738f9e7700c5b2b0f462cf929454a84f8270f56254e728968d2622d68b3c5ff3bcf
-EBUILD cfitsio-3.410.ebuild 1597 BLAKE2B bd5a91bb4b2c02977691b606835c8397d05090147402bb5f2f9abe3cdc1c233e6f961c517c99a689033fdc02cb72a050345ed46e0414ba683f04f3565468fe69 SHA512 6cb2c395fbe830cdf0b1a3f2fc79c0d0e4ae2923de95f7b24fed1cfb1cb23809bd041adca03316659b95e2af7b4604b4bdd39b5b51a930af5719e57796dbf7ff
+DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
+EBUILD cfitsio-3.360.ebuild 1433 BLAKE2B 79dc499048a4c08bec4fe8d11a99ea5bf064716460ae2a80530ca8dd073fc0f00647edacb3f3206cece007e34a3ead466e3d2e1264c6429c9de888a3c3c61a19 SHA512 09c143480ef52b7d979aca2b76b7fa127eba383636e186bcc4d811ec03905a01bba9c018788bdbd2d8864e1746c71f80853de4fcfca45e17f29f73bc819adc9c
+EBUILD cfitsio-3.410.ebuild 1565 BLAKE2B 72d14e52ecd130a4db75b36f673e6b18b471a24ef508e1b91d8cdf624bdb134d874c4514aa47d7eecf280e9d7e2e004e1d7361c0c60e10669ef95081f805e132 SHA512 31777199cabaad85b790099a21b777e2b0edab4dc113617e8e6d7e253f9bc7d904a1acbca022e1c680edc94a244c3a1e8c710d4054953a874be11abc2e399c47
+EBUILD cfitsio-3.490.ebuild 1687 BLAKE2B 21c2aad5ba9e9de0f34a1d7bd7622bcfa2134025e91cc96e32a2cc368d7f1f1a3104c483fe50da4e7ec8427325520ae850174dc0aa692a41ed4544c879a33afa SHA512 be01b1dc328ffbc2489e9901f8a69d56502e21ef37f7952f57f174713b2698e5dedda3bd8c14d2fdfd939383f6c5f79c33471b61c5d3286f4a666362a1d19c43
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index 365477171540..d281612a65bf 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
@@ -48,9 +48,10 @@ src_install() {
 	use fortran && dodoc docs/fitsio.doc
 	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
 	use doc && use fortran && dodoc docs/fitsio.pdf
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
+		docinto examples
+		dodoc cookbook.c testprog.c speed.c smem.c
+		use fortran && dodoc cookbook.f testf77.f
 	fi
 }
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 640d3bb018f4..2ff8d4bbe26e 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 doc examples fortran static-libs +tools threads"
 
 RDEPEND="
@@ -50,9 +50,9 @@ multilib_src_install_all() {
 	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
 	use doc && use fortran && dodoc docs/fitsio.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
+		docinto examples
+		dodoc cookbook.c testprog.c speed.c smem.c
+		use fortran && dodoc cookbook.f testf77.f
 	fi
 	prune_libtool_files --all
 }
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
new file mode 100644
index 000000000000..84e2489d6d5c
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV%0*}"
+inherit fortran-2 multilib-minimal
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0/9"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/cfortran
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-system-zlib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid internal cfortran
+	mv cfortran.h cfortran.h.disabled || die
+	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with bzip2)
+		$(use_enable curl)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README docs/changes.txt
+
+	dodoc docs/{quick,cfitsio,fpackguide}.pdf
+	dodoc docs/fitsio.pdf
+
+	docinto examples
+	dodoc cookbook.c testprog.c speed.c smem.c
+	dodoc cookbook.f testf77.f
+
+	# Remove static libs
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
new file mode 100644
index 000000000000..4b04fb9cc4fe
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
@@ -0,0 +1,14 @@
+diff -Naur a/configure b/configure
+--- a/configure	2018-05-09 21:16:00.000000000 +0200
++++ b/configure	2018-05-23 17:17:18.452431657 +0200
+@@ -4215,8 +4215,8 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-LDFLAGS="$CFLAGS"
+-LDFLAGS_BIN="$LDFLAGS"
++# LDFLAGS="$CFLAGS"
++LDFLAGS_BIN="$CFLAGS"
+ 
+ if test "x$FC" = "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
new file mode 100644
index 000000000000..37b47c7b820f
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
@@ -0,0 +1,20 @@
+diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
+--- a/cfitsio.pc.in	2019-05-08 17:34:49.000000000 +0200
++++ b/cfitsio.pc.in	2019-08-01 15:56:52.064310329 +0200
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/cfitsio
+ 
+ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
+-Libs: -L${libdir} -lcfitsio
+-Libs.private: -lm @LIBS@
+-Cflags: -I${includedir}
++Libs: -L${libdir} -lcfitsio
++Libs.private: -lm -lz @LIBS@
++Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
new file mode 100644
index 000000000000..6ade40ce62f3
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
@@ -0,0 +1,60 @@
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2019-05-08 17:34:50.000000000 +0200
++++ b/Makefile.in	2019-08-01 15:52:57.829760351 +0200
+@@ -68,9 +68,7 @@
+ 		pliocomp.c fits_hcompress.c fits_hdecompress.c \
+ 		simplerng.c @GSIFTP_SRC@
+ 
+-ZLIB_SOURCES =	zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
+-		zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
+-		zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
++ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
+ 
+ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
+ 
+@@ -103,7 +101,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
++		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
+ 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+ 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+ 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+@@ -140,28 +138,28 @@
+ 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
+ 
+ smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
+ 
+ testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ eval:		# Rebuild eval_* files from flex/bison source
+ 		${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index c2153f563fb8..5fe1e6cba48f 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -2,7 +2,7 @@ AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
-EBUILD cholmod-2.1.2.ebuild 1760 BLAKE2B 4843142c993deb0246fe7aa3b333b0ff3f4c8c64f1b3582ba6c7df5fe287514ca124cc0939c60820c52476c6759440a1db812b677dd8cc9f23cfd93e4695099f SHA512 9884339cb38f0095eb9e087659b98cd6cd62425e11621cd40849a8b7e40965169f3b3be4fb2217f50b491327b83f7554ab5c8fbd55427a2ee1a293ad55b5428f
-EBUILD cholmod-3.0.13.ebuild 1671 BLAKE2B ef23737bdc534124377cb44705fc0b5368ab3df316f48f1a76f3db14fd6a66a56536e8a051fb5f35e8caa444ed8277a43f2dac22f7cbd1f200be4af926771407 SHA512 a22969e486cafd4184fb8181132321d120455e62c6351b646d2177261039ac1d4c3520dd3b9353f266b1ec97198039d85b28c87e8915f724ca2cf25651ab6f9b
-EBUILD cholmod-3.0.14.ebuild 1653 BLAKE2B 417721714a260b7265470a26f7231972780e04785f34c7f6c855ee83c26b6c687e04f1b4e474ea4ffc5db47b941448c50c0c0e487d90e4334bd0dda6a4a48c3e SHA512 4f5fee2fe576c5f77dcf30c3512a5439fab0ba96d586a7e7b2dd12388b22be00dbab50127068064a757d02597737846f44e5f6da429489381b0de6083f5fd569
+EBUILD cholmod-2.1.2.ebuild 1749 BLAKE2B ad72937ed0107ff533c0fc9c996c22ce299f989dc040b2162b3c119c851f6b5b23e6de5cef58f4c91ea2cfcfc790ab1c3c3477d0b4854ba40519a69c95cdf4f1 SHA512 eddb839768b745f9deff81454a8f6eade1d25ad2d891f498b8f3c4cca88614e72ac0df6535946929ce96b74f2ff52bca51fdd0b6d90f2e480cdac49d95340f10
+EBUILD cholmod-3.0.13.ebuild 1660 BLAKE2B 6f53739a8ea19773b34526ece750fe0e8c2d3ffa221058b4e201bbe6180c55535c9edf902b4a8c576343e5e22cbd3cbb03dd4594a6455d438cacd81450f1f0c0 SHA512 bbd5b01ef11bddcb0d10bea1917ce1b25c6d64321ecae25c63f5070d392f71c62e687847bbae1cc41fccf36db3295dffdf284f47d17de8979f550830037bebd8
+EBUILD cholmod-3.0.14.ebuild 1642 BLAKE2B 8679543c75703ed955e8e9dfafac50f8254e94781ad6d815a974da3a982d47a601c7e7d90820d0ba372f12b11e0760c95a8da4fda8e02c2fa0d7462678340725 SHA512 e7f6240adccc918e9ef083e6c14ff8e5e2f9763f84785e0f2d8696720b35ff43d30a12832f95aa6c17fef2460b542158d09cb413cc2d3522607d6c09a340e3ca
 MISC metadata.xml 920 BLAKE2B d78c2990bf35b95155adefe8a7b6d3213cd7187d031abbe91f1e12cb2ab438fce1ec34743a21a20b649255c691b87b6033f8bf8eec30b670456c105ad80f2c9a SHA512 64083142e54e0d9df8fb93c8a9ef810c4a6c85546ed8d96413acbadcbe3120d528e15895786e303094874448eeb4b411ce457147f452f781c6184aea985f5e9a
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 1a52bba26f00..4bc6ca5590c7 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-2020 Gentoo Authors
+# Copyright 1999-2021 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"
 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 96d60a60ddcf..a2dc0b63a54f 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index 566f5c250c17..94e8ad014818 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index 656c55ff2bb9..db1326592083 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -6,6 +6,6 @@ AUX cifparse-obj-7.025-strncasecmp-declaration.patch 477 BLAKE2B 51d1da67dfbac2c
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
 DIST cifparse-obj-v7.025-prod-src.tar.gz 928484 BLAKE2B 4f510f4826e235ecd87d81d51ceef84b717bb0c174f4a263cae44765bd0ddb35e2bb6edce1c5cadcf18c5e9892630f43cda2ca004f09d84dc44499d457eef5c1 SHA512 bf5d6b55592aca8678396eb9819f5bd7bff4d912410590dfb750c9ad85bdcdbd251425c45b67e2db027a8ce8d028b77c91edcc5333279ed1190f6049c01f5cc9
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.025-r1.ebuild 1206 BLAKE2B 7f83bdbb3d3b9d2df49e4ad20f877065d438dffb4860e5712326e79997aab32cceae9567be54ed23bdf149e13cbe29fb99e20d125c816267da81f19f625717e3 SHA512 bd4faf64ea58641708ad9d05c9d2cda01ddbf93759ab1579d6afadbbfc52ffab4daab6699ecc7e163b359d848c599f49dacf75de2e1d2cfaa952b4658a5bee18
-EBUILD cifparse-obj-7.105.ebuild 1140 BLAKE2B 59dfaa9f8be03858f402d798c38f39c9c912bc59e14f7b9d401159d30eb3bae7c642f68293bf4d45e99588c93497a519a1b34260c5679428410d6295b13c18fa SHA512 72fc0b191f9603e8cd7e42ca2e475d0bdb0120d1841784f7bad9b6a455da655b04129632dbb174b871d9ac5c31449bcefb9d328d723dea5a28629d6cf798b169
+EBUILD cifparse-obj-7.025-r1.ebuild 1192 BLAKE2B 00bf1757aa801008cd85c3b736417e25dacf7ebdb5432811b74e49b410ed78bd65b5e566bec925dc6b88c28ca4b2c811a8fdd673213704eaedf64292c73e984c SHA512 f2e308f1a1c9c5943a0be7fe1a835e0ade61f236db1a7ddfe6ec50c18faeb417fd81a07e772d18630dead95b214dfd77f5b374c5bee5536bc05afd8b385c6544
+EBUILD cifparse-obj-7.105.ebuild 1126 BLAKE2B e978f7d66b56875b85e22e56ea01141067006f0c91bdbab7416a72daaeedb5e2730827ef53d07a2362d5a16a26c77e7ef0a25ec8701db72403d09dc3e465f659 SHA512 8bb79d8f7232fb56fd6b7bf920c079c0e47f849f1cb2071fb17f23d912850c1543d34430a301041011fa9fe4f37f543a46e7754014269e510b1c90e52c82127e
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
index 647673dcd240..44d186a798cc 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index 622af4794346..45524a9bd5cb 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 087ab7800a2b..d73b4e813310 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.9.6.ebuild 652 BLAKE2B bbd14c7d634d08e55533f830fc456b50c3cc4400f2c551312ff5258e074d244ae558e2b04a2df138e0e68346c65aee55b879c168d3adab2852bd12860c02c505 SHA512 25440b8a12ae5cd6187b2842b753337b11360b119ece67b7e3af7692d32f12be7e5cebc121eefb0474e3989a57ce401a0f56c239289fe606827c9e6d483d2043
+EBUILD colamd-2.9.6.ebuild 641 BLAKE2B bf35053ff07d1e4e7c29237d6407a727a17bfd64203f32447eb4cc43c3de0d6e88388067306f03d59c06b03ee33f90482eefe85525bcb7b9f1cb4a0e23378f9c SHA512 1551cc6febde6498ea7a2796fd90b3f6ea812e776602552b8cb82a1675556302696afa94f8710ebf8f08fcc8dbcd0dacf7b91cf88d9fa073ab0ec88f95527713
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 15cc9b507d95..f68a50a39544 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 1c093b5785d5..a62bf1c4eb57 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 805 BLAKE2B 5652aca447544327aa3735b3ff0a2d0b4b43ac9d82e018b1572564894be753ed8c34b988d99307c549460483108f7bf8ecfc0f4eeff613064c17d8eadc74a51a SHA512 1d2fb294422317d79df278c058cb72875dbf25df80d5eebf8c1f8c0c5bcf9f67a9622b27b94aa18fecfddfe9dfad44d6ac7d0651aa8c320317fb1790d914648e
+EBUILD cxsparse-3.2.0.ebuild 794 BLAKE2B 5be2889e37e2732c3473b4c0efd9eba0b1038c333713f78cee61efbd47a158019e4e87f0c0b4108d893e926cd29eb2cf1ede0b8a6656115c6ea185afb084331c SHA512 ee91ecf4098b989a91572a2f1b585f4a305c34769fce8dddcd4edcf3218b5a3647ac685ee64b192f7708cc2419602fa4b5fda46853234b4ebed178cd25611c5d
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 1b981adafbed..c5df715062a8 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/dsdp/Manifest b/sci-libs/dsdp/Manifest
index 1813ec2bc30d..ddbb8f3ac206 100644
--- a/sci-libs/dsdp/Manifest
+++ b/sci-libs/dsdp/Manifest
@@ -2,5 +2,5 @@ AUX dsdp-5.8-gold.patch 342 BLAKE2B a0cc333fed3f2b1ebdeccc439c0b98f9956bc64ac105
 AUX dsdp-5.8-malloc.patch 212 BLAKE2B d030d01bc49aa275c2f0eed48c1808e17877120587dedcf72fb07f737e44953df8c28d2ba6a5a443b372f56c036f9f44e1841a209b383ddab892ff8ef4e0f01d SHA512 a4c324beadb7298c9c8709115c83975d10b359b792042047439631f478fc99648b9348715645cd34d893fe9b6b49b6ba8e628771cde0e007eb0b1f474dd1fd7f
 AUX dsdp-5.8-readsdpa.patch 495 BLAKE2B 538ca4b9986cb5ed74ecb8510f8de23ecace871111140d394ae982e9932b9a733f2355199deb28cdf88addd0e18939b6a4e22b737a65438dc12e0a36e93d885c SHA512 43b329526f3b7d4761f7dfa44d62f94a843491bf9998f2f839edc880cdd8d04d1c8c7187213eda887025a9f3cdbff19afba6720cd2d70580b0e2dcb9512f8f90
 DIST DSDP5.8.tar.gz 2608518 BLAKE2B d464db2956080a33c300520ed291e1b45aeedd28378d5aab753977688bfe74d953f1d40a7aa10c2af8b70808d97dc5ece0c98d2795f707a9a3d2128302658286 SHA512 0a32a34e33dcac151e95ed0f8cee62603bbe2b4ba1e448bba35324fe576376cb33c15908cde61ae5a7c0dcdea945f1ec544f19b3dd36524158573260182e080e
-EBUILD dsdp-5.8-r3.ebuild 2389 BLAKE2B 01cd898dd1ccf5f29736b93eba538ae18d68cf26277ec311a4258e1fe8bb7d34d3c23d306632b565a8b3987deb25696cbfb12803778ee3f04bea42b0dc296047 SHA512 76da649d8ec42f846a0f06d4733d0f35a101b441b484b9c5fc2eea91a54aaa7248b7d8fa13e00db2fdf731ef401d57ba11dd2dbd3695facf544c3c6474951df7
+EBUILD dsdp-5.8-r3.ebuild 2378 BLAKE2B c2784ecc2ad26007e429f0d56c4970e2d8a193fd6361d1a126d17bf56ea270910eb6fb29763f6ccd4dc3ff8eabb0fd6db07d92ea2e44880a65f218692f1cb26f SHA512 caee48d512e128819b3ab89436817dba8717e56d260d7729f7b9ffd0ceccee351b1fad871a13cec6215a06c1735dd3cf5e278fc7466583db647467c3da1786da
 MISC metadata.xml 1244 BLAKE2B f68fd446ed898a83c171b7f440aa60a1b838e4b12a172f181128baf2babe7f5ed1c0f74d96a4c078ec69b4fe06b981e5b2f4773da79afe05d65244d83de4ae44 SHA512 7dfa5358092109c0441dc9453f9769e6e63ec2525817a7280fa30c68007a3e31f524ec8600f29b21ea28e585c2776d9264918f7e66243d1a8509f42f5339c3da
diff --git a/sci-libs/dsdp/dsdp-5.8-r3.ebuild b/sci-libs/dsdp/dsdp-5.8-r3.ebuild
index aa32624cc96c..6ddc6b9b3640 100644
--- a/sci-libs/dsdp/dsdp-5.8-r3.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://www.mcs.anl.gov/hs/software/DSDP/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index e6d288a073b5..1f5b48927d62 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 1820 BLAKE2B 37b441dab876c538d8adad5a70d3fbb2b6502214d249967f9962487d9b5d0f6f11e3db7a7526c7bae8383857c45e47f4dca48213d53c6c0b2cc4cdb0b40b3109 SHA512 e1560c6a58118c19e60fe61ebd611f64c1b8e8c6250e1dadae539ae21c09e93c5b0a0182a60002fe6b1cb01c6f16bb5f3aab8eba39945f572445dd5b0990822e
+EBUILD fflas-ffpack-2.4.3.ebuild 1809 BLAKE2B 29030bd16efb837635ede425c980af59ce460138b3460d3f6b2d538073dc6f2ddf1bdd820355fc9ea00d51cc2596db534076e11b8013c4b8558a1d10f3692f96 SHA512 b7e345ac11f6d4f5e40adc371972ea3495ce98579ad3a90af6c434a4a9ca041143793157b9013bf945ad9cb56a477ba175d1b922a90658377124dd6b4025ab05
 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 dcbf5194f3b9..93f521fd137d 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6fba8b8da1cb..69e3458e77e7 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -7,8 +7,8 @@ AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
-EBUILD fftw-2.1.5-r9.ebuild 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
-EBUILD fftw-3.3.8-r1.ebuild 4642 BLAKE2B 4f265100799145da3dcee72571a62692e1e6a2502d3a696b729fc7405f27803a92a4d830e60a9acc0a7c6e386be4690992c3eed9bf683eb1c56c82a97ccc94d9 SHA512 1fcd0eb3eda21f150d4931f5077b379d32c7681e44ea212084a33155e82962ad9bf0fd0364824b8de38aa4e72d6ebd06b68447eef6edd1ffaf8a130257c0fa50
-EBUILD fftw-3.3.9.ebuild 4603 BLAKE2B 3033b5e15660913bffdf5642ade8f3dcefb2f4b62d005af23818a365e62cceee5f60c175ce3d151ebbc19928eb287504d831341ff6281ba40ad1e7fbf75bb4e9 SHA512 ebb5bc0e22828dc791d70c27e2a7f64b4db915fe942f96e01b734a11f04e7165842dda12d758c986798d68ece684341c6bab7be6787dfd4d67b82605309f6447
-EBUILD fftw-9999.ebuild 4477 BLAKE2B 0691ee5b800343e0cb2549357e844e1efd373b777e33a57be2712807ef8b7bd7a6a25fa34a2b488366436d58a17e5485856cb01b2d755ddd8cff83f21536724c SHA512 0d35dbe8bebe0affda3040e9ca51793f3f873e30443fa87808329279b536b664953ea5a015fe64d39a822470131a183840fa6a5b882821c1aea5da32e069ef3a
+EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb
+EBUILD fftw-3.3.8-r1.ebuild 4631 BLAKE2B eb2025e5b4a8a8c2d0aa26fbdc2f2475fcf877b2f6d19533016d5bef0108f4afdef8161b296a2b0b25bd4a28a60285e664b614f61bd0278fcdc8831a9df5edcf SHA512 bfaa6b2d5c30153378e13fa1910baa514b4243bdd441a3165e74ead0e5035e928c9952494933c488f25cf6df23fc681f9ca26aa0316b0dedba44741e1aa9564f
+EBUILD fftw-3.3.9.ebuild 4592 BLAKE2B fab7b64d667c07dec3c2204c621f679e1d4038b24b2f5b9322594a92bbf9383100dcc14f1683f7c6e3355a8beba5e8684487dff6754956e8266ab3884dcee9a3 SHA512 c2c391f4573f24c45d4135b906f8cfacba43b36e6c285a72033b67711201408f8097f5ade9874c0f8e2f9828cede3f590c42ef310fce031a320197013cac57d7
+EBUILD fftw-9999.ebuild 4466 BLAKE2B 71d76945629eaf3870146179acfae33728936afd001dbf9321c0ba3952de0bec3c3da4237640aa314d0e3020c863211153530525cc2a7599b829ec1909fad5c4 SHA512 dae624975a94cf5244ddaa294f06af2f673454289ddc1725c14ff58a1474effe5104dc3d13e97833ec5b8cd5b89dd6ed98fb17e64a8a51d53f2f260fbe3a96d3
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index d4bb1d4b0677..0d4eae2fdb7b 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index cebf3cd23603..ae84f01be618 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 3e76f1f265de..3db0c3fc13c1 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 3d5b307ce05a..b0c692bdeac9 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 6bfa7551097f..46bf58aa53a5 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,6 +5,6 @@ AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf95
 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
 DIST gdal-3.2.0.tar.gz 18928960 BLAKE2B b6cd2f2700cc26c8dd585667cd7b2e3bd9b78d294b3fa397edc1f4fa326d29dfc29e9646c6f655bcb88f7fa4c80662008fe78ba8460d9fb974fc6ae5dc310061 SHA512 695f32856effc1811931f8722dc1105d78f305ce582a6ba33bf4e1848657a57ad658f3d904c0af48e2c47e48d5d84afbe2c46a3774df43d58b1827fce9bd368f
-EBUILD gdal-3.0.4-r1.ebuild 7360 BLAKE2B b870ded1680c0f1d9ccf47fce7ca85682d73eed11f007839b8203eea43893f3b08a5356b55cf85c42812a62973551de9b5d83f88044536c0639bc0c9a75f5b18 SHA512 01aac1edcc6d4c83beff43ef4b3ae9bed64331eade66847b7c2bbefa5ec2dcae570a5a513cd5f35a959ab4a745b024636383f65af42dbf68f2201eab9771da02
-EBUILD gdal-3.2.0-r1.ebuild 7213 BLAKE2B 426a83f491da7696ffa2bd30b9b3d73ab089a09c7593660827194491f3cdef89912d8af2af5e6200e04485fb7ff8694e6149320b111bde3d3178f3c8e0190c2c SHA512 1f3e2d32390977e0ac512d69ef44b0ca280bc97db73a6ad770b75ef704e47a4d6ab126e9cd3de22e13397e19aba1c9b86a2a73d816499856e10f11b44b069163
+EBUILD gdal-3.0.4-r1.ebuild 7349 BLAKE2B 967510394a5966dcd5d719780a83d0da190f8b7469bf0d2feacdcdf10eaf9f36afa0aeb9586b752f8a067d8e913320175542da127d76dea317e44ded26ad536c SHA512 81f2d403e0d49bae992f3a339d250f7852603d0783855eff5005b2cc076f93365bc3926bcf6601cda1ee8a2bc0e3a258fcf53c1eb7cd82aff56304e579b002d3
+EBUILD gdal-3.2.0-r1.ebuild 7202 BLAKE2B 72093958ce36f1f01620f6cf2fd755913afa2c6bfb0d115949a845c0037fdbfb9944caf955ea482a3db46646d087738a64424dafcfa4e2578259e43f6fbb42eb SHA512 dd3404075b4313a7ba30982cabbe9cd9befcabb7aaf9c80bdc36f95a62aeafa7e16fa894b3e0edf86231362ab695ac8e30a85c2a20487ffee8b001903a886cec
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index 7a83f0bb9fc5..a5f44449b3b8 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.0"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-3.2.0-r1.ebuild b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
index ae2043bc588d..14cb9657ca27 100644
--- a/sci-libs/gdal/gdal-3.2.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 9236cc8a8959..5b973fb67b8d 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,5 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
-EBUILD geos-3.8.1.ebuild 1113 BLAKE2B 7e7529e6272b6d9eeeec6230c0f945a368b55b3094e304372dceeab5e846c80350331b687300243a24c92e3b265ef5fbf136a972abecf28e940a31e71399dfda SHA512 c95a5d2a6d67b2abb3fb2d227abacf836496404220e67008dda3e28f60fa4aefd5e9fb86a96380445a97442ee16f937cf2c2d368c9581b968af8dfc58ab09619
-EBUILD geos-3.9.0-r2.ebuild 1090 BLAKE2B 8665710cf735ed54471ffc0d70cf1f02d8cd6092cd1bc6e37ff155720975ed230a8f3562d4502f0aacdf6900bc136dc5878de707d32568398180dcf88f5b3858 SHA512 66dd501a604f6864a1ea722fb3b701bcfa2cd0f8d589f9d9c3af0acfb3487e94c0004810da5c8054e38d54fce3a537d8333cd97348a1bad39c1b95939005ffda
+EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
+EBUILD geos-3.9.0-r2.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index baade73842c7..e6f8a36be5da 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc ruby static-libs"
 
 BDEPEND="
diff --git a/sci-libs/geos/geos-3.9.0-r2.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
index d767867da2b1..69116e672afc 100644
--- a/sci-libs/geos/geos-3.9.0-r2.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index bb2e5f41b025..5f0d2bb93130 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,3 +1,3 @@
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
-EBUILD givaro-4.1.1.ebuild 1805 BLAKE2B 98ee01af532811a591ac3428de6572054227f00b3ed26396fe41e7564038ac57d8d46b451c3cececf14a984d992b3f89a25fb38c5c48b02837ccbb9026c70484 SHA512 ddc57d485b7847b284307843e8632a02666f5b2940ec46705784a93136d3b5cca81a9feaa8eed0858ac02909dd310302b3421d2cbcfb3332a7f7bbf1e1408598
+EBUILD givaro-4.1.1.ebuild 1794 BLAKE2B 243c21495b82ee4e6b17368f1469a31c0c9ab2b2b8300d0c3c3a706ff3f7e1857d98fce8830dd9003fe0c4a61680911ca8ba46e1c510c4fadccbe70b58afe81f SHA512 8454b0ee3d616a3875e7e93aa8c6a518e06dd0c44b725044b54f067177219e4d18eb7f58adbfce39298cfba62814292c822ea21d6c2b956f340997b9738a8463
 MISC metadata.xml 738 BLAKE2B 89916089365fd82a21b273b91b832888d542ec4c0d7533d725f2be0bf9c9310758f3d4ccd5e8c1d6abf8cb63f92e62c048be22f99a88f05eb6db5cd6bc5a8c17 SHA512 768957687398de4ece1f9d04f6f4c7836b0230d166553b5b2998d61875d78810c1470061eeaac5d39b4ee81f839cb4eddc4ba2316a7024374f8a8864a275af4f
diff --git a/sci-libs/givaro/givaro-4.1.1.ebuild b/sci-libs/givaro/givaro-4.1.1.ebuild
index 935649abda69..82c862d823f5 100644
--- a/sci-libs/givaro/givaro-4.1.1.ebuild
+++ b/sci-libs/givaro/givaro-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index b15d50608721..85845490bf05 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -5,8 +5,8 @@ DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
-EBUILD gsl-1.16.ebuild 3078 BLAKE2B 03e8f566b70455710757d44fabd85e32c4a804a1ab4fbe1102f73c6d10afc187a1df7e6a26e4a2928777100bcd01285c6a5ca947bbf73a6fceccf628109cfb23 SHA512 30f02502e49ad97ef6e8430e2b98ab6cfbb7812f97dcb0596b5a96f16df868e5dc5c85f2c6498f237216c1b4aa226e2d363b017daaf97ad9f43045178594634b
-EBUILD gsl-2.4.ebuild 3184 BLAKE2B 40bbf1271590764573038be47e18cff594ea73f196247bcac3767fa5ae41e7e3e21982e321ad4bcb9b44bcf1f9c5102a5be7f44248d4639c9e5b32a6d465652e SHA512 6636cb654983c9c0826853f9fde3709633a2d0f693d0b1993f3d9de5b13dce71c18107a404ead7a14df4d70ec418a4974266022166f2964f104dedc6b76d4700
-EBUILD gsl-2.5-r1.ebuild 1411 BLAKE2B 28050f0766d37c2766913781dfdad1580fbcff98715d16d752147e2ad267a5f587397bdc9d3fff856567ac4e3f46bac72c5ae77fb930fddfd0a2be703472937f SHA512 e907625ad002f384d28007b6d9b2d32b85ac7863036ec4e265ba2b071a2e69e4836c684a4bd2bc202c17f166659e324071b1becd3fb01a8623c49fbe891940d1
-EBUILD gsl-2.5.ebuild 3175 BLAKE2B a265f3662a02ceb32aa3bf9084ecb98d00807c6c60cae20ecf1d695c06d0055f9bd0bb30188e54a9077639ec9c791a7d4fe03da26c0d48e24669a54bbf673bdc SHA512 ca02461335b8c204b0e08e19d2cc8bcb554ccdee56a350d8ae86be892c7c647c3c5ec2164e586eb6f7ca62bda51f1b67238ee78e6a4ac9e174ec7053141e25db
+EBUILD gsl-1.16.ebuild 3067 BLAKE2B 480c0a8b51002252c7d06ba5b58f6682ebe48bf894c2a82b663f7df6a87bf78e77d6b4290312b2ccf4f691811d9535ee027d0f4e1afd9215a05d8b6f289110f1 SHA512 0a7985caf5f0105c822662d3ba9067af1f824bdf4e7dbb489f6c595e7c2cdbfbc2adb3842fff3b53ab77d6b53bad41cba3e42528ee65ccb01d1c1846f8d045e8
+EBUILD gsl-2.4.ebuild 3173 BLAKE2B 2ee0381418b2264610040fb2b70af4858dfaaf423ca483e2d83db41d0e08c11dec50633d2b49084917eb39f85d5dd33e40e9a861a37a0263b5f863f2b3ed2518 SHA512 645b06cc08d92ac7a16e3212087d6331724f202a5582939603e976a5f24a5f680f9be9f3d9fb15486a5c7e26bbbdd40fb07582826d9b139fb02f955c8c35d4d0
+EBUILD gsl-2.5-r1.ebuild 1400 BLAKE2B 80778daac6694157ddb2894cecb5fe6cd708770c26eca5f468cf5c5a9082469c2f58008d15ec37bd1739f3575f219c52de6ebdf61c0b0cc65fb5c909d057d307 SHA512 92848c84f40375a55137627a59b044d741b102fafdbaef6cf22aa43c61e982b39e03c51e58bf3fe99d5e63886d59995d1b184d978f65c1ac3c9b23db46658766
+EBUILD gsl-2.5.ebuild 3164 BLAKE2B c9606b6fb6a75bbcd4f9a00286f7ab71e1cf7414e25d0603536a0fe5b8c822ad9be496384a563bc61cc56ffc1ae5624076122eb8e9ff898f84d71799e1ff7a02 SHA512 9f1b70dd657593072fd04d670c5a06a98f29fd8a53898841bddf033b71603dfa896097937649fcdc70351af445af740d27a4b4cd6a7c029bbcfbc78691cc1459
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index 9e12fd2e9bdf..dd0a369c37c3 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
index 717234335f10..e061f9b29d03 100644
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ b/sci-libs/gsl/gsl-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index f1d81874a93a..2a2625d5c3de 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
index 491d3cbe7610..65e051a9dce5 100644
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ b/sci-libs/gsl/gsl-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 979d72b91187..5625f329d770 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -5,5 +5,5 @@ DIST indilib-1.8.7.tar.gz 2195976 BLAKE2B 3c206e5775b9c16d44cf28b6fa70b186ee9c46
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
 EBUILD indilib-1.8.3.ebuild 1190 BLAKE2B e09d230117079e62df8baefe1933c8d70e76778a1cb34776b02c13a7635e9bec2819315aa7f22010515b5e787525fd30a8af7525369f4fa5563c251696f84639 SHA512 44395e193f3e918f45362995cae6dbc7ea24c0038a7bd4068b684d5684518be7ffbe7dd1d942b1162b4cd2ea87c6ef1754ba388381738eafb79ed00095e84f4e
 EBUILD indilib-1.8.6.ebuild 1192 BLAKE2B 0b7e584d556b356999fa46d863ff115638c7941c8cc6b756b10571070d0892f19937ad5b17d72312682d24f3260b227d781c6bdaa4094e89592fb3c14bc7977a SHA512 d28075334e1b6c1410413e1b191a0f8d0410daffe3f0fd823598280d8572013ecb6d3df5728be9ecaad05432a50ca1dc13a8734aa226a6a63e561b59df5f39be
-EBUILD indilib-1.8.7.ebuild 1192 BLAKE2B 0b7e584d556b356999fa46d863ff115638c7941c8cc6b756b10571070d0892f19937ad5b17d72312682d24f3260b227d781c6bdaa4094e89592fb3c14bc7977a SHA512 d28075334e1b6c1410413e1b191a0f8d0410daffe3f0fd823598280d8572013ecb6d3df5728be9ecaad05432a50ca1dc13a8734aa226a6a63e561b59df5f39be
+EBUILD indilib-1.8.7.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.7.ebuild b/sci-libs/indilib/indilib-1.8.7.ebuild
index dc1c02bc3d9b..d133f7e42252 100644
--- a/sci-libs/indilib/indilib-1.8.7.ebuild
+++ b/sci-libs/indilib/indilib-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 25cd267f19a5..62b54c3630b4 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,7 +1,7 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-EBUILD lapack-3.8.0-r1.ebuild 2901 BLAKE2B d5f74beb2ce42286073f0814de763d0a2766d6164cc79a1e462e0023c43df99187159c9326d0ceda48bb0c2d7f5982acb7d53851d0343d65b787517bb7114e5a SHA512 5f80710f037904ecaa7c8c252f0f0ab71e2a33fad7f70f1a9c86aebf67ab869e229590afac775753d159516f953b6b60228f3262f5e63e7441d727e975b44237
-EBUILD lapack-3.8.0.ebuild 2849 BLAKE2B cf64c5d2a2c49b23821c8f66751fd14886444ba89d6f77b26be33eab76991ed587a1eecdb4d2422c35b184e716af888490ca400a404c50f3de0118e9afa5dd30 SHA512 9dd9b8ed862a6d3961766fc8e550d04991b69d3d4ef1c9d3b5eb1e5df893eb6fd90b29d10cf9078a172cb0210a4f25c179ebf1a11fc470ec9964481dfa8b74bf
-EBUILD lapack-3.9.0.ebuild 2977 BLAKE2B e10b1e4e2b28f54248880ab5069dfe604dea1802bed264efcc50afd592aa8dfa57fe1b4f600595f24666f3e640d1262221a84628fb96f22878cbab015ceed263 SHA512 b9599f61ad404cbdbe3bb4396e5b6f9dae78b708a2df37eca38f75ab183bee24ef14db57f8cc1900f017c45ebe5735f452e703de814d2664bdd29a871ec0f226
+EBUILD lapack-3.8.0-r1.ebuild 2890 BLAKE2B 9d7b6dd7d21698cb5ad5152dc1654b768e10baf6e5e18d591c5eb7c5902b7d938d0b617f450f10559c704c1575a7f8b95039714acbceb78e7f1af0e179d5c37c SHA512 26980d932c08e39b557e97c920d97f81176e7ccc65cc3143bb1b05ed2c2dca7005c90670dec7bd63b4f72e6100c5e87392e474b7a565dd1a9f53d2aa1e22dff0
+EBUILD lapack-3.8.0.ebuild 2838 BLAKE2B 13d79af69f82e52a71945292a129cafb3135415c9ec7d752521c8d18fbd1f6767ee5dc1a366fc48c8872f94a44d562f6e2ff154c58091e92e60e96faea04aaca SHA512 e8c302e454a2f507fa8ab700713fd02f5f7b3f8604180af9cade6bbd636aad02b723d69e60da0ef9e8b45d66bac20bb18247a0f88c8e994363f6d661a23f0464
+EBUILD lapack-3.9.0.ebuild 2966 BLAKE2B 5f547035a84f33613c4748bffb9b3a39028c7c4b62c583d807c58601402db2ffe2dfe14e5ba69fb6e43f672fbe9cc9a6ee80f36d401c0ced87e7fe5d85133d0b SHA512 5e20a9c4d1eabc5c2423bf798d2d7ba55a567f69a09be803a8dae10726d343ccd4f4f84275a8273ae35b44bc15b3e6690b34030b12f1d8f31d4901950e6fc307
 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 47bcb4605cab..a64e00ff8933 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="lapacke deprecated doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index d661b9b9be54..1abb3b17f3e5 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index ccbb4f596994..2d1c181e05db 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 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"
 # TODO: static-libs 64bit-index
 IUSE="lapacke doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 124258334d8e..1755f115009a 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,3 +1,3 @@
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
-EBUILD ldl-2.2.6.ebuild 639 BLAKE2B d781841728015476db308bad93d3d51e2693face37245ba6413d9b2a5318536346825205ab7b462ab0cb7dfd2acacdc65cff7959225a048deff85606204340d1 SHA512 a22a0755cb2c8b6adee48e2fe2e92745357a202260127d1693ddb653626b6b7c659e38ad1200b05f0063cb63b531cb81bdab766dfcf3d4cc775bffdd266d02f5
+EBUILD ldl-2.2.6.ebuild 628 BLAKE2B 49e260092ee72b1bac321f595569f9c824242accfd0a8d773bebba0591db10fef1f846bc395faa6330d839e2812e2705fb69405c34fe4ed4aca8dbf90b69b9b6 SHA512 e377fc3076b3699e7fb6d5c6eae15da75174135d3a51abedc62f3092a1a2084e04bf09a5505dc71ce9cd288de9148c3c9b6d3f0e737ff5d770cb4206d0a21c5c
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index d29a5c1298df..37947b809125 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 65e56da3698e..59c59cbdf06d 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 810 BLAKE2B 904310fe49b0694fda0792dce49e31dea2869223b4cdfaee2a3da0b6149eded62c51d64a6e6e2831cf9070afee2d2a36a821c4996fb26960223c73bbfcac12e5 SHA512 84d652e1851b62f2e13160d8ffc90b4ac9aac77f42e52b519530f7bebd8ee877258d27dc552e7918a66e418fb3d85521fc17565284e45e575a431fa309cd9f8c
+EBUILD libcerf-1.5.ebuild 799 BLAKE2B a4202b3ca26a3128d7d69e58aba276a4bb511be56975aa69220f6fe006a6bcb23e89c5c14f5953dd3c02bf57a63716db3c0bb58352c6e0f7d4998aba98f9197c SHA512 eeb8d93543667f56c8acf66f7cc8b64fd41b49d1ac25782fb2c2196304a5caa8f370c291c07b847d25e4c011f07cfb621accb59b432d331f95989015cb549208
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index b47e632732d2..5bebed231186 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 110c8c1b0b09..375460a658e5 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,5 +1,5 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
 AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c50415ded096ce08cf0cb88f70206c3e471cbdd2d619d61e3bd08aecfcb8a2fbf7deafdd773768e9cfb80ffcde0aaa05d4a96e3cacaf SHA512 f4c8fadce30f3ade704cc38b1646beefbc3676e9f68e06067e89617fe584b3f2a2b13615e5e8949c6a1ec4d88fcf4937922d8d47f498f1feefddb096b17df51b
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.5.1-r1.ebuild 1337 BLAKE2B 42db8b2918566dfb5ac357f4f52c37cce9bea0b0db94c8a5debec154f5bec3bc429be55c11ca932f09acb4cf10acde6efffa62ae43e600068ac613b22bf509ef SHA512 017990200b71efda4294f80791e340f4bfe6dd2296e20b79c980b783242c5035f716ef9d166bb6e7f97d3f2c242c2d67559f9c7f9bff0db428f5e7c2326adfbc
+EBUILD libgeotiff-1.5.1-r1.ebuild 1326 BLAKE2B 6049afbf19b1aaa323ca2403984f207de3c7830e9664b0b7ed774149c3a9976ac902f8aa545250fd8a344ed5a9b6c5b18e8092d864849d77647ebb3633b54d05 SHA512 f7a3143274f2ce1c692c53dc1359c0c1bfd347f9325f42bc975fb1f7afbe19de9620b26bea721a45602f3b4db06946032eb11267afa144519179d602fba1bb08
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
index 58b7bdac277c..3ffe18121a54 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc static-libs"
 
 BDEPEND="
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 465ea54d2d93..43f9bec2e2c4 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,7 +1,4 @@
-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
-EBUILD libspatialindex-1.9.3.ebuild 705 BLAKE2B 93f01dd32e5f002058b4c3d7365da3dd397583b36cbbb6dee4b30b43a79e2e510ac45801cd4aad1c863875d4bdd1568fb2a90c6e57344d983de3a63197d591e8 SHA512 75aec783855d912af5f11fe6d07514e4d99c65aa3ff0a125a148b5c18ab8eca49778efcb72dc74b123a36b801d1fb9248d9bd7ea7f39886fc360dd944b0293ca
+EBUILD libspatialindex-1.9.3.ebuild 703 BLAKE2B 15acede08c365069b469837f8f028e49227484c870e6ac356097493dc80bb2422a6d37777fbed4a391515b4adcc84f9bc3e15c7ad3b8350c35e8d4f2255ea917 SHA512 242dda9ea1180a15e468383ba6c49e4828b77c5e443337655e8927c6cb125fa9e4cb398098c04207db07771a8712b66a357c1c331386be44805c01a7ff080d23
 MISC metadata.xml 429 BLAKE2B 7d67fb9320bb961ce97867327bbc4b629e198813582671526425e5715c2c43916e5726fffab0bb6fdcba5b161168a22830db1a31915e7befab9c5b4056b97788 SHA512 3c8459343a95fcb49fb8b5e487ab126fc41db7a15a0e83624d00b82101b13197007d5eed0cc35d38a389e580bfe69fe2e4134581f1b78c16e5377ac9dd38a8af
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch b/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
deleted file mode 100644
index 446452dc9ef1..000000000000
--- a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- spatialindex-src-1.8.0/configure.ac
-+++ spatialindex-src-1.8.0/configure.ac
-@@ -49,10 +49,10 @@
- AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=$debug_default]],, enable_debug=$debug_default)
- 
- if test "x$enable_debug" = "xyes"; then
--	CXXFLAGS="$CXXFLAGS -g -DDEBUG"
-+	CXXFLAGS="$CXXFLAGS -DDEBUG"
- 	AC_MSG_RESULT(checking wether debug information is enabled... yes)
- else
--	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
-+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
- 	AC_MSG_RESULT(checking wether debug information is enabled... no)
- fi
- 
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
deleted file mode 100644
index 2e959536740f..000000000000
--- a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-MY_PN="spatialindex-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="General framework for developing spatial indices"
-HOMEPAGE="https://libspatialindex.github.com/"
-SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-SLOT="0/4"
-IUSE="debug static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-QA.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
index b923ee62d39f..b38f1950daa6 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest
index b2db4b133845..f164e7e262dc 100644
--- a/sci-libs/linbox/Manifest
+++ b/sci-libs/linbox/Manifest
@@ -1,4 +1,4 @@
 AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b
 DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c
-EBUILD linbox-1.6.3.ebuild 3342 BLAKE2B 2907fff7074519568eef7747acccaad85c60ce62aea7c8d83160d050f52e2a701e1d96d019eb86526675a9cb2f5d7b0a8f0fea6a0c4c04f0d4f7baf59690522f SHA512 2fc91cb26475b5f7a5fd59e1990872c31fd6285fef6882568b9a9280c0e500b18f2fd698e0835e9b7c7435d1215b3f56fa30847f1922d7504a9b2285d12a22d8
+EBUILD linbox-1.6.3.ebuild 3331 BLAKE2B 732ae002a00879e1b3a06a2e6f1d02b0ca437cf68695b515f9d1268e222e3c48f769477953fc8419f862bac38d9da5c9a97107edf774d0e7ad5674da237fe59c SHA512 f48ec6cacd6e58d351eaeb0c9d97b573ee7c452f6ad72b06d57e699d79beefe246417f00217ae9b1448a9a7054c1e65b9cfbc800eb331ab73987165be08ee0b1
 MISC metadata.xml 1242 BLAKE2B 456a3155a1206586e04e144f133659a107154d1064afc8cbb210eb5fb6930792e846e0ad58e55d20738f4a7fb078158c2d8398379f81d56b90c9aa7d09645426 SHA512 86b2f86c9f15b00fdd57c5041828f1b3a309d616b0580eee878a6ccbf917f2b500aae81c0cc96c4d10b5b40429b3bf997f0ea3468878d7b8e8b08c4624977b77
diff --git a/sci-libs/linbox/linbox-1.6.3.ebuild b/sci-libs/linbox/linbox-1.6.3.ebuild
index db82ccb781cd..3e7c890e6f65 100644
--- a/sci-libs/linbox/linbox-1.6.3.ebuild
+++ b/sci-libs/linbox/linbox-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index 504098b33c09..a30010b9d162 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -2,6 +2,6 @@ AUX m4ri-20200115-libm_underlinking.patch 2352 BLAKE2B 1c391a5d359585e8d6ffb6fa3
 AUX m4ri-20200115-memory_violation.patch 2905 BLAKE2B 08cdf9f22307f8477dd6dc5980d496cc56f4a7d625d83db77f1928417a1ba388c6a84c4866276bdad7ec4742b4dc102262e6f90c89a24423494e9877064f39d6 SHA512 70a32c5ec8e4c936b530e85d48d93e6f5d49122df658528c0fd74b3d812d25eef4d9826de3d01127bb717ecbdc20be23079d5805e3d767d225cd1cf24c321fde
 DIST m4ri-20200115.tar.gz 510562 BLAKE2B 4522793ab61dd97dae5c8d82a4457364f437040c9c45c355007a3150bfebb5264e336b19a7416f62b5ef937480f15079d9c0e9711dd26a6f7c6f5ce66d699296 SHA512 4791576878097077bcda768c03a43ec9a5b05c29adaa9c5f1e737e798b3fc7d027f830183d57db7b8b6b75b25e01fb522eb8b2e5359efcb05054fc341cbb403c
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
-EBUILD m4ri-20200115.ebuild 1339 BLAKE2B 0bb3afb8b5596445b3d4835ed247116805f7e2e70b14af9d481d90ddd3c0f0089cf5e7cef311f454e2389141d66729a7c352c3b0b29f38b6851dc474d71a500a SHA512 9129b34ebed40010465129235e33843c14596f99dbd183401c9d7ba4ce60550506703028168447174ba37313d0ad4ab6abc3f1084b95df1a06e8bfd13defccbb
-EBUILD m4ri-20200125.ebuild 1170 BLAKE2B 20962682e9164b8da028392dc1f014939cbb44bdc051abfb5ec560d1a673dcfcbc7b767bd9f9f3753b2282f02d8ca4ecbf162f6969767ed88fc34a531a2197f3 SHA512 88c0c6931f03dc57d97879705d792ef8e504eb536af6a8c66c04207b33c0b1ceb318bd889d7a22ab2ada4b72325a436f3dd4e4f441bcef7d12216723abdf052d
+EBUILD m4ri-20200115.ebuild 1328 BLAKE2B 1cec674c12674f27301baf2b8acef7d34133d2962523849c5bff05c0947d0665e3f5b896af53c26e08e5f48c21ddd5d7a9e62455bc57b4a9a06d5e21b44f1ad5 SHA512 af3d833be19a5e04880b62839d182e26965f5571977eb5185c1de1f66720562a23d5e93118a3ec61fbf9172f3f2d5b16eb7fadf5903d65249f7a4700e3777e8f
+EBUILD m4ri-20200125.ebuild 1159 BLAKE2B b83dd86462cbd012756c760492c773cab99753067436228bbf69b3111de66c45c6a5ca59ad2ada0192445094d71ae78ee500fd137421472606c3b880f18875ed SHA512 ce0146a98394049267b9219a35d1a479f972fc6ab2dc82df2c87ab99613cd6cc31570f5699ec5218946415fbf631773933f8492502522f0a5e7e4bb173d97b91
 MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
diff --git a/sci-libs/m4ri/m4ri-20200115.ebuild b/sci-libs/m4ri/m4ri-20200115.ebuild
index 8521f51be38f..bfa4cd0d8535 100644
--- a/sci-libs/m4ri/m4ri-20200115.ebuild
+++ b/sci-libs/m4ri/m4ri-20200115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index 09158e5ef290..6e72eea8742a 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
index 9a8da50fceb4..3ce6c35a33fa 100644
--- a/sci-libs/m4rie/Manifest
+++ b/sci-libs/m4rie/Manifest
@@ -1,3 +1,3 @@
 DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
-EBUILD m4rie-20200115.ebuild 822 BLAKE2B ec28709f5abc0b9fb70ee38eb83ccbacaf7ff102864aa4eac456ebc6bb39ef67aab73870e5e9ae521e8c0ce8b7c3a8b4075bda88608e38f673e9382b8deac226 SHA512 f818df456e021de0d3d6f88ff2da7b514661edf1a695c9e80d023aafc30542f83b1d2bb68f393170ad07e1e42c636aa47c01ec2250268370d608ac0a108fdd62
+EBUILD m4rie-20200115.ebuild 811 BLAKE2B bbab8fa2c8d29c1588974ad14d996887db63ef86d401889d7951450cd269a17d202961101b64e2b5872474e5739bbe11d0f90289750762479bf96eca04389446 SHA512 010eac87309db539996a29fbb421856c94376838de5653bd4e54734481f7bc9dedf2fc46ee32c32141e94f0bc938fe8dc89402f39abb8b11f9d7b5cda671ccac
 MISC metadata.xml 957 BLAKE2B 4f5e134533fe60df5f32154614dbd0ca69fbf2fdace991689c6a65ae03804593d4f45cdecdc12f73f366c765f314302fbcbeaf0de12f2fb7cdc7a3a26120dfbc SHA512 640ec04b19e1c3194d9abd0abb15cbba3294784bcde56d5bf6b0d661f551ab0d9f7f0b932ccec872cb74bc7536d027d27b5e95ca33f6220d0b8c74d5039f5c7c
diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115.ebuild
index 676a82f2a93a..7030c39b71d0 100644
--- a/sci-libs/m4rie/m4rie-20200115.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
 DEPEND=">=sci-libs/m4ri-20140914"
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index e4127d198a5f..2ffb5f4e2db6 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,5 +1,3 @@
-DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c SHA512 9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
 DIST mpfi-1.5.4.tgz 261696 BLAKE2B 264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d SHA512 72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1
-EBUILD mpfi-1.5.3.ebuild 647 BLAKE2B 9788b4f8d72e957544908117e0e8409530dd6c772ba4e8c1b730afe165e2cd88c945c3c709368372c4f7046d188c6419e0a360a437de9512bfea5d0be04012d2 SHA512 4e4a192a512b263522eca48b5fab60414bc5bfa6286c29d62cbe64f21560e57c7ba8aebec3d0686fe32e38e27c9bf0cb2485a878475daf2df2ccecffd5052efe
-EBUILD mpfi-1.5.4.ebuild 645 BLAKE2B e7873908407165f12cdfac8108e4282d2f638a6b18df72c09e893fe947aa44153faae4d21f277990f56e52fab0f6a00656316d0948fa72240a87c23e6b2577e9 SHA512 6cc97b8965d2f8d4dd2f71e9c5553f11331491d89c51a0cec661d74ec25c488fb28e5c004fce30a5f819b43a1fe7f7dc20b4507d945cf8cc0d6783763f7b38d3
+EBUILD mpfi-1.5.4.ebuild 643 BLAKE2B 949702150a43f3c1ddb264350451558cb7014715b17f8ea3ef723ac7626b14ae609acc71fb7bb293e34b2a51c8be2ca4f114b47691b76fba313d73d922df0112 SHA512 d19ed765a9ef8de7defcd18be5c59c4136ae9e7e5eb191ae2958b761c631be99184a77ce484d545bc07173deb968f929e5f7979bba7d91ddac3ff3b04c307415
 MISC metadata.xml 1029 BLAKE2B 51b40066219be20a21939a82e93c095573e3cadaf288430db3c0a46c83a6045dccb3b940505b6ee189d426a0e1e57b9135df202a6185848546a9f5a1e8316d7b SHA512 870810149f2a547a0db4df6c7997fadfeaee91d0a8a1d456fafba76c7c48e0e59e8a0415a10b46b89bf4930e1880b94d3b6d3f28443dda2bb7ea45a62fa3c8b4
diff --git a/sci-libs/mpfi/mpfi-1.5.3.ebuild b/sci-libs/mpfi/mpfi-1.5.3.ebuild
deleted file mode 100644
index 557131c75ace..000000000000
--- a/sci-libs/mpfi/mpfi-1.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit out-of-source
-
-DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
-HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html"
-SRC_URI="https://gforge.inria.fr/frs/download.php/37331/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/gmp-4.1.2:0=
-	>=dev-libs/mpfr-2.4:0="
-RDEPEND="${DEPEND}"
-
-my_src_configure() {
-	econf --disable-static
-}
-
-my_src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
index 7c513767c675..b689664fa587 100644
--- a/sci-libs/mpfi/mpfi-1.5.4.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 2e2c58e04ee3..1ad193484298 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,5 +1,5 @@
 DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
-DIST MUMPS_5.3.3.tar.gz 3912935 BLAKE2B 03b88e23b8dd49832c43aef4717edd440328ca7c63eed9005a6baa008090f63089e7a259fb8091ce462e249196c2a1de0ec1e864173e3ecc3265d5a9cef8b869 SHA512 fb2da6acfd0a413ed5a9b2ea346a191ecea4a057f26a8c3b8ed2400843753a354055eb911e53d9f6ed5a6818e653ab926579c1a4a261b791c5ae421fcd5a7945
+DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
 EBUILD mumps-5.1.2-r1.ebuild 5662 BLAKE2B 3d02525978545228ef97ccccbd18bb20e73747391f2b8fb0148eaf24d7802f03793d1246b9bbd65a07820fc33fe28e82c5b50e612022d9912e5edadad95db772 SHA512 c3dda6400a3ca6ecae6043a6abb1206860c9ca76331d3dc35073161258591e693a8423f68908066b750c619fa9f66d2899dc5800c5fce20fd26e633e68c4a280
-EBUILD mumps-5.3.3.ebuild 5668 BLAKE2B ac94c8370e4eae81715b0088553fe55b33440bb142cf09360dcebd71d0e3bcfa583708fd538d16484347aba3a810e0fc591a87e50873be03e8d27bcbda78ac37 SHA512 cccdf44c816d1a0a284837200ef63634d886a4e719c820fb90fd39e04567f6ff1bdb7e66f5cc2551364612a78444780841ed9a907129b1fc862ad5d4dc6f718b
+EBUILD mumps-5.3.5.ebuild 5733 BLAKE2B b176d7fc87a590aa129a3cff471b3bbc07753263abcc31d2a7a1cc061215594cdc94199d4f8ee5a1bae76e476c416362f762a5c827d5bacd5183d94e13455859 SHA512 5ac75e3969af83cf10064763c70f8a1d02f9d62c69f7bdff4de8d7994c592c4ee1a3665622e574a1b6d5b2f48d79da1493a59e9afbdc4a9cfda8ff9b3e8f59fe
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.3.3.ebuild b/sci-libs/mumps/mumps-5.3.5.ebuild
index 43b0f37be670..9c2b70d7f003 100644
--- a/sci-libs/mumps/mumps-5.3.3.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit fortran-2 toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 MYP=MUMPS_${PV}
 
@@ -62,6 +62,9 @@ static_to_shared() {
 }
 
 src_prepare() {
+	# workaround for gcc10 (bug #743442)
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	sed -e "s;^\(CC\s*=\).*;\1$(tc-getCC);" \
 		-e "s;^\(FC\s*=\).*;\1$(tc-getFC);" \
 		-e "s;^\(FL\s*=\).*;\1$(tc-getFC);" \
@@ -82,6 +85,7 @@ src_prepare() {
 src_configure() {
 	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
 	local ord="-Dpord"
+
 	if use metis && use mpi; then
 		sed -i \
 			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs parmetis);" \
@@ -137,8 +141,7 @@ src_compile() {
 	# Workaround #462602
 	export FAKEROOTKEY=1
 
-	# -j1 because of static archive race
-	emake -j1 alllib PIC="-fPIC"
+	emake alllib PIC="-fPIC"
 	if ! use mpi; then
 		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
 		LIBADD+=" -Llibseq -lmpiseq"
@@ -155,7 +158,7 @@ src_compile() {
 
 	if use static-libs; then
 		emake clean
-		emake -j1 alllib
+		emake alllib
 	fi
 }
 
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 836515560d50..bb5530f8c840 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -6,8 +6,8 @@ DIST openblas-0.3.10.tar.gz 12246979 BLAKE2B 507aa3f058b841f477720cff98480afda5c
 DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99e83c8a4484453f120d8f8c9c69ea5b481a143db04342a1dcb1779ce548a49618cf4941d08d636e12ed481305e8fb5 SHA512 1ff5a065c41f7e460857f8428fc77900b189f051fa8129eea9ae93237f234d387cc1c6e627c2c95636164f512d4d721d4229729f04a04e8d5f655abbf5463d98
 DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.10.ebuild 4111 BLAKE2B 872a4bcffb2d76a03189131b7e742ba7d72f1b9d93d19ca9e00c0f688568c2e7a3ab00b598f3d3066b85d161a44cdc83562710200d61dc2b5ce5c095b3462fa8 SHA512 958088ad8866d3218b4d6be4820a1b6bcc512b6960abc21a654bc78b561b65e235a66281a1867d8ec217a4b96cfd178c894b0ef263a9f317241949368d4526f1
-EBUILD openblas-0.3.12-r1.ebuild 5745 BLAKE2B b45d551cf3bdcef581574e2261b58bf7610c945a048e5b4503c7e3ef4668e9549fa347a9a4481abdc81da76f768b51cf5c171c226758f796fb22fb0d03698e43 SHA512 a603bf8aade07cbe3463d5b7dbaf447665c58e5951cea47aea2ae22ee2405baaa9af6a36dc5f994788d247d93b474097b8221740992101301f49ca94f19947fb
-EBUILD openblas-0.3.13.ebuild 5746 BLAKE2B d68962c2c993f87836564febcc37311b93f4c17e49e9b9050923e9170f984d7cb8b74616f9bf1f5bd0e7fab3a06e6b053c9ac2f7c8988095715f9216437e845c SHA512 608cd1c978f76285de494bec53eea2647f0e7910a5fa7e70a59687cf27985da49b2548adfff51fd9a8323ee243a1f768acf4c38cee6fdcdd56b892951619785d
-EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
+EBUILD openblas-0.3.10.ebuild 4100 BLAKE2B 2b818eddad94b7691724c12acacf102cde3b24b1c839e322a863bfae3722445e53a128ab47a011f12c5204fed7b51e93ddaef933de8c6360cfeb5b519a863401 SHA512 89b952f9b41d7e39cc99f0dac5d88e8d2402808207e208168208fe94c0dd46116fd1308228e7606a0cce3dbae499b6c8e6a4383bc5c8084efe3a95b4fde87f6c
+EBUILD openblas-0.3.12-r1.ebuild 5734 BLAKE2B f188bcbe5fd02f918d5de33c2f95fd88a43852c54155e9056efab884fc60390126dc2f98c38dbd22a89d70ef5ebbb87c806423c07e949cf44d050ab7277d8be4 SHA512 678906ad44a705091e6c9a4919367f2e7efdd475f793abfb8c7a5fec99e73c5b034c0b1cc30f45385f7104808d5fbff3295c14f5f3ee97e6090db30761ae7122
+EBUILD openblas-0.3.13.ebuild 5735 BLAKE2B a4eff769d37eba638e2946a14049d19e6b8f7b029925d9b9cc7b393f83369d14bf5dbf862e8e6c535ef53f0aeeece6f3d7975967d9cf8095c7be2ede6d7dbe11 SHA512 7268789adee978e9ede595819f16a7ab17f12d6629b0db6b6b458f970a04297759b0f1de35f8633ff4c93daa152492418d770aed5e1a6ad08e64322bf4daf764
+EBUILD openblas-0.3.9-r1.ebuild 4064 BLAKE2B 3029d77f33eb1d2ff3fb72c836f000ef74a35a0b91a5f98390c8afd1e3afdb8fda6ae8ba3929c617f0885a6a805b93641ce4234877139b199ab0141407b69696 SHA512 5e4a6f69abceb7cd27cbe7178aeb95cbd2551c5e30cfde67178b2d394a23cff3ee35df9bbe185b2173d33af40c15e6ee44d746749c919ff7394e95fb05203e48
 MISC metadata.xml 1546 BLAKE2B 3e6379f0e8624978c09272d6440f8234379ebc886e1f72d05f89ffd9914da46cd66d94f5d408f11bb585ac28bde6d222b89e2b9608de550d94fdcbae25e2d910 SHA512 a4680cd8f28c4028acfb9621281ee0a08916f62c99cec883e953390ac9d55d47fa3c667c4fabb54121f7010f67d1e180c1c1faa5eceffe6a89d379ef4419cca7
diff --git a/sci-libs/openblas/openblas-0.3.10.ebuild b/sci-libs/openblas/openblas-0.3.10.ebuild
index fad54321378c..07e33b946b15 100644
--- a/sci-libs/openblas/openblas-0.3.10.ebuild
+++ b/sci-libs/openblas/openblas-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
index 6f996986647a..1426aa247ad5 100644
--- a/sci-libs/openblas/openblas-0.3.12-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread +relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.13.ebuild b/sci-libs/openblas/openblas-0.3.13.ebuild
index ef165228c141..1c5dedff1843 100644
--- a/sci-libs/openblas/openblas-0.3.13.ebuild
+++ b/sci-libs/openblas/openblas-0.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread +relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.9-r1.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
index 391cd2524189..8a643b07e309 100644
--- a/sci-libs/openblas/openblas-0.3.9-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 37c68e8c938b..e7acdb9d4fc1 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,6 +1,6 @@
 DIST pcl-1.11.0.tar.gz 67091890 BLAKE2B 77dcaf99e19cd3042a01176e57441a38e7f5095d7bd9b08c9ad4464384eb6c603eab9734a6bcbb52eff9da55c3aaa69b3744a10137b8264e5729c2432a678f71 SHA512 1cde48349b2630d1bb89fa50b2844054802fe02d22c810516bc41a712823a26cd5fa1b14297718f517b88c371a637567b31fb8c4c9b4908e94fb3a7208095127
 DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2
-EBUILD pcl-1.11.0.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9
-EBUILD pcl-1.11.1.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9
-EBUILD pcl-9999.ebuild 2174 BLAKE2B 0e8893788a3c82015da257ee9a06bd89cf065ca5eaaeefb4a7988f98fc289d8dfd44c74c1eddfe23e062c434fb6a425d0b1572232eea0a1d6f362b06a4e142c0 SHA512 86b6eeeaa5c3b2da5f0458cd53bd3b370554fe2ce4583c3b2618b8f1d4362c648d05ea7328bc6504bd1d7aec169add0c414dac1162743acb361e3bf7601a22f9
+EBUILD pcl-1.11.0.ebuild 2176 BLAKE2B 79157497c851103fb450aece2b4fa035da039b49af7b62ade76167e3b9ad381320f41cad6fe0180bc7bf01aeb7680bac3e380bc5e25ce73a25fb1fbaf2bc9c4f SHA512 d4cba0dd1cf25beb2ff96caf4d3b82378437bf490ef3c7a388ac94c81a6a8fc7dd501b776737b086464b0f5e44ccdc25fe4c4b10405aeaeebe0cff82c2a771e6
+EBUILD pcl-1.11.1.ebuild 2176 BLAKE2B 79157497c851103fb450aece2b4fa035da039b49af7b62ade76167e3b9ad381320f41cad6fe0180bc7bf01aeb7680bac3e380bc5e25ce73a25fb1fbaf2bc9c4f SHA512 d4cba0dd1cf25beb2ff96caf4d3b82378437bf490ef3c7a388ac94c81a6a8fc7dd501b776737b086464b0f5e44ccdc25fe4c4b10405aeaeebe0cff82c2a771e6
+EBUILD pcl-9999.ebuild 2176 BLAKE2B 79157497c851103fb450aece2b4fa035da039b49af7b62ade76167e3b9ad381320f41cad6fe0180bc7bf01aeb7680bac3e380bc5e25ce73a25fb1fbaf2bc9c4f SHA512 d4cba0dd1cf25beb2ff96caf4d3b82378437bf490ef3c7a388ac94c81a6a8fc7dd501b776737b086464b0f5e44ccdc25fe4c4b10405aeaeebe0cff82c2a771e6
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.11.0.ebuild b/sci-libs/pcl/pcl-1.11.0.ebuild
index 04c17c371e91..4d7299fc43e6 100644
--- a/sci-libs/pcl/pcl-1.11.0.ebuild
+++ b/sci-libs/pcl/pcl-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtcore:5
diff --git a/sci-libs/pcl/pcl-1.11.1.ebuild b/sci-libs/pcl/pcl-1.11.1.ebuild
index 04c17c371e91..4d7299fc43e6 100644
--- a/sci-libs/pcl/pcl-1.11.1.ebuild
+++ b/sci-libs/pcl/pcl-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtcore:5
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 04c17c371e91..4d7299fc43e6 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtcore:5
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 155817ef18bd..bdba28f441d2 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -2,6 +2,6 @@ DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db
 DIST proj-7.1.1.tar.gz 5509592 BLAKE2B f745df3ef276b8a3213aff5ed92890f9c8f4b82a61a1e55fd013925befb018f01d7e60264dc996ea5aa9630b3ee3c149a7f37ca87d89c9df2f29367d4b26b19b SHA512 9f092318835006ffe864bb54ac456054196d30ff367546b41f1e49a5f1cc99a4b0b19e3d09c0ce7a336d1562df5784805560e7f725380411b1013a6baf90cf56
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-7.0.1.ebuild 1219 BLAKE2B 8852ed09c9a0b6ed39693f322d57fb1e447a0640af80b90831eb4c837913e345f1b4e69064f1d7409ece14794c7bb4b389a5555ca08327efcc9c6368bc854f67 SHA512 c0c17b2dc10b480e7cebad6a059e18ccb53a7bca93b68bdfec7737cb0ae20d66712a50bfb347fb1ea8b19c2d696b6bce93298fbf7f1336d70ab2938a3c553b5d
-EBUILD proj-7.1.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
+EBUILD proj-7.0.1.ebuild 1208 BLAKE2B 9512e12fc93cbd4e17be6c8e3f222e7e1a62f5b73d7e1233bc7701c429f9d5877837a6eba03587a4e8bea26eaa921a4dd4686adf0412200e932de14b90878364 SHA512 9e6b0a2343b2cce7b0cb00063380f0df9012b746c56d9a7cf12b3c0f1d23bd53e0e3071c0e0b01b21d6a816de54ad52afb391a31ac2a1e83d02445c674d17bf8
+EBUILD proj-7.1.1.ebuild 1213 BLAKE2B 96a64b1e5f39515d4caa5c7cbc46c01297b0220b6f85aa5dee6f52f4a69505fd3495d9a01aadb97f661a6d51709df523709dde99c1d12ecaed27abc8c91a06d8 SHA512 861d267b0f82d55223b569b1655af44c65d687d5f8a9c86e519f4bcbce17f6c9c7dab35a3ab9b51a7cb7b3690df1d001b9ec3dec4768301d44a6231540978cc9
 MISC metadata.xml 374 BLAKE2B d6d3066273af3324fb5ebf6b0d3b0f49c4e78a88c7cbd7689e9d9ec6841033a03bb5f219c62be88320b2fee6c712079e54a5368125d7a33b301ae1263aec98e9 SHA512 34124c295beb66129e72963474508d26f1482919447bde9ed3af89f2123dffcf98037760aab2b589cc0a5dad23183fa0c28ecc3c4322a1ddfb926fb4ba52c8ad
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 5d236f000813..e7f70f68ee19 100644
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/proj/proj-7.1.1.ebuild b/sci-libs/proj/proj-7.1.1.ebuild
index 5a90105f20d9..7709f61d762f 100644
--- a/sci-libs/proj/proj-7.1.1.ebuild
+++ b/sci-libs/proj/proj-7.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index c5520bd7d9d6..c852c1861722 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,6 +1,7 @@
 AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
+DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9 SHA512 a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e
 DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4
 EBUILD scalapack-2.0.2-r1.ebuild 1650 BLAKE2B 994af8b82c1dd33292d34efd80394f8f641eec7d3735629c548c0a133943f56ad78582a2c21a7690f27577e3051800a454ce6bb0b3381bf43c792fa303dc184d SHA512 4a9e044a73dfe07273d4e5f5fab01895cb18e3e20ccbd077540571f75442e438ff8fa9e62259d085f1dd63f3901e2879366f9b1e2c28e409bf8c1d0d5f248897
-EBUILD scalapack-2.1.0.ebuild 1618 BLAKE2B d49a7ca245711d5b03cf59da0a4822ac697e2e9a5d5bb52b6df39f7303703b7e0a2b0e43e325556b2768aa919b189f02303976b8b34a996cf5e4e07655457e7d SHA512 aadafbf4591511d6d97fca62314ad142731509caf4c00ea516d53060480448cc3d0d1f94ecad9adc7dde175793885d835353def4d3b719d85af20b2c874b4a75
+EBUILD scalapack-2.1.0.ebuild 1783 BLAKE2B 98ef942f36facb4a84b3f4fa1a647a56019adae7edf311c6e6eb2419c39023dd300ab120b232478b24258c41a4eeb8022ee99ed1da429ea303c0f4db79ba35b4 SHA512 98f4d5285de042f68443e086f998c8e415040901b54922437078f92eeae21dc3f9448d98e7d57ba4f6254f265863145d541d90d69668978b15ec00eb50937aaf
 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0
diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild b/sci-libs/scalapack/scalapack-2.1.0.ebuild
index a1979a20ad64..d755a5b1ea9d 100644
--- a/sci-libs/scalapack/scalapack-2.1.0.ebuild
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils fortran-2 toolchain-funcs
+inherit cmake fortran-2 toolchain-funcs
+
+GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9"
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
 HOMEPAGE="https://www.netlib.org/scalapack/"
-SRC_URI="https://www.netlib.org/scalapack/${P}.tgz"
+SRC_URI="
+	https://www.netlib.org/scalapack/${P}.tgz
+	https://github.com/Reference-ScaLAPACK/scalapack/commit/${GCC10_PATCH_HASH}.patch -> ${P}-gcc10.patch
+	"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,17 +20,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	virtual/lapack
 	virtual/mpi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-)
+PATCHES=( "${DISTDIR}/${P}-gcc10.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use static-libs; then
 		mkdir "${WORKDIR}/${PN}_static" || die
@@ -43,7 +47,7 @@ src_configure() {
 			-DBUILD_TESTING=$(usex test)
 			$@
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
@@ -53,15 +57,15 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install
 
 	insinto /usr/include/blacs
 	doins BLACS/SRC/*.h
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 9af2f6832b4c..49be388ae6cd 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,5 +1,3 @@
-DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
-EBUILD scikit-image-0.13.0-r1.ebuild 1738 BLAKE2B abf1e5df1eff25fddc3df6adeb9c8a2b289f9f51a8093318e7f0d0bad8d178b358377663f5a40cc0544765ee52f173222ffe3a342e41f212c2a6516e895393bf SHA512 50efaa381c1093a0e9602a4330253f44f46c56a993a6371527ab07dc987ee25b33cb7266894a3be9548b2e76616bb196e3c6cdabf83c33279c3d2165c06b850b
 EBUILD scikit-image-0.17.2.ebuild 1217 BLAKE2B ad8cee397fb0f4b3e906c08f63ef6b83b2932b0b77d230b3872ceae08a970e925a2eecd60e3d981656877210f22ec1dc65d0f66a638e034a9916dca7f7377a36 SHA512 3af9fcbdcd231564dc42df1feed4ef27d1e4064e4da0e9d6819c16895a6639b516a3939abb636097e14538d8a06fa27520f63aeab4883e3c5a72796e2eac40a2
-MISC metadata.xml 841 BLAKE2B d8e9c6247c250b668c91ef9341c9bd0c4d7a7c479530b02d2b05f2691a7d554e16cf744fd8e9fad919902a182a24bdcbf8aae890c58fccdbeb3a65116d7f9e5c SHA512 5e5ddb5f65b1e5b5a260af23bacc67775af9226fc97518d8146e05c922ae53e5863261a79382572920135e5ec70f1e5f083bbd7dadc9e9f899954baab67926da
+MISC metadata.xml 627 BLAKE2B 2936c5629cc755c91250dac8368462f1a60590e760cc435a6796284df5e1c3cef1945d10ca8ccad0075eddf636e3b93eb3bd08555aff7b1a542cff61fcf89230 SHA512 7cf63841ce61567db038ee838c44639d7e73ec10014e89c3116bc4c4cbc1afc96a687c416b715015e69ee0084bb48620328e6ab08a79f26c3993e7887ae552fb
diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index aa3d4f7f7fb5..a06c97516f58 100644
--- a/sci-libs/scikit-image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -11,10 +11,6 @@
     provides low-level manipulation, scikits.image centres around
     algorithms and applications.
   </longdescription>
-  <use>
-    <flag name="freeimage">Enable support for image i/o via<pkg>media-libs/freeimage</pkg></flag>
-    <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="pypi">scikit-image</remote-id>
   </upstream>
diff --git a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
deleted file mode 100644
index 0db4ea687ed1..000000000000
--- a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,53 +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} )
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	echo "backend : Agg" > matplotlibrc || die
-	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	# not in portage yet
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
new file mode 100644
index 000000000000..ac2c1d68ffcf
--- /dev/null
+++ b/sci-libs/stellarsolver/Manifest
@@ -0,0 +1,3 @@
+DIST stellarsolver-1.5.tar.gz 9113711 BLAKE2B 3fe4489df71bbfa4d75f02a8a0ea26202165a7fe321b626fedceccce52122502be0040a47347abdd4e52b3c3402451f10d79b8258db53d6da029bd20dd02c279 SHA512 eb1d8b8b94a4a4d165b49cd55ffef5e0ae32e7da1bb6b3e061421ba1a5a27ec30438b789c5c56bad22b512de9bf091aeb24b991c9a146cc852b22a9ca97cf3ce
+EBUILD stellarsolver-1.5.ebuild 606 BLAKE2B 2b6ed213e1b19613ea92a6b8527581a331bd9d25f6f081abf4e2f2183ddff9ca7e6157353d151fdd17297da637e4512e79ce90200560cb195351d4fc21829743 SHA512 8e8dc2e66d4b4185d51ac6875534c1e1cc56ebffa6d2038f76a854eea79f18df9f4f60490eaa52d5d0acefe202bd9300aca72d9e1cf7803db5c593277a32f97a
+MISC metadata.xml 463 BLAKE2B 8dd851c4028e50249e1a8cc248cda30667219515ae3eff692bdf60accfdd410072e06f112567592534628b4c27a228e2ff609324a2fb8b0f249eb9d27bbdfca5 SHA512 1214fa61273b29819b5746c2076230ce71c994621a8a0e195afcf72f4f7f60e945978f3ad123a3282c593ca1202435ea606fe06a7c20a8775500e13b95de4634
diff --git a/sci-libs/stellarsolver/metadata.xml b/sci-libs/stellarsolver/metadata.xml
new file mode 100644
index 000000000000..2fc86c69b3f4
--- /dev/null
+++ b/sci-libs/stellarsolver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rlancaste/stellarsolver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
new file mode 100644
index 000000000000..ff0cde6a60c7
--- /dev/null
+++ b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
+HOMEPAGE="https://github.com/rlancaste/stellarsolver"
+SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-astronomy/wcslib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 8ef81ca6b75d..230f21166be8 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,3 @@
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
-EBUILD suitesparseconfig-5.4.0.ebuild 788 BLAKE2B f83043838503cb99dbe1be0dc543264b820fab18d784f4112bc7d91a8657510e693f8a645964b88de0d851e0264549a19d18220206cbd67378f83da01eb7bba8 SHA512 b4f92cd3df8a867f8baea9a4a5dc76f7bf5f9819af5bea2d603f526705211aa02503f4f8863c6917be1e6e9dfea028fcdb5b980560c4e2749a5f5312f06ef5b5
+EBUILD suitesparseconfig-5.4.0.ebuild 777 BLAKE2B 1f7299b50bd8ada06fee936a0a34c3533d664d18f1296768bbe8435d9039e32b4d8f7c43f56f31640168b9fe67c436f53a57cee27e86fb12f1fca06effb6d420 SHA512 9b6d8e43d6c4e423c62dd95518cbbc0c72db0a18840e2dba44aa234844b56e17a47573eb799403a6d06eeb7912ad48f22b4d29cb070eb1cb2c694f138a45f24e
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index b73a80c867c8..0db3b3f8a76c 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index ccf61633c31d..9841fdaa7b53 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,9 +4,7 @@ AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e52
 AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36
 AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
-DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
-EBUILD superlu-4.3-r1.ebuild 1681 BLAKE2B 259f8829b31303e21aefab2d76d9ef3771dc0bae7418ce3b606cb6f1d457d567de517b0332067427f5cbbeea93d1ac42fa5da60b5337088f3412d3f7713a4775 SHA512 482387eb781140c1822979529cdbf83ef1b665d00cd246bab98bd70bd843bd65077bc97817e3c04ff073a44d8ed072af8ee69cb9804532b7137e6c6f9088e10b
-EBUILD superlu-5.2.1-r1.ebuild 1528 BLAKE2B f5da9af1ae76566415e0df6d5ec814bacd79639f073f6c6fa881957033affb589360bf26e035e07073dca4eaedb76b60368961308c0a97018a0be98e330477e0 SHA512 3b0a798b47be26a58e4a296895206623389c9ed5f4fca43b0582b75e5dfa0707734403d7a6b96ca448b13dbf793259f3015920c431e923dab59bce442e3db769
-EBUILD superlu-5.2.2.ebuild 1173 BLAKE2B a247b0de4dfd4e1afdae68e83a2a1f9f704eb4bcc7b4a18a77207a8b16a9a2d52d2b957f8bcdac5573a5c8d8d5eb9e1da65d3f538bc6dd12cde14a5c173bc479 SHA512 8d5c7e9e6b7c9a225d1fbefcf4940120b957363b5242d4ef4e4e500993418bf96ef124ece647d6336b8cdd51a66006069ef019d2a2f86651bb550bd2e6e79a60
+EBUILD superlu-4.3-r2.ebuild 1583 BLAKE2B f1eeb354d7a41826a980aee35707f1d3d6c15753cce38615f8f360b8feb1ab2efda9cc65b1d30e6e0513eba136adbff4113a0a6a4ca06139f19da8e45bddcbff SHA512 89562c3f9521cac172068a6185b6b2a8970c9f04f298587734cd360b41cba4d2072577bdc2afe68c2203fc6c8ce157448aa3a870bb6c63f12bad8bb35374c9e4
+EBUILD superlu-5.2.2.ebuild 1170 BLAKE2B 2c65c4428e1564385032efb8c6d40cceca3c0b64f5c56d4f44f11e5f92f4eb241dd15e4510eff40546557eb211dbd04d5b2c1235db997850f65d394705587d3b SHA512 1480bbac2e9beb3333cd4c4c569da6e3089b9e8ae823e8f770ad464994a741497e65f39068eae439c29e6ef5a3d466ad06695ddb0b29058de2f342ade16f6ce6
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 1c9edf1a9d4a..7ff9a6d2020e 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2 toolchain-funcs multilib
+inherit autotools fortran-2 toolchain-funcs
 
 MY_PN=SuperLU
 
 DESCRIPTION="Sparse LU factorization library"
 HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
 SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	virtual/blas"
-DEPEND="${RDEPEND}
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
+	test? ( app-shells/tcsh )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+)
 
 src_prepare() {
 	unset VERBOSE
@@ -40,17 +37,22 @@ src_prepare() {
 		-e "s:= ranlib:= $(tc-getRANLIB):g" \
 		-i make.inc || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=( --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" )
-	autotools-utils_src_configure
+	local myeconfargs=(
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+	)
+
+	econf
+
 	rm EXAMPLE/*itersol1 || die
 }
 
 src_test() {
-	cd "${BUILD_DIR}"/TESTING
+	cd TESTING || die
 	emake -j1 \
 		CC="$(tc-getCC)" \
 		FORTRAN="$(tc-getFC)" \
@@ -65,10 +67,17 @@ src_test() {
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dodoc DOC/ug.pdf && dohtml DOC/html/*
+	default
+
+	if use doc; then
+		dodoc DOC/ug.pdf
+		dodoc DOC/html/*
+	fi
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
+		docinto examples
+		dodoc EXAMPLE FORTRAN
 	fi
+
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
deleted file mode 100644
index 2f7f382cf88d..000000000000
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_STANDARD=77
-
-inherit cmake-utils fortran-2
-
-MY_PN=SuperLU
-
-if [[ ${PV} != *9999* ]]; then
-	inherit versionator
-	SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-	SLOT="0/$(get_major_version)"
-	S="${WORKDIR}/SuperLU_${PV}"
-else
-	inherit git-r3
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xiaoyeli/${PN}"
-	SLOT="0/9999"
-	KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-LICENSE="BSD"
-
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-implicits.patch
-	"${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# respect user's CFLAGS
-	sed -i -e 's/O3//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/superlu"
-		-DBUILD_SHARED_LIBS=ON
-		-Denable_blaslib=OFF
-		-Denable_tests=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r DOC/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index e527066b1ec1..6753908584c6 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index 559a385178ee..808c1cea07c0 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -1,3 +1,3 @@
 DIST UFconfig-3.7.1.tar.gz 8523 BLAKE2B fee3520b4c1305c4684ef4d0fd6cbcc27cd6db957b838642241f75cd6de4468fb5dd61282a0c1484318e56c5b06b8354a78eed2e6df6a5d21e4250883ad1c42a SHA512 a9d562205b6d047d8064d6f61e4f9fdb782774637f0522abef6031e8633c7372db108c69b48098e8b41ffdf786ce7bda0d8df9a3dee634dfb11b5e6073996a22
-EBUILD ufconfig-3.7.1.ebuild 1617 BLAKE2B 7b602dea0fc316992f09def335a9b50b45ed4f744ecca1aa8b9f8ba19f47fb73f7b8d747d65a3d477e77612386f8966a5a1f54d74eda17a33a0b9515332410ac SHA512 501a5ceec1187d5b0494aa9bb3ba41099343eefee6b26d43e0a96aa0fae7a773ce0b04a2b46a9e7a8a476f804e0e515426aed22e1effe0a975bf919b006278c7
+EBUILD ufconfig-3.7.1.ebuild 1606 BLAKE2B eaac9f8cfd020906065ad6d7a2c2ea7228aaf0415a00e08b0a600b31595d51fcf43cf2908b7ea935270bd2a5a8d1d62ebf9830e02d519437eadc98af4ce5a700 SHA512 2c15a21b0fb99549d6bbca29cbce19587a492db95713c0101f86312fb8ab1611a7f7f6f68ea962b535a8dc67283889a4dd3e884aeaf68b27f42d6d497057d5fc
 MISC metadata.xml 455 BLAKE2B ef292722ed6835d852c0eec069e85bde94e717df3b834ebced68ae5a0d63fce105b2d6c7beb8aeff495b054ac849017cb3d5c1a47643f2058feef549bba4991e SHA512 e5e8a1c204cb3651501705adcd10789c9a1e093ade44625745f0c40244f6fab7c7774da47d23a7eb0f7aa23adb1074bcc80335385567cd41ffee0c130a14900d
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index a7dd82b21892..f1526e07b0f3 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 82db6241d589..6884c9af823c 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,3 @@
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
-EBUILD umfpack-5.7.9.ebuild 966 BLAKE2B e8736ac2725fdbd95a9b77bdcb40c5222d775049a075196d0160505421db9b170b85348aabe69583ac0ff68a6b42caee4e7a56946e088e472c43b8415940da17 SHA512 7f18ba356f3af2506eff80b5efb3e249c658eaacc4d91d7dc1de4db205b3ca5002dc397361317971ebdf9414d5b246452ed3bf5b68e0e2e1db5e1d8e74af0038
+EBUILD umfpack-5.7.9.ebuild 955 BLAKE2B dbb8e9cc519a5191e824339c5aad31a14c58b777fefb60313789042f20940f25708cb3d18531f1bdbe1b7ee51c64045af127d9efa99b9bfc886098e609a1cb52 SHA512 ef8c7e190eb9590eddfdd8821ef931c54204e7eea96de7fbfd940d0b763eb22b3d5058562fb849080560cef67f1536caa21196aa8b961c60de9146fb4d599a6b
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index 920e65cb2a72..6f99b79f5072 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 6ae9f3353d2b..3a703efc82a6 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -8,14 +8,14 @@ DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539
 DIST votca-tools-1.6.3.tar.gz 109937 BLAKE2B 4cc6a0f061c3455ff326eada36c5b66e31aedbc6aac297db42a128940c17d81dbd41e47c7c9af012ab5b24a7fe9f12575bf3563fd566d62492d1c79f1887db02 SHA512 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349
 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
-EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
-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.3.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 805 BLAKE2B f487636aae7ff3cc5cec8088a898608217fbe74efe80a527d42bc9700601406b2785fa5ace686f7e1655f17fbd72f3b9b0ef13df85767ecbb0a1fe0ac8afca62 SHA512 349c6c7d07592b9d7fcabe871b353b28ad5e62f76fd7812bee5267afb88dad87af3fa3321af533d097d7b3f063b157c2f7e39d269f76d9b9bf282d8506ca2e5f
+EBUILD votca-tools-1.4.1.ebuild 1197 BLAKE2B 70156b894020cf325d33b71ba81f01ca2bcbbf60a37559eb062d12dd936d05302f409f4952181af2d430f78a5aed689d8b8a6e086cdbcbe8e12c6fd8a2bf3d0c SHA512 e00738cea3d711414788605c111ecbf2bbeaeaedd2be785f5b560b9261095166986e1f9ffaf13c85f98c9e93db1b48099d873fba02b68450e90fd9df283d0033
+EBUILD votca-tools-1.4.ebuild 1168 BLAKE2B 2e0df9a069eeefca65036b00a72eece6d3a11be329ce7446a73c9a4b8dc688f949f2ade3d0e27899c653ecea07041df1526a626c107f462a815e0877a6fb4d39 SHA512 e5d3b7e9ef9d4069b246caeffd871375a714230b380a6532ef6512ae80453a8e9e17fb0b58ce14e1e73632226c33b40568b76cc39cf945a401df7d1fe131356c
+EBUILD votca-tools-1.5.1.ebuild 1113 BLAKE2B cf3fa39e10fba3e12e5198172a2aa270a92820df9cb4e4d20033c5aa797cbce59956276e4565082fde9580753f8533fc72cdf73eff2ec6807300dc948c409586 SHA512 981b203f0a130ec03c2ccbc02e547f33c0db7795e9f768b5b741436eaac29c8a14eec6aab01f5573fc088fe5d006040d90e580ef090d229e9dce449b3e3df223
+EBUILD votca-tools-1.5.ebuild 1111 BLAKE2B 7d7a5ffeaf4e422a0470849899f539dd525762b68074c4a2886879e451a5464f53599af1546905a0866d78752bf7286df13d1ed863b6cfbd7c9a6bce784113e0 SHA512 b1b4e1c1646973fb300792809198006ce0b574a13f511594b4710eeb84dc3d8a43b5e8d00ccd4dd6d9c76e7e7ace772aa86fe0a4579a322ddca6da51464a39a1
+EBUILD votca-tools-1.6.1.ebuild 817 BLAKE2B 886d69847684d81e7911f164f64d5f211f076ead9346ecb8d9246fd14c2258164b450c23e8f7ccc65ad81e050213fab954e7abf1f98eae515da66fc79eb6e2df SHA512 a6cd383d0c5daf4fcece67e19daf5af8887bc95651fd3e81c57435102bd6ee169c36c91e0eb15c5a8229f889ee647f7204c839afab9ae0ffef14d10bbc82950e
+EBUILD votca-tools-1.6.2.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
+EBUILD votca-tools-1.6.3.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
+EBUILD votca-tools-1.6.ebuild 813 BLAKE2B ba3aff5691b6f18973e90a3e82b514025270d7f36b4923fb7a9a03f179865be5fcd9d8eb8527072d7610933812376fc74826160245ac19d9200d2e5d907a6e43 SHA512 09980284f2408c9f356ad5ba84ccfa1a89c9199bc01f90b028de1f426acd14f0085493b21ef3eccd9eb74f3bf678501cbf4d681f2da08a5b5be42d427ab6b129
+EBUILD votca-tools-1.6_rc1.ebuild 843 BLAKE2B 4976b22179417bb91f1017914ca0ca15c67622e2f312106ef18c8cf14670e271a18f01e73387906d4ae6cfdcc7247080ecbb4a0ac785c0c137c77d0254f40f83 SHA512 7ebf2cc13b9773d32baf4dd09562ead1a82aa0772c2cf666e54d9dfc135da10d2e2a328d8b94740ff04c86753f8927c64407dccaecd0a3c38d9751631950e018
+EBUILD votca-tools-9999.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
index 182893347bc4..9a65a2be36b0 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.4.ebuild b/sci-libs/votca-tools/votca-tools-1.4.ebuild
index ae9aec9e652e..99c2d85be25c 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
index 62f306992949..f8cf6211bda7 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.5.ebuild b/sci-libs/votca-tools/votca-tools-1.5.ebuild
index c6ba3a67b075..b6739abf4f05 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
index 83b4a6d5bce3..96df685f451f 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
index 4c25081de7a1..a636260d8800 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
index 4c25081de7a1..a636260d8800 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index 3370b1dc94bd..701fb516d9bf 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
index 888d78eb3405..cb4447833be8 100644
--- a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 4c25081de7a1..a636260d8800 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/xdrfile/Manifest b/sci-libs/xdrfile/Manifest
index 319de4844415..d739061b4b03 100644
--- a/sci-libs/xdrfile/Manifest
+++ b/sci-libs/xdrfile/Manifest
@@ -1,5 +1,5 @@
 DIST xdrfile-1.1.1.tar.gz 378942 BLAKE2B 21b1524a7c31e957b28b93dab4b83b88c183528e534864b06ff76e3f31422129c22ac4bc24a054749dd1b5b80d93a82d873cae82571f0b89c16d55ef0de267c7 SHA512 bff06b08e547b956825f9b16a55fe93d07ff0c529426b892fd4b39be538774aa06facffc68994215e22e36edfa5642674653022da0762ca7cd1b7bc654112868
 DIST xdrfile-1.1.4.tar.gz 815342 BLAKE2B 9f2703cdd67dd6cb3156ab96e496dd4fa37d3a60d660da0a6129562ed295bb52ed5d5acb54aab1bd8b682e31f6155e96541dd47fee7226ae058d62f6efe3937a SHA512 70352efcce989172893e34855edd17990c80f3b5f956b2d8b03a5e75593280e981a56b00616adb950a7da5713729029aecb5dd2cd4c52a658a77eca43aa290df
 EBUILD xdrfile-1.1.1.ebuild 597 BLAKE2B 95ee6146aa52f9f1d0b3a0d73bc834ffae55c6f1f779408c105e52d8ec864f6e26de74422fd52a4717491c608519f2043ee733662743b1fee543997a98127475 SHA512 ab0156c4e760395f0320e640e5f452edab209da13abcb496717bfabaa03c86d001e30bdc4e1365eb18ed58dc287199b724635c304a72d5b6763df826dc37dae6
-EBUILD xdrfile-1.1.4.ebuild 558 BLAKE2B caa0d29626c03bf08ad9f2444fb1b8dadd02c6448adcebaa40b1207a4343776a7dbd3d8666e5728dea010013011b94346b8dea006e3c5161dbe40af7dc8a42b5 SHA512 b0df2c8319a07b36acdddc5b141cdd0063c22306b2fca6024ab4f9499636102a317700a04b69b654d51075bfd80b13c8259f481d8ce6d31edd83f634cebb757b
+EBUILD xdrfile-1.1.4.ebuild 557 BLAKE2B cfccc6a0b3a33e481c092446327629c35be98b27cfd66d2dc8b153d17836dc323cf5f58a9905c6f9781ec3a6fe85a26e977406f74fa75ed3fcbf049778730da8 SHA512 3fe38726ad5002a1164e3e10575adba57b94c9b9591f6f690fec9f6bb9e19d5094f5511c5eed8004c4434917ed8bff7b4d880480ce046123bb8a04ae589ad79a
 MISC metadata.xml 373 BLAKE2B f02aa6fee8d485b12b280def0754651f3831474773215f4b20002544e84575dab97ba478adbd6031a9545482576783e854f69e69deb7df27fcdb14e1128587b1 SHA512 e8817074c54b6f66a21bbb69f4c5cc51e28282dd23e10f322b6e676a1859d47fbef3baea4b55d4f343517ae4de9bda3a009ed76b49ebdf898d875f29b13083ac
diff --git a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
index e306c0118cba..71f44e1afdfb 100644
--- a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
+++ b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gromacs.org/pub/contrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="fortran static-libs"
 
 src_configure() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /sci-libs
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)