gentoo resync : 08.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
commit: e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree: 4c5f7db60483518201fef36f8cc0712789a08db2 /sci-libs
parent: 391b5b359a346aff490103da7dddc85047f83830 (diff)
93 files changed, 676 insertions, 1798 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 57699f6d5e33..37056209ff63 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 71ba2dee71ef..94099ef4c73c 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,5 +1,5 @@
 DIST adolc-2.7.2-patches.tar.bz2 6227 BLAKE2B 6ed9ca3c3128233308b6f4a57d839ac668a031a4d48e612b79929541b496dff67e463197c3c5233bda459fba17422827df6c81fba986ea7fe2affbee2cb8cbf0 SHA512 b468753efbde773c5c7d7f0211abee049193d9b64405ae57a4a902a93a4c06e4f205f531aeee9f30d7dddef19243e1a76b77a8e8727d8e36ee3867f5990e2fbb
 DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
-EBUILD adolc-2.7.2.ebuild 1798 BLAKE2B d863139bc0dd8324c222a424c320717359195bf0fe600b2a5ac6b0a2846556133cb3b66778d2fc217a2397afb49b0df3534c60023b4018e6a56b61557a4708ae SHA512 b713039c908874d821da601a63252f12c7721da711d4aacbcf6b7bf6c309f4cbef13a5028deca85b49f10419f4c562ddeb72f0cdf704ce647ba98f45c2d1b384
+EBUILD adolc-2.7.2.ebuild 1797 BLAKE2B 7e255e9eb6e945589b93cce211d9cd7decf193fa20ce38884b76fd82185bf0106a30055b16e8d613e8f5df0f5d5741cc50784191bd02c83dab0a13149a7234d8 SHA512 df2efade5957602f19e770ea1dee3382b6df6ac14d3fa9271bb3ca3772cb4251c18c7e8dd838abcd9870511090ec82602da1229a876fe6b4bff1b903eb6b6b01
 EBUILD adolc-9999.ebuild 1625 BLAKE2B 41ae54bbfb6934c626b15bdfba17604c8f705ad64f078a9e084050fe5e314b0135b640871f6f50ccefabd740077a2458d869a45c084ec5e5855aed1d41b328f8 SHA512 b2c55ed1919d6dae5deca1f5db84e72bfd2c12a8d42583923d50e86bb421e29b805fd889814975134fcb2e5ba0f0ca7377b6ba68300c207702eca9242e9dbb7b
 MISC metadata.xml 737 BLAKE2B 92ed3294a4511473f081d3cf957a0b8538faec13cea3163985387ddc040defff8b908994572aefbd388313454c469388d10a5524c051a548ac001ee402a1a4b8 SHA512 8736523790d05b594a27b4bb679653f3a807de9442754c998a5ce3f0abee0cc4c94e1f31a1a639d9079c7a2574c2440f4e735efa271629bb0f83ac09eacf94b0
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 009ee6a78ed3..ae757ddcbcb5 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index d639267c2704..82d10be32930 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,4 @@
 AUX amd-2.4.6-dash_doc.patch 488 BLAKE2B ed5872a7b0a2dc90bf69a2c74db9dc9379afd54831c87ce4ba577a3d70f2a5f2cdcda1a8ea2b1932974c18a45ab6b8043d0de8217054464881476c2041ca1e29 SHA512 7ac31c0b64b3986c6c6e44babe326c385eacb8a4a5c542ea1e7bf8b566eceb3e70a3d3cdf48a783507c9ecc1b21b53487523838d8f2936e0d2cbae688e30bee2
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6-r1.ebuild 913 BLAKE2B 38f993d136a21c675d4d5881e273a73b09c55d98b43797b268c32e39a1da4017d9172eb1aaaea86c39f5177bfaa27878174a50e32a4ca087207757721ea071e8 SHA512 4ea33ee07f29510747a9481f2c96f97f584f40db9ad2a05087e3485d7089322ea3906989e8436101f16a5a3165b4486b8495fbc67a5865b51797b6071b0c3591
-EBUILD amd-2.4.6.ebuild 793 BLAKE2B f9a25cd98333d370724cc165fffd407b7a05b94751e91ba852dff3df31c5f82b3926fd5ba4eae1a144f28eb6bf1b69837db8ce59ac77cbcbd2396de0c5745a72 SHA512 e305f6c46b7d8bad62dd081099e0b281c66f2c8027132ea092c02a72b8ac838fe6fd6d2d157d472bb405f2ce39dccb75e00b7e154980d570293f6b569e9ac510
+EBUILD amd-2.4.6-r1.ebuild 906 BLAKE2B ef37b6d947f90aa35144b194ca5d7a6379d51d77833cb1339d26ed7637ebc3844322acecb028f7eb09fd483f8089cd9f911875df9846113802bf3a49715b7945 SHA512 a8bd604f4cc96b2192e8201bd47cdfa132ee7ca40639c6ef0b7df01ff55a4cda6f6c3b3fe823cff6c9ae8572a02aadf4de9c2f9d41fda3468d81ab068cd7ee93
 MISC metadata.xml 493 BLAKE2B 791bee04f2535ac8e03bd7f74fc51462b5d0eccc2cf1b382aa41019c59e4cee6e9ebf438678842f2dc50173e2ed346b74a49a942779e1e61346914a7683c9af4 SHA512 a3b82b5d90b1c4a8c09944df1e8b318dfd0002caac0e891e8e3ba79ae604442cf687725c44b3efbdebe44001fa083804aa68605a3c614c9a5825c8bc588d488d
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index abd35c1a71ae..a080f8979ac1 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -12,7 +12,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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
deleted file mode 100644
index 06a5de3d6c83..000000000000
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-inherit fortran-2
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-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"
-IUSE="doc fortran"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable fortran) \
-		$(use_with doc)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 8d0555e5c5c1..f3dee8eea3f4 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,4 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
 EBUILD camd-2.4.6-r1.ebuild 839 BLAKE2B 8d3c096c6b51b4d8b7876e89293eaf21dfb907eac34665b3f8755637556f276752d51f86acd92a4283e7ec94dfe8d528f9a5fa1e736988f265da0b3364232aa8 SHA512 eb5d7db8b9ea7228537a1de51fe09e621114391e8e5a99cb0fd227f1d5c57318808c74f6bb26256163515e7b35732a6575dadbc35aff542a3bafbc056011a3ff
-EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950
 MISC metadata.xml 495 BLAKE2B 2e1538f1c7790483dc922b57bea2ef1732ab16c0a3e1d8bbebd2072c3a22a510b17e18ff5b8ed428e7a182296e27ac4620c183efeaef67ce97ae60227cf3414e SHA512 8330a349ed15588e3455fc47dec441618a721eb25b7692175781a5c3dbe0d0b28b4e9a657cb999f08059face82ddf8ef06766187932110ce0576828ba5d90a36
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
deleted file mode 100644
index 78e606743466..000000000000
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-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"
-IUSE="doc"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with doc)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 1e9fb5a4bda4..8eed4f21e358 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 966 BLAKE2B d38d495c35f37a2a93de88ad45e01a7b3952fc4593b763110922e51a1b4f827ce857c848144527924f32ecc881a6f8d6cffbb8a23f773d076c31641662fdea19 SHA512 2ffffa4c116dce839513ad60980cada1b6b0839bc446edac4af269267d5efdec3d16dc8a89d876b81ad55b149790174b3857c9a90ff782aa6316bb836cccfd6d
+EBUILD colpack-1.0.10.ebuild 965 BLAKE2B 7dfc6414b537ac1bfe14f6d9dd581f7b5cc76e8a55a7f40eae349aebda5ec442bf2b6b3c29635ac8714c77c74528e2cd3009c66d2a4f92caab0cc44cadb6300f SHA512 a2aecae4c439ed7a9aa758760c55b4448616afb44f80f8b2d129db8b6abeb61035e111dfd9d18fcbb7ac304a80cca1c05bced0c2821f96703894817dc947b0f7
 MISC metadata.xml 606 BLAKE2B 6d62ec670ced7058bee94be97ad61fd6e12b6e51e76e1e2e35e8e0928958bb9c77f0d99c3d881b0e63bc4e55a677888813ff7f277da39d891aed8cdb37a8be24 SHA512 cddb0eddbbdbc91ee7e2c39911cdebe572fdf2985131fa0e8dc5705f1722747283b0bcef141e57559a9ad0f5f9629a8bdb76644900bab3d025ee5ca3867549b2
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 357b7485b32f..5bcd1dd7c0ef 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 8c0691057a67..a160556499a5 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -3,7 +3,7 @@ DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a4
 DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.3.0-r1.ebuild 5321 BLAKE2B 0e665c64f381364e1319d2f79c66076c5e5d8c64a0449bf47e265f210553ca379f04e4bffcd1c77b4ff7fb3d0a62560f861e6815c3daa7d285f3c90c0e107d67 SHA512 42fc31b610dd96b26c2b96e35304a4f16e65d5bdedec2a23bd4dd1220c0a6e1c9d940b6e91832dd99bfce2f743339ac4d51bf6aabd2a1c3e60278b77f2596797
-EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B 9184a815e1979ef36752a2596617d17057584b073d6fa9de0c62baba62399271abb059490efe0beb35ac89d05b9960d0213887ab831abf5604fe894c2c2d5d15 SHA512 5823d35c1a2c10fb40ad6a897e517e72e206e79df1f1361461b5ae029d08d1605266a8f5a9aa3484bfc31141cef28d756b0bf7f19d09f91ab90ff3208ef63663
-EBUILD dealii-9999.ebuild 5372 BLAKE2B 629be1d6fe6a18cc64e7733f11ea2af64003c367bc3f272e5c42e2bf0ee499597dec6379fc65f571fbdd3c2d0f2fe1e14759b74a43614787f819fa353e4a10d6 SHA512 e350d34c18c3c100ac2827e1f8c22704a4b42f677b774d5d68193da72b802c8e294849783b6c9a5f1afe51f73308637e3be18b0bd9b3ae8b49a2eeda35e1335b
+EBUILD dealii-9.3.0-r1.ebuild 5321 BLAKE2B eca44c7fcfd31077a67291a6f295d2416a82c8176950d14cc975edbe9ff64fb55d8eb0697d30f774e34b4d5a8d259408d775f153b0c5c284373f286a5e50137d SHA512 e1b1a0e3acbf3502dd1cd8c1cb72ea35ce75ec63cf6efdabbe260cdedf9605d5a12dcee9a88c5c203369604438f09d7beaf73b89edb562ea5441ef2f8bd6b1bb
+EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B b66f4d31cd9e8b659839659eb25479e149c08b107ec05fd2ba1eab27c3ada02e0a57b50b3ee6bbb8f98c38cf3a702c39696ffcc6b29c51d33d0e39c97c1d3edb SHA512 73c7b9bd5115ff36121f159ab04f3ab58945fd89d77bc1292430e97849ce5587e2424545f3d08f2f66d2cad8c387a5ef629761f57c3b719e50abf68044d3d8e1
+EBUILD dealii-9999.ebuild 5372 BLAKE2B 10d4601b948476fca4070ac7d209a882726310e2327e125c8f1ec8b3fa032c0e9bc450d04c7a280bece4b39fab2d9fed720425af8f256f09320f719cdafabfd0 SHA512 c7b270207385c998ce82c6fea458c07ec933e9c29e11de2dceb92be6b2953fd39e59ae23e413300969bf5dc6a0f9f91a4eb0eb3de6918f976daa266c38d653c3
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
index 65d0d5b7a333..81010cd4fd98 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit cmake multilib
-
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
+inherit cmake multilib
+
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
 
diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1.ebuild
index 3b4964437572..7e56f6af0e23 100644
--- a/sci-libs/dealii/dealii-9.3.1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit cmake multilib
-
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
+inherit cmake multilib
+
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
 
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index fe9accb88f89..9688a1d91718 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit cmake multilib
-
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
+inherit cmake multilib
+
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
 
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 8afd69708ee4..53a5a7909dcc 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -1,7 +1,7 @@
 AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f38f918c1f2a72a36710bea5ebe1a3c3c77362d8585d8167a8ef8a68d246f4e37063f4a3ddec5939e129f4d1ee SHA512 e7de40d8ecf5447921fd5f9c21a0a44f58c7351457d029d9848514e032e495a13da2f282c6c3d05f00fd85c1af8d0799db64c786b1a0286ab03dc7c2148dd23c
 AUX djbfft-0.76-headers.patch 627 BLAKE2B 297b8211ec302d127501d5bcdd27f6c08b04cf9bc77938d4dd8e2d215d0a856836d4e2960676b77fe05fe64d0ce3a667cec198aeb6ef56aaecfa88ed59e0453e SHA512 c3ba289a6f0c316db55f42784749c02d41b94fa7cbe8e306eb2e982cac5e2c0a8d90456ea0992fce2a99f54ca63b21123b52c7decc9049005cb9f571b4e2271e
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
+AUX djbfft-0.76-tc-directly.patch 654 BLAKE2B 1e564386a6601e2459b0a9c06ccb35c2d13ce64e979badce90bc34cc0a5dcee531691e8bd73bfcdac50884a5f8d2b40b21d61b81f666cc383463fe6575a2a2c6 SHA512 52a37e7c8afc04fd2e3557caff78f9df985ce57dcc9c28e9741e8d8fefe0ce5e57cb731d3f48f52a83c57315ba656cc4e9cd13eabf659b341a5a0206dbc63918
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1796 BLAKE2B 7da42e19ec9df3deb3379b9a2a7c086ace410eb0e705808249eadb6fe23fdae6fcc0c9c1f61b3c12ecc2cd098e15f7b45d1cb6e9207bfa7a3fb8fb72af6cf716 SHA512 b8d642c003a3f1dc6007ad6e4448b79b12e096c8716403642d6c594ef7cd93a9049ea6c5f9d26f673e6a487e6e7a16f896b2777d14edc3166e4ab7a31a2b1646
-EBUILD djbfft-0.76-r3.ebuild 1798 BLAKE2B 4a4670cc0720fbcab8a2d6eeb4080c51030e120b4207708792a8439d5750a29c9f30a3545c8152b36b4a2ca29145945714a592af57dfaa449fe6dd1bdb15ba24 SHA512 d663489b64e4d86051f408a3ccc979e016ce79b8bee1d80d4804226d807d59dc2cd68aa7ae3c700ec0870e687734ea982956f158968036b07627715a4a41b155
+EBUILD djbfft-0.76-r3.ebuild 1850 BLAKE2B d25320e4c06973c03f38d51389da51667c1069f9ecfb9bb262bbb02b1bdbf85c112cd6bfab326d28f106b03af4f0a24ae50a0f82facbc9e5462f97709f4f56f8 SHA512 ca8b97ae9a9c7e37bce10d89bd9696f33c9a8e1cda9494bae0c3c56e5ab0038104410dde57a1f13089b33ad0ebc386553ee1ee411c816c57f8138e66a9a75fd3
 MISC metadata.xml 841 BLAKE2B b9f05655100626962240f98de3ac56c04f5d7ce5b39e7d7fb22e5eef30af63159c2442ba1e21b86b68e829fa094cc7d0afd444fd01f3e9a9bbaa4130fa95250c SHA512 f40530a4793232de9a19f3675fc1f77fcfb8c2a6cc588fbcb2587611c8bd5c92e49181ce020f48698c01cea4614a6f38abe60673ae3fc1c4392097e5a983b9d9
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
deleted file mode 100644
index b631df7d2c3a..000000000000
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Extremely fast library for floating-point convolution"
-HOMEPAGE="http://cr.yp.to/djbfft.html"
-SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DOCS=( CHANGES README TODO VERSION )
-
-src_prepare() {
-	SOVER="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
-	# mask out everything, which is not suggested by the author (RTFM)!
-	ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
-	strip-flags
-
-	SONAME="libdjbfft.so.${SOVER}"
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc3.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-headers.patch
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == x86* ]] && append-cflags -malign-double
-
-	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
-	echo "$(tc-getCC) ${CFLAGS} -fPIC" > "conf-cc"
-	echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld"
-	echo "${ED}usr" > "conf-home"
-	einfo "conf-cc: $(<conf-cc)"
-}
-
-multilib_src_compile() {
-	emake \
-		LIBDJBFFT=${SONAME} \
-		LIBPERMS=0755 \
-		${SONAME}
-	echo "the compile function was:"
-	cat ./compile
-	echo "the conf-ld function was:"
-	cat ./conf-ld
-}
-
-multilib_src_test() {
-	local t
-	for t in accuracy accuracy2 speed; do
-		emake ${t}
-		einfo "Testing ${t}"
-		LD_LIBRARY_PATH=. ./${t} > ${t}.out || die "test ${t} failed"
-	done
-}
-
-multilib_src_install() {
-	emake LIBDJBFFT=${SONAME} install
-	./install || die "install failed"
-	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so
-	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so.${SOVER%%.*}
-}
diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
index 87ed3a30bcda..eee460123e69 100644
--- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
@@ -11,12 +11,13 @@ SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc3.patch
 	"${FILESDIR}"/${P}-shared.patch
 	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-tc-directly.patch
 )
 
 DOCS=( CHANGES README TODO VERSION )
@@ -35,6 +36,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	tc-export AR RANLIB
 	[[ ${ABI} == x86* ]] && append-cflags -malign-double
 
 	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
diff --git a/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
new file mode 100644
index 000000000000..340d3b7be6a6
--- /dev/null
+++ b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
@@ -0,0 +1,22 @@
+# https://bugs.gentoo.org/731874
+# https://bugs.gentoo.org/725432
+--- a/Makefile
++++ b/Makefile
+@@ -736,7 +736,7 @@ warn-auto.sh systype
+ 	echo 'rm -f "$$main"'; \
+ 	echo 'if [ "$${main##*.}" = "a" ]'; \
+ 	echo 'then'; \
+-	echo '  ar cr "$$main" $${1+"$$@"}'; \
++	echo '  $(AR) cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -745,7 +745,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo '  ranlib "$$main"' ;; \
++	*) echo '  $(RANLIB) "$$main"' ;; \
+ 	esac; \
+ 	echo 'else'; \
+ 	echo '  exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 53ded1b7b348..5cff134ac254 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,6 +3,7 @@ AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d
 AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee575b02a6f13bd18dc062037e8f63848763fcb9a065c83d26ed510e341ee5ac9315d9b4c78ca3bb3a76f0098539 SHA512 da49eb9b42cd298b870afce6312e46ea81a41ffea7598b4cae579c846301b0179a7236ee6677fa7a2ff3c2da28eeb519d634667de973cf001f3ea8a08d4cebad
 AUX gdal-3.3.0-configure-geos-disable.patch 6509 BLAKE2B 1a22658e0f0bb83dc409c82d9b25dc8d6ae5ee7c5551c500ede654884071c48862c0392ef2b129c40546fed1af9ba7cb756a0fa4e05709481a851be8d87d2df1 SHA512 5da36ea9ced5826ddc748141ad098c2c2151a9ea68c561105eb41530c76cf6a9094a4683310949931cfac58c91511f6219240d7c18f0348e1e0841683c384c55
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
+AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
 DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
 DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec SHA512 985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
@@ -14,5 +15,5 @@ EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
 EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B 652fd54f5831da35e2c1c72e2a4f426aa35e3f0ff229c86206f3b46837819c58906bb9430505ce43ef84bdd9574ce8ae51f8c17e03eb0608bc4777fd8dce5996 SHA512 50d16549833be758b5e25bb689ed9f4d45d52dbf8b581fd323f2c50f0e228552e8fffdc6440c9b78102cc567e448f2a63c60a56a706737e3b2b8ac2039fd9a90
-EBUILD gdal-3.3.2.ebuild 7647 BLAKE2B 00602160f8a545b48e2ef3b3b133ca9e45a30548ad08f2d4d8024ea6cfdceb88fe930bd13066650a6db6740472dc97acc31864a87647a21ca46e8a15d3de9097 SHA512 0c26ebc878673394b981412ef95b3676ee0d7575691967ad73788bd64f5dfdf731f229320a42d72ee06ee433cef6ae908f88e9b7088f3a9753fdfd75a51a5825
+EBUILD gdal-3.3.2.ebuild 7689 BLAKE2B 84fd125cdf4a06cded33ec93147816e0a5aebc2a85a84f7a4c577d1e9a501475fe5a78fd0f5ed212907bf751b7f479f8073a277a5ab4746886a5e3dea87d986d SHA512 298ccb2e24c1823d692f0f03c30e5856f62246bec9c22a70547a53e3a14f337066489c7e8b9ad89f084c2503cdc8905638b9e166012ee74dc24091bf46211208
 MISC metadata.xml 1496 BLAKE2B c1a8afb6d3d7d4626fd7dad8e35f2628187b68aa2e4948515fd3f2a4e6e4f230a7476bb95b62dfce6f2e1897b77a1045c0eaf441d12d5f1056d5d7ad180e6f58 SHA512 f57bc301b23541e356b7c2336779e654e76b12bc727bb17051c392823d794d7bca028d8a330f55b779a011e8161cccdf96b041b7970b51d5dcdd541518b4a966
diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
new file mode 100644
index 000000000000..a727d21dab64
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
@@ -0,0 +1,32 @@
+From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sun, 26 Sep 2021 22:49:52 +0200
+Subject: [PATCH] Fix build against Poppler master
+
+---
+ frmts/pdf/pdfdataset.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 9c4c28a6572..50a8154c756 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+   if (bUseLib.test(PDFLIB_POPPLER))
+   {
+-    GooString* poMetadata = poCatalogPoppler->readMetadata();
++    auto poMetadata = poCatalogPoppler->readMetadata();
+     if (poMetadata)
+     {
+ #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+             const char * const apszMDList[2] = { pszContent, nullptr };
+             poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
+         }
++#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
+         delete poMetadata;
++#endif
+     }
+ 
+     /* Read Info object */
diff --git a/sci-libs/gdal/gdal-3.3.2.ebuild b/sci-libs/gdal/gdal-3.3.2.ebuild
index 5a7c010cdbfd..216917c266d1 100644
--- a/sci-libs/gdal/gdal-3.3.2.ebuild
+++ b/sci-libs/gdal/gdal-3.3.2.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+	"${FILESDIR}/${P}-poppler-21.10.0.patch"
 )
 
 src_prepare() {
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index 1aa3d4e4bd47..7f2a0cbb134a 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,7 +1,3 @@
-AUX ginkgo-1.1.1-set_soname.patch 673 BLAKE2B 740cebca34c0eb3472bb5c5b1cd3908701df0acd5b3683d87ed67722912860a3ce298bef181e7bd26defa162ae9374e87cccb0ca5d0df7b1ed296e6bc61b7122 SHA512 294b6855239ffb9bc311cdfbdf49956dba10ec47b6e0d3a48bf3a8e002720bb58d9a03ae5ce68c85552e789818f26913ca3a9d3307c5e68dc86db3a5f1d703d5
-DIST ginkgo-1.1.1.tar.gz 11787690 BLAKE2B 75c2c9b2d1e9ba00e3b0a20859af621cdf4aefe7c6e5ec9c7fc34a5368e5bee70d7d2b86ed9b2d9075ab7cc1a3334434fe20329d780f693be45fd7707cdbe27f SHA512 ab8f2d36453f4e60a4e0a13eddc4a137006c1cc6c9c0db00997dd721dfc06f4401109c5a22ba23a838206cff576d5041d06edaed8823006e69f11e360d1dadce
 DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
-EBUILD ginkgo-1.1.1-r1.ebuild 1242 BLAKE2B 332b436207566c71de18d1163d63b79aeba8b4569d0a599edc337cfe86b7d83fa08abd7911b2877a1f7144ed1d78b4af59f17c15148fc0473e0b23b47cdd62ad SHA512 b63ee20c448e38059382e395702519e72384740a77dcafbb7a85611401edb142622c5aced2e901fa6d856c60611591efe9f834b50b24d6f80bfc7177be631ede
-EBUILD ginkgo-1.4.0.ebuild 1185 BLAKE2B f5c466f11bfcc4f52f29274b024ba313aea99e556deb7c92a5398f668217972c0a353d0d4735adfdb1285a768063525101401a91ac2db8fc03208e522b3c66c6 SHA512 eea6263bc2184ef16b896f193139df4883f8bea397afb6ce23bed4b99636df2046e48f1e6bd9bed7f089b8c908eaa5932fb4f07deecc89a879345c4d8909cfbc
-EBUILD ginkgo-9999.ebuild 1242 BLAKE2B 332b436207566c71de18d1163d63b79aeba8b4569d0a599edc337cfe86b7d83fa08abd7911b2877a1f7144ed1d78b4af59f17c15148fc0473e0b23b47cdd62ad SHA512 b63ee20c448e38059382e395702519e72384740a77dcafbb7a85611401edb142622c5aced2e901fa6d856c60611591efe9f834b50b24d6f80bfc7177be631ede
+EBUILD ginkgo-1.4.0-r1.ebuild 1152 BLAKE2B b2c9edd8c6d5dbd8739551ef759d23a67ece68dbf254cbe47480a25623beed6b3f7a7789a3f36793d2abb2638cb2a60c27e4290598e2c8769990d68631230172 SHA512 dd0c93e1abc6370f123e53a94cd5d7d69c85fecd1e38bba8faff7830e57b952f6deaebe7a353628cbd136eb7419d7c14d92abbf378a9d4856df67345a6d11b27
 MISC metadata.xml 810 BLAKE2B cbd39cc2d575e746113ca67913c0fa1ec128e977dc4eac25919a7e695ba8fd1ea45c053d5465a4623fb42a773b668ac0b88af84c5482e642f376e87f400fc02e SHA512 60fc9ae98d8b15ecb6f94d3abadc99e7687877a4f4947bf4c0774d42d5f7a6e4d75518f24cb7ad20ff0e81788dfda5085173cd558df717309ca5830ddb7bd382
diff --git a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
deleted file mode 100644
index 9feceee00f7b..000000000000
--- a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 8a8ad04..03c6db6 100644
---- a/cmake/build_helpers.cmake
-+++ b/cmake/build_helpers.cmake
-@@ -17,6 +17,9 @@ function(ginkgo_compile_features name)
-     if(GINKGO_WITH_IWYU AND GINKGO_IWYU_PATH)
-         set_property(TARGET "${name}" PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${GINKGO_IWYU_PATH})
-     endif()
-+    # Set an appropriate SONAME
-+    set_property(TARGET "${name}" PROPERTY
-+        SOVERSION "${Ginkgo_VERSION}")
-     if(GINKGO_CHANGED_SHARED_LIBRARY)
-         # Put all shared libraries and corresponding imported libraries into the specified path
-         set_property(TARGET "${name}" PROPERTY
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
deleted file mode 100644
index 6d9b7f42768c..000000000000
--- a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Numerical linear algebra software package"
-HOMEPAGE="https://ginkgo-project.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-IUSE="+openmp cuda"
-
-RDEPEND="
-	cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-set_soname.patch
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
-		-e "s#\"lib/#\"$(get_libdir)/#g" \
-		cmake/install_helpers.cmake || die "sed failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DGINKGO_DEVEL_TOOLS=OFF
-		-DGINKGO_BUILD_TESTS=OFF
-		-DGINKGO_BUILD_BENCHMARKS=OFF
-		-DGINKGO_BUILD_REFERENCE=ON
-		-DGINKGO_BUILD_OMP="$(usex openmp)"
-		-DGINKGO_BUILD_CUDA="$(usex cuda)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/ginkgo/ginkgo-1.4.0.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
index 56b629f829fc..84dae4aa427a 100644
--- a/sci-libs/ginkgo/ginkgo-1.4.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Numerical linear algebra software package"
 HOMEPAGE="https://ginkgo-project.github.io/"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
-	SRC_URI=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,7 +21,8 @@ SLOT="0"
 IUSE="+openmp cuda"
 
 RDEPEND="
-	cuda? ( dev-util/nvidia-cuda-sdk )"
+	cuda? ( dev-util/nvidia-cuda-sdk )
+"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
@@ -38,7 +38,7 @@ src_prepare() {
 		-e "s#\"lib/#\"$(get_libdir)/#g" \
 		cmake/install_helpers.cmake || die "sed failed"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,8 +48,8 @@ src_configure() {
 		-DGINKGO_BUILD_TESTS=OFF
 		-DGINKGO_BUILD_BENCHMARKS=OFF
 		-DGINKGO_BUILD_REFERENCE=ON
-		-DGINKGO_BUILD_OMP="$(usex openmp)"
-		-DGINKGO_BUILD_CUDA="$(usex cuda)"
+		-DGINKGO_BUILD_OMP=$(usex openmp)
+		-DGINKGO_BUILD_CUDA=$(usex cuda)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/ginkgo/ginkgo-9999.ebuild b/sci-libs/ginkgo/ginkgo-9999.ebuild
deleted file mode 100644
index 6d9b7f42768c..000000000000
--- a/sci-libs/ginkgo/ginkgo-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Numerical linear algebra software package"
-HOMEPAGE="https://ginkgo-project.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-IUSE="+openmp cuda"
-
-RDEPEND="
-	cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-set_soname.patch
-)
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
-		-e "s#\"lib/#\"$(get_libdir)/#g" \
-		cmake/install_helpers.cmake || die "sed failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DGINKGO_DEVEL_TOOLS=OFF
-		-DGINKGO_BUILD_TESTS=OFF
-		-DGINKGO_BUILD_BENCHMARKS=OFF
-		-DGINKGO_BUILD_REFERENCE=ON
-		-DGINKGO_BUILD_OMP="$(usex openmp)"
-		-DGINKGO_BUILD_CUDA="$(usex cuda)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c74989cec2cb..0f4a7f6a7ab2 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -6,5 +6,6 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a
 DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
 EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
+EBUILD hdf5-1.12.1-r1.ebuild 3158 BLAKE2B 7017b7915fe0b3d489ff261ef54ab8e01cf33a0709a7105272607e84b3347ab469605e3629f874e3f96667c1adce0891901213156ad8e4b8169193787d250941 SHA512 33072c3b6efd4c9d83167961e7a038e0c218be8c1ca66d497751b4b3e8b204422d49223092ef4019db8e2c57f6c0f46db72cdc71398163b46136775317ed89d9
 EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9
-MISC metadata.xml 764 BLAKE2B a3941269717b30a23dd89de26068813dac6d6bd9cf3f5d30a22f4f44bae0eaccc1188041020af175f8e2bf7104d4b3ae312ba5a3fee4873416af4643681944da SHA512 40336c962e49ef4c306610de02d0622ff92860338787fdc60e43cbdaa318a18e1073d2c0cd9faefa33dd51d90e9c019dce71fb1c4ec27f42217808379f88aab5
+MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..9a0d092cd1fa
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi ros3 szip test threads unsupported zlib"
+
+REQUIRED_USE="
+	!unsupported? (
+		mpi? ( !cxx !threads )
+		threads? ( !cxx !fortran !hl )
+	)"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	ros3? (
+		net-misc/curl
+		dev-libs/openssl:=
+	)
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+	app-doc/doxygen
+	virtual/latex-base
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC="mpicc"
+		use fortran && export FC="mpif90"
+		append-libs -lmpi
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+		-DHDF5_BUILD_EXAMPLES=OFF
+		-DALLOW_UNSUPPORTED=$(usex unsupported)
+		-DBUILD_TESTING=$(usex test)
+		-DHDF5_BUILD_CPP_LIB=$(usex cxx)
+		-DHDF5_BUILD_DOC=$(usex doc)
+		-DHDF5_BUILD_FORTRAN=$(usex fortran)
+		-DHDF5_BUILD_HL_LIB=$(usex hl)
+		-DHDF5_ENABLE_CODESTACK=$(usex debug)
+		-DHDF5_ENABLE_PARALLEL=$(usex mpi)
+		-DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+		-DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+		-DHDF5_ENABLE_THREADSAFE=$(usex threads)
+		-DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+		-DHDF5_ENABLE_ROS3_VFD:BOOL=$(usex ros3)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: generate functioning example runners from their respective
+	# .in files - as of version 1.12.1 upstream only has it implemented
+	# for autoconf.
+	if use examples; then
+		# These are all useless outside the source tree
+		rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+		rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+		dodoc -r examples
+		if use cxx; then
+			docinto c++
+			dodoc -r c++/examples
+		fi
+		if use fortran; then
+			docinto fortran
+			dodoc -r fortran/examples
+		fi
+		if use hl; then
+			docinto hl
+			dodoc -r hl/examples
+			if use cxx; then
+				docinto hl/c++
+				dodoc -r hl/c++/examples
+			fi
+			if use fortran; then
+				docinto hl/fortran
+				dodoc -r hl/fortran/examples
+			fi
+		fi
+	fi
+}
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index ea5ba62b798f..042059bcd497 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -6,13 +6,14 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription>
-  HDF5 is a file format and library for storing scientific data. HDF5
-  was designed and implemented to address the deficiencies of HDF4.x. It
-  has a more powerful and flexible data model, supports files larger
-  than 2 GB, and supports parallel I/O.
-</longdescription>
+    HDF5 is a file format and library for storing scientific data. HDF5
+    was designed and implemented to address the deficiencies of HDF4.x. It
+    has a more powerful and flexible data model, supports files larger
+    than 2 GB, and supports parallel I/O.
+  </longdescription>
   <use>
     <flag name="hl">Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
+    <flag name="ros3">Enable support for read-only S3 access (https://portal.hdfgroup.org/display/HDF5/Configuration+and+Setup+for+HDF5+Read+Only+S3+VFD)</flag>
     <flag name="unsupported">Enable unsupported combinations of configuration options</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index a7ac3683dba8..7c854624e360 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,3 +1,5 @@
 DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075
+DIST htslib-1.13.tar.bz2 4226834 BLAKE2B ae1f64e564f0f7bea80ea9d276b5d5b2b04fa3c8bd58f2c68966225b4324962f34d8a26b74267ab90dc530dfced1b9c01702d25918fd7a7c74e13913f00d5007 SHA512 16a3d61c115b71406bc4411a0c1176909166b52c4f7bb11614e398df4defaec4d09763413053e4d0d5916921c866d20019096d8fed866e77f9f1cafbd1e95b16
 EBUILD htslib-1.10.2.ebuild 1041 BLAKE2B 12d35fa9397f441d9e1ee444abca8c56cf87bf16aa2b82b0d6d0bad6ec27546dccdb4b540eaca322f5208eb7c0a6b9f6de5cfa8762641d73a3f40fd8bee5ea47 SHA512 99c54c20f1f01fc243bc7cb25325265e1d959fdc23a3d2db4c2cef29fb9f74cc423835a25d9f5fa1b5af027413caeb6ee8fff2f517ae2dbe8119b80c504b87d9
+EBUILD htslib-1.13.ebuild 1052 BLAKE2B 1d219220299500bce4aaf8927bde67beba02afda02319527cae8f3aa7ccce131a21c0b27e9eaa0ade634d99d910915108abd48385a9686a95795b74733f3c0ce SHA512 3d5bc8e165e27b5a5f1e0d87c7802e65c2de55bc7754cb13d5bcd5f2c211de37ecd81e8ebfa0377158eea196449d9b71858c08372ab73f30614e6e787af47005
 MISC metadata.xml 350 BLAKE2B 6512256a4c692625cb824d90fc8b85942f88db717fd265548b97a5b535158fc65e1f2e74df4ebd3c2a259dfd3a4244a13493fc410b1663b8054b29a14995787d SHA512 926efc676b0619ae901253f2207c8ba948ebe3db560377a55edecd9cd58cd2ec806bcdff875e9c5c9a170921c44818271e8ddd691fe1a84ed651f7aca75265ec
diff --git a/sci-libs/htslib/htslib-1.13.ebuild b/sci-libs/htslib/htslib-1.13.ebuild
new file mode 100644
index 000000000000..cfd9cfb3263e
--- /dev/null
+++ b/sci-libs/htslib/htslib-1.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="C library for high-throughput sequencing data formats"
+HOMEPAGE="http://www.htslib.org/"
+SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 curl +lzma"
+
+RDEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	curl? ( net-misc/curl )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# upstream injects LDFLAGS into the .pc file,
+	# which is a big nono for QA
+	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
+		-i htslib.pc.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-gcs \
+		--disable-plugins \
+		--disable-s3 \
+		$(use_enable bzip2 bz2) \
+		$(use_enable curl libcurl) \
+		$(use_enable lzma)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	# doesn't use libtool, can't disable static libraries
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 3cb0f9bea3fe..e6382c657c6b 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -2,5 +2,5 @@ AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee
 DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
 EBUILD indilib-1.9.1-r1.ebuild 1330 BLAKE2B 43a126b0ef9d3ac40f7a2f3098586956d1df58501c5e4b7d67cb5006752f28b8d7c1ce7521ab51c53d47da54da329e44be020b8ba623a691ac67c4395fe2de78 SHA512 33a020e215980d154276b1382d4559fccc5e2e0ffa7a8924fb780c8d674aafbb07186c5fcc92c2a4189fe734a55680fc209278623c3318a161b8a5a46ec2ec55
-EBUILD indilib-1.9.2.ebuild 1274 BLAKE2B e88473c87b95fa6fadcc3d185604acf7671d72eb0a0d48c50ea4b74eb2383af5f482d7538bc92b340864b5ea194a584e0c6de21cce2ac2765d88811076686000 SHA512 f3b3d4f11298dda225de4c332c75bdb051446ce93037d07d01b551585164ae9e1177839b201e1cf45e712f3686836c2ec539c14ad508111c5366149de8d3d912
+EBUILD indilib-1.9.2.ebuild 1274 BLAKE2B b73824eee2af5b668839675a68041e9e3b1b52e188eeb4b3b5bc517d4ccaeb7b8a2847057f553150cd42c7211ecae48fe5fe247734610968de8534958f55f29d SHA512 3886d955a5d500687418adef9812e6af3649d774593ab01a7ae2c6671c51a485b0aafd1383e2a934764544c283ba3a042c1cd78bf04f1253c6b54b5e258583e4
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
index 7bc78575bc2c..c1484d7e649a 100644
--- a/sci-libs/indilib/indilib-1.9.2.ebuild
+++ b/sci-libs/indilib/indilib-1.9.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake udev
 
diff --git a/sci-libs/io_lib/Manifest b/sci-libs/io_lib/Manifest
index a75c26470f90..a3fbf32bf65c 100644
--- a/sci-libs/io_lib/Manifest
+++ b/sci-libs/io_lib/Manifest
@@ -1,5 +1,3 @@
-DIST io_lib-1.14.14.tar.gz 6681583 BLAKE2B 192dbd073ac901c4d6f04a20a674bbbaa6c7bc1eb353c22a99feb3c9540ba82cbeaf3272b674e97199a2aac97f73219086f78c45809d491cc968d320f6cab411 SHA512 ccca26f41d48d6bce42218b1f510a7ff2691da7aa65ab8e83b353cfa1a32b3bb9470e17c3bb9e4f2beea190f719d003ee69e68769eb178859c5826e44ffa83d1
 DIST io_lib-1.14.7.tar.gz 2177248 BLAKE2B 6c1a8133a0f0edd253bf0c475cb206294f95659efc82679034f36d8eb963e4020b953f18c0ccfefa6dad61daffbd054513d36a7bdf0e725b8c5a943d98e0d567 SHA512 c1021f0a0dd284e8abbf9cc1dd11995550cf6621455c873effaab56b573fee053ed9e55879003c735c26c403a0aa34d75be87d337cd515cc912706abe7e08665
-EBUILD io_lib-1.14.14.ebuild 882 BLAKE2B 77654252dd95c4c80e16564051575ffd99270cec42e68a0517b21baca3d81735d6f53cc4261e905151c0ffd9bc988f4733722ef6482c1f3b0f15469d3c975e62 SHA512 6282a25506303a869b6902fa174a4dcf77b8763046c19c3e8dd02b12890a6b61d7e569489c255ea1af0259209a5d1baaf6f3ed8bc335ea77d29ea77db832a295
 EBUILD io_lib-1.14.7.ebuild 805 BLAKE2B 2c4344fdc6ae895c2e8ade9baa31424bd98487b68a683c8cc7a149aa9924499cfc9e5201888c4eb59f6ff7cb8a3f997261304826ca26b1bca76846c86cb6b011 SHA512 dab3698a96a8cab0bcdf13bc5a907615524051dcf0e312128c82d4cb7c6dbc7fb60b0c127d286604d1eb44fcf48f717ffee2fc23c56e1b2e9f36f3f603d7f8f7
 MISC metadata.xml 626 BLAKE2B 7c6395d0341ff60b53880542259d201361cc4f5b2c2a3e303555f2f113ce006086de08971b144a06681d53c9243c708afcf80d7fc6738856a66a543174518b61 SHA512 b668aa5ad13b58a29227ca727a382f19bb4677e3adf83cfeaeab31972942c8020b0e308346cd643b81fbc48e11e2d39c21d02ba740df3aedbd72c53e7d898acf
diff --git a/sci-libs/io_lib/io_lib-1.14.14.ebuild b/sci-libs/io_lib/io_lib-1.14.14.ebuild
deleted file mode 100644
index d6d07fabe007..000000000000
--- a/sci-libs/io_lib/io_lib-1.14.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="General purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/ https://github.com/jkbonfield/io_lib"
-SRC_URI="https://github.com/jkbonfield/${PN}/releases/download/${PN}-${PV//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	net-misc/curl:=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-# tests fails and might need sci-biology/staden from
-# the science overlay
-RESTRICT="test"
-
-src_configure() {
-	econf $(use static-libs static)
-}
-
-src_install() {
-	default
-	dodoc docs/{Hash_File_Format,ZTR_format}
-
-	if ! use static-libs; then
-		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 7c33eaddabe2..55424257a78c 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,4 @@
 AUX klu-1.3.9-dash_doc.patch 931 BLAKE2B ebd1f339401151fcfe4ab05a23d8818ac288567c8baa4a2e0428399d03f5bf75001dba373fdd820bd3f6d69d45e42d1a36e347a27ed34e7077b7e0231a21f15d SHA512 31f859dd56d429d2399fb7b2065dcd9630e4b30bb84d6f24ba63b5a10d3f1c608b3b6dd148eeb463ea08e09025d5784a8534ae4624654ed332e89856a6d8c8fd
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
-EBUILD klu-1.3.9-r2.ebuild 836 BLAKE2B 120112badf63f7d7312f0b997db35fbd81ca950415b5947c233edb9870400185bfdc0cebeb73f6c84c5bceca750cf93068ad0cb965e3623663f1bea69ef8ac2a SHA512 a649d6c26d498edce6a155ddc81587bf0776f62583b96d9a7f445b9abac4228c2127d2e752dff22e7a2278700a7d1d04b0755f3873374741b25f9ac01c2871c8
-EBUILD klu-1.3.9.ebuild 652 BLAKE2B d1de231723de826b04a2251f37813f28ca7cf7c545149c8c345b02563f884cb086ada7462ee9d5390dc1afe00769fcf377478c3aaa1fc7abaf90982b59650f93 SHA512 8146668bcc64b4bc8b854d44c1ef5c97661ba32a226225503650c7f1aea9479ed73f152dbf008a377b7d98dd187d121d2c5622ea7ce4cd9ab2543b63ff547333
+EBUILD klu-1.3.9-r2.ebuild 831 BLAKE2B 56d7ea60503c349d235c190b2bc7b5af1e3b23aaad6da138a24d3e137433bfb077500ddfe0342e456b521aa6aedfab5a6f72a4951f07226920c123d54b3ade01 SHA512 e2114403e1f6f95f94ddec34e2220a861e2c8d9b3cbada14498e6b46468081b7e84a28806a61234f4f410b4e3d94f0386051cfa4dc3f28a6004a98cca94945f9
 MISC metadata.xml 461 BLAKE2B 12b2781a0636a67e56330afdaf8a736c490cfa388f786af46eab161523822884f272e829d88105da5220d05f2b37a0da955b20857896420e59fe0decd3fabb16 SHA512 9a12022b1e6205984851551be463f1f499f3c52e1fe008a820693434e26eea243b7ab56252bd0aaea0d748a8eba990fe0f6ad13c405266d09543df57e6f18c1e
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index 3851e767c375..0ddfd86bcec6 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
deleted file mode 100644
index 174e4f282fc4..000000000000
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sparse LU factorization for circuit simulation"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-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"
-IUSE="doc static-libs"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-DEPEND="
-	>=sci-libs/amd-2.4
-	>=sci-libs/btf-1.2
-	>=sci-libs/colamd-2.9"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with doc)
-}
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 224e5b942cff..badd7f4e097d 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,5 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
+DIST libcerf-v1.17.tar.gz 76610 BLAKE2B 94310a8378b9272ecf39c29420eaec98716e4be71717515cebc37d9b101a1a6e4b1d673ccfb70ba55e4cd34bead21b39252738ccf8767dcb376205ac5edf12d3 SHA512 cfa9f56f69a7f030f256610f2bfcbf1b48e979af379e23aedb19df33421c488f91e5757df9a37083060b96093854e1a07175aa2d1b75ee9711f9089b61241688
+EBUILD libcerf-1.17.ebuild 539 BLAKE2B 9df717b5c7dd6fc11cb2c53b105787b2ebf9a4e9f680df84f809a8a61308321e53706052db376044d7eeef0b3a76a1e02b50b53b16f19a56464d41a050eeef6a SHA512 2436f5fbd67023d679c34e467623af6bff6ca4f1b17fd0ae122b3820fc1dd0935477b53e332b28cb6d23aff2099e9d1a709484fe1286fe42dd2101282b6f1bfc
 EBUILD libcerf-1.5.ebuild 807 BLAKE2B d400f8e36e9d0d147138d6e86185fe6ee6af76474712e96cc6cfaaf8362173e1f457250d0f5205d8c9a5ba5294cfb81130ab56ae51bc72d7f1c7065b10258ba7 SHA512 c45542dc5f1b2e7bb0a31c138e64545846bbecc9fa715ca3fc5df99c320d16319f80fa558f0dd51d3a3284b97f17b46e15022347654d0b3eec42872deea8931b
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/libcerf/libcerf-1.17.ebuild b/sci-libs/libcerf/libcerf-1.17.ebuild
new file mode 100644
index 000000000000..b2fc188fd3bd
--- /dev/null
+++ b/sci-libs/libcerf/libcerf-1.17.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
+HOMEPAGE="https://jugit.fz-juelich.de/mlz/libcerf"
+SRC_URI="https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 3dfea25dfdef..42716af35f6e 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,4 +1,7 @@
 DIST components-1.1.1.cif.gz 80378687 BLAKE2B 0776d79f733762ad19177bc93a5587e90966a7862f84174ede23a5875ae4633b519168b24b1c02d7afb30f9049d48434921a70c097a7e8238a5745f1676dcc78 SHA512 fc68513b37871677beb60855e82ed5831e10b08340697a97bbc7113d4c898b8e8382d097d36793346e34b97f0b5def5312fe7eb81ab4f120ad3908ee8d6d1aa3
+DIST components-2.0.0.cif.gz 80878869 BLAKE2B 183c1227f403466fa543575243176d84e72bf224a70500876c77a52f0c8e1af80e99ed8cd8b428c7adc822e7006501a0cfc414e60a2896b1f53b98a116e3e4d8 SHA512 b1212155b8d6c593593013b1b39b9c711e85c1bf9b68d412dda25720ab94d82ace4445f47f832a66901d0ed5773e2d2cc5dde7a9170b9294c506edd6843d6d66
 DIST libcifpp-1.1.1.tar.gz 978553 BLAKE2B 750cf80bac769a3db86b3be03924402da0254e69206a15222a5dfaa23a7eadcac1f57eb054f2fc783c287bfed86dab0a75d2994b031cc3cd3c2431a26e250d17 SHA512 e74419dada21ea12423c404c34eeb0b410fdb0b26827cd4451375329668909879b6d4795451c6f7c2b2ffc8d282dfcff2f1800630a3487111404335be4cb338f
+DIST libcifpp-2.0.0.tar.gz 996947 BLAKE2B 58568f18b17d79d8f3e2487035b505d814e0343bb56a2b18665651a3788b54d5330309c3c27b6f4636ab5e9bf3f85ebdb1a4fc8ed67adc7941559c481135f873 SHA512 8ca3f0445dad758f7fd63a0039fbe3267420d2b51036cd67a38d925b498c8ac580b86a9900317c63b4705a4a9fc9c3ef1036d40fd3f20f8eff2d6e6e5da7b735
 EBUILD libcifpp-1.1.1.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
+EBUILD libcifpp-2.0.0.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-2.0.0.ebuild b/sci-libs/libcifpp/libcifpp-2.0.0.ebuild
new file mode 100644
index 000000000000..1f190d58f576
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	mkdir data || die
+	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DUSE_RSRC=OFF
+		-DCIFPP_BUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 92b383e77ae5..10e8a56b75d3 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -2,6 +2,5 @@ AUX libint-1.1.6-as-needed.patch 1982 BLAKE2B ee6fdcd80c2ba8e9b40b3a25aecdd3dced
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274
-EBUILD libint-2.6.0-r3.ebuild 1422 BLAKE2B 5a95126604bd6e1e9f7b697fd542a0ee74a24b539d5ec367d2fcb833ec70481305869cbc18e6bdcb23692f5fe39467cf53d5264353ae854530cda4cda3de98c5 SHA512 0b2e7980ed09840a83659640df1ad32803d3975e419926958d5d75eb0fb8e7d2ca207093727b68b89419065c51c1c46dff268d833e897c1d5a4c827c90fc1c31
 EBUILD libint-2.6.0-r5.ebuild 1597 BLAKE2B b5ba23f8101470e970a1a65bf7c70650c3144520ac798d9c41286b1e97cb296519af05d312cde7f015b4164997921db78e94c869b51a8700016be2e2281894f9 SHA512 f4409edfa07a47c1c629b2a48bd3adf9c280e634a5d6d995d40f8be0007730ec70a6e7fb39cfde6ed019a96c1240fa9fc5c75107487006bd3fa23ca1cf215264
 MISC metadata.xml 613 BLAKE2B 2d3fa8ad3cbebeb97e102269072553b7c967045efdb9bd6e09556861f33dc84bc1afbc6c4b7e78c829c64856beb091697d6f1a75d16d2f6f58d17331ffb94f77 SHA512 258bb0fdb9ee4f150345b6bf324ec005894dbe08698ba4391252b462d3affc2947106212dff6155faa6e4a3c06efa7b62a56f40b8a7765eafbdeb273241904d4
diff --git a/sci-libs/libint/libint-2.6.0-r3.ebuild b/sci-libs/libint/libint-2.6.0-r3.ebuild
deleted file mode 100644
index cf8dc7472d94..000000000000
--- a/sci-libs/libint/libint-2.6.0-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fortran-2 toolchain-funcs
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="https://github.com/evaleev/libint"
-SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs doc"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/gmp[cxx(+)]
-	doc? (
-		dev-texlive/texlive-latex
-		dev-tex/latex2html
-	)"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-cxx=$(tc-getCXX) \
-		--with-cxx-optflags="${CXXFLAGS}" \
-		--with-cxxgen-optflags="${CXXFLAGS}" \
-		--with-cxxdepend=$(tc-getCXX) \
-		--with-ranlib=$(tc-getRANLIB) \
-		--with-ar=$(tc-getAR) \
-		--with-ld=$(tc-getLD) \
-		--enable-eri=2 --enable-eri3=2 --enable-eri2=2 \
-		--with-eri-max-am=7,5,4 --with-eri-opt-am=3 \
-		--with-eri3-max-am=7 --with-eri2-max-am=7 \
-		--with-g12-max-am=5 --with-g12-opt-am=3 \
-		--with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \
-		--enable-contracted-ints \
-		--enable-shared
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-
-	use doc && emake html pdf
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		DOCS=( doc/progman/progman.pdf )
-		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 98118ce93705..00d5f25ab385 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -4,8 +4,6 @@ AUX liborigin-3.0.0-no-exit-calls.patch 2452 BLAKE2B d635890d02f2605d52b869e0952
 AUX liborigin-3.0.0-no-standard-streams.patch 7649 BLAKE2B 2f9c933d2d6ee65477ac0e23ad317d3b569bfe4eb37876c954501b93cf17be67cd1f3070724762a30c9bc1f9687880a5f5da8513e3cce4e2ae365ec1401c9123 SHA512 31f64c5a9c7156d19f2109be2768e4bae24b0547416da372b4c7dac24fbe6a026c3767372f778823f053af1bd4a2b85160457ebb101f06c22e2add4e15bb1d04
 AUX liborigin-3.0.1-buildsystem.patch 1479 BLAKE2B 3a199d9c15031a692ce6c1148e13db0fae713105e872fad3da1354263869d4363362e37ce40e0b62f635c2d2ec51514dcff0f02acc1484ffaf07a741d73bb2e6 SHA512 f9e6c3fabf45b422482349fc113a7e86846ef78550b91779dd5108b7dd04a8b0cad3aab7f24b6cee209a4c540ed2cac5e676cf01586056d1fa20965e98e054c9
 AUX liborigin-3.0.1-missing-header.patch 624 BLAKE2B 22444e21cfd17a7e32531cad8715cb7de9fbc7ead88de560ffdd62da9321e3666d1107da07cd0cf2aea6799241a34a3b8b567de577ba6120c60f0dc9b0eb021f SHA512 598988e0da6bc26dd845b86ca5251f5f88221f74b68487e500afa91979340807cd278e8365d5039d9720c56ee37f3e65305328bfa8346689dad5c338e0004120
-DIST liborigin-3.0.0.tar.gz 156736 BLAKE2B 1c1fda3fc3ad47394b65637a808eca1ecf4cff19eb49de0811e50d395c3b7759f8ec19c680ed83f7a8191022aa17b4ba1211baa6ea16a48a5153736d9138ed5c SHA512 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c
 DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
-EBUILD liborigin-3.0.0.ebuild 1205 BLAKE2B 798155fe1038866179902f488192429ac9543bbc8504a3939a8e795fea8498f60157626f2b01748b4e0fcf3b843261004da7fba4695de618b3117fb1430ca7ab SHA512 8bf0e3b0801b6381b0fb50cc4923f357e88c8103f4003aa22c926f38a5c3abf37ecd366fbc1cf9001c45f96a140268dca438903b4bba822eb4e5c17e398ada34
 EBUILD liborigin-3.0.1.ebuild 1174 BLAKE2B 12d27c9ef6740b63b7ad115d3c3cbc685fbc208987eb127f45195543618cd3c26d903c73fd1d2f6600e4304b8f71a27314a1b6927cabb64af7433518f8c3298b SHA512 dfc54d056c43d4b8c5c7be4f1c26a59c6b7890ed44da3d154af4d3e4ea9c59704c74d905e8f4a7f95fd04c461f1e3bae00de5e220b1503f2dc02d147c2cddc0c
 MISC metadata.xml 468 BLAKE2B 22310aca9009a66cdbb320d062e2658beeaa39de6d5b09070e48a7eb03848df03dea83e254c78fb60f1dd067b66f2f6d8085253172cc8e70617e68f88bfaf0ca SHA512 7cee5f9738b23031f760e9090bf6368f06070b7600f1ffdd829e987ad862b03d2147045b26550933583ea797825d1ac5674bd1e4426fc734e16c7251cc27f397
diff --git a/sci-libs/liborigin/liborigin-3.0.0.ebuild b/sci-libs/liborigin/liborigin-3.0.0.ebuild
deleted file mode 100644
index aa4538748af9..000000000000
--- a/sci-libs/liborigin/liborigin-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="https://sourceforge.net/projects/liborigin/"
-SRC_URI="http://downloads.sourceforge.net/liborigin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc tools"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-cpp/tree
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${P}-no-exit-calls.patch"
-	"${FILESDIR}/${P}-no-standard-streams.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-missing-header.patch"
-	# downstream
-	"${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc paths
-)
-
-src_prepare() {
-	cmake_src_prepare
-	rm tree.hh || die "failed to remove bundled tree.hh"
-
-	sed -e "/install.*html/s/liborigin/${PF}/" \
-		-i CMakeLists.txt || die "failed to fix htmldoc install path"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGENERATE_CODE_FOR_LOG=$(usex debug)
-		$(cmake_use_find_package doc Doxygen)
-		-DENABLE_TOOLS=$(usex tools)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 8ed6343aab30..bc35f4bfff34 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,7 +1,5 @@
 AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
 AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
-DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
 DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
-EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 710e0e5791defed993a820b2bc8cc500d6df28b739b726bc4a4181b16892035c3d0e088cbb92284915c131905673acaf0e169ad03928d14f306c9bdc76c18145 SHA512 909838eeb6af0280d4cc7ec27e84c9ffa5c44544bb2a3a5ca9da862e4ace9f40a8b8ecff6131ef7504558ec35ecba3c24be27806bc45088aaee46dd157d13d79
 EBUILD libsvm-3.25.ebuild 2679 BLAKE2B 349a8a77b6c173fcc2eb7301dc4ef11ddb54adf6b68e5206af1053b7ad8288f3b1376bcef2629c7ba6f77eb63d7012512c9b2a17d79f0f361b243f60ef15be18 SHA512 4103e6ac9e303519e30524e6a10ac24545216a94b669bf2da02e96a2b6f1d3f149c3245287ced1789e2b19d5745b02e615faa20f9ace2b5031e20db94b5bd6d7
 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6
diff --git a/sci-libs/libsvm/libsvm-3.24.ebuild b/sci-libs/libsvm/libsvm-3.24.ebuild
deleted file mode 100644
index 64467f9355ad..000000000000
--- a/sci-libs/libsvm/libsvm-3.24.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	java? ( >=virtual/jdk-1.4 )
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	python? ( ${PYTHON_DEPS} )
-	tools? ( sci-visualization/gnuplot )
-"
-
-PATCHES=(
-	"${FILESDIR}/3.11-openmp.patch"
-	"${FILESDIR}/3.14-makefile.patch"
-)
-
-pkg_setup() {
-	if use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not supported by your currently selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-
-		append-cflags -fopenmp
-		append-cxxflags -fopenmp
-		append-cppflags -DOPENMP
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
-		|| die "Failed to fix paths in python files"
-	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
-		|| die "Failed to fix paths for svm-grid"
-	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
-		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			java/Makefile || die "Failed to fix java makefile"
-	fi
-	tc-export CXX CC
-}
-
-src_compile() {
-	default
-	use java && emake -C java
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale
-	dolib.so *.so*
-	doheader svm.h
-
-	DOCS=( README )
-
-	if use tools; then
-		local t
-		for t in tools/*.py; do
-			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
-		done
-
-		mv tools/README{,.tools} || die
-		DOCS+=( tools/README.tools )
-
-		insinto /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/examples
-		doins heart_scale
-		doins -r svm-toy
-	fi
-
-	if use python ; then
-		installation() {
-			touch python/__init__.py || die
-			python_moduleinto libsvm
-			python_domodule python/*.py
-		}
-		python_foreach_impl installation
-
-		mv python/README{,.python} || die
-		DOCS+=( python/README.python )
-	fi
-
-	HTML_DOCS=( FAQ.html )
-	if use java; then
-		java-pkg_dojar java/libsvm.jar
-		HTML_DOCS+=( java/test_applet.html )
-	fi
-
-	einstalldocs
-}
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 83672b6563aa..ba752145338f 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,5 +1,7 @@
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
 DIST libxc-5.1.4.tar.gz 43036222 BLAKE2B 10348ccd2e8e512bf576a03eb19bf714ae4f0e590ae3a7266ae8f46c42ee12ef91e049f0007ce42023e7f13c865fedef6d1ab0fb76195ca47f62a50702741c49 SHA512 ef7f44e773a0a8a9c1a53ddd12301e123f9a4606f22420cf011d579314c1bf3164b82299aca0ef32cb130b380e5e9534d4fcc658c549ac4cb8b6f86d025cfe1e
+DIST libxc-5.1.6.tar.gz 45121466 BLAKE2B 393c85b49b1cc515abd4767a01cc56958585aac74d9913f60c304f102e76c0f3903dab326779ea7e466c19389309b2bcf49a4e0833d8f869a185b6143e1ecf29 SHA512 7e65753ca93c2174e3644f519651c59305b2fc4919de99ca2278c42a359641ced73b5c661c5315fe73b55a69ac4b7568ab1be754fc06b40bdf790881ba3ed2cb
 EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13
-EBUILD libxc-5.1.4.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
+EBUILD libxc-5.1.4.ebuild 753 BLAKE2B af1a4fe2041accdb77040a1eb8051bfb0142a214c53bdd8268d7b3bb4a5812e54b32bfeb97f9231159ee5ffcef874e940a7c4a804c7a3c79d82054cc8843d3c2 SHA512 daca4b601869aeb62ac6304cc015a3f53f0c59ad6add0c29a46be4c68422a407860a18b86cb35d5007b21fa683cf9e32a7f6306bcc2f9bc0893cf965dfad9c44
+EBUILD libxc-5.1.6.ebuild 754 BLAKE2B 83461e4935381c3f83f3ec12407b87db36494bdf35b844e0c460081c12ee92179a909ed19b680b675682ccb04e0eedef7028a9363113a96cf2cf7c3a17d0b7dc SHA512 4be78cb1e9dd4b37f8c079f66184db05286b3844aa304c846dbaef7ccf269def0217e345d47fdbf767f8ec1557d7cbaddd63315b7348fe49f8417f2fc5bee615
 MISC metadata.xml 1354 BLAKE2B 42f0a7dcce10dd20c3796ba2576097f639062e4854f0e035dc40fa4ca1f7c94841624531334953229c1b3514f8b481fab68d67f0fc215033d7bd1dfed05960f4 SHA512 ba2e5fde19b864b5b77b47dafaaae59e4fa2536c4eeac21fa830fb201c84ff07edd1c89c909eb0d33e1841f4c0ec741dd8d5215e789cb2b87648af32528d7050
diff --git a/sci-libs/libxc/libxc-5.1.4.ebuild b/sci-libs/libxc/libxc-5.1.4.ebuild
index 884100437a30..07bbbe3d910c 100644
--- a/sci-libs/libxc/libxc-5.1.4.ebuild
+++ b/sci-libs/libxc/libxc-5.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="fortran test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libxc/libxc-5.1.6.ebuild b/sci-libs/libxc/libxc-5.1.6.ebuild
new file mode 100644
index 000000000000..54a6f584a57e
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+	dodoc ChangeLog.md
+
+	# no static archives
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index 7162b2a35fd0..966a15b0a87b 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,4 +1,7 @@
 AUX lmfit-8.2.2-cmake.patch 2752 BLAKE2B 2a0d3cf9a4e206fe346257c62cbfa482fa60562a948d76dc3cb9e8060faca3d0e80bb706b8d9593ca1b4894a659542dff06684bfa9829216f6c07e2dcb9e4618 SHA512 7a20814d311ed768e02bb17e32802c017bb148e3877fecc8ef9a13ace865dfed403cc8fb7811aba12655166e0eafb59e8e60edbb4346b7c56553bb79d4cd608e
+AUX lmfit-9.0-cmake.patch 1599 BLAKE2B e0f4783b64436845a12f8ca0a45f93d4964dba3855adeb73cb466c1bc0b8652610f8fa610e816db33c0f027db0b86233c01358245cd42a2284e718b76c964b18 SHA512 7256873a0620a429c231cdd296a6dcf6dffd4caa2468f7a91ca0d3943488753155aeb32bdc5813e1404c52ca2ea9bdf48b7ecf736e1348a1b36c0fd8d555f0c3
 DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271
+DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1
 EBUILD lmfit-8.2.2.ebuild 520 BLAKE2B efc8e9af493c8a62febc1066ca42912cc0e3d04343972305822fa5cbb88bdfec3f51d335eb25e89c38a8cdfa5d816ac8a71fc3aac8fc4b278504ace08631c1e1 SHA512 54a72c8260af70d2f23ce3e266add722f4e516124c0913bfd315572255e517a968db6a24ab818bf8825332daa2a7cc20461bb35372973851d1e063fa7fceda81
+EBUILD lmfit-9.0.ebuild 505 BLAKE2B 3c1aecf93cc23af0406c857e6cc6a54dc6c829bb003aaaf5b9a0a99ecc36882e3289fe0f2b0497ef17cd93eef829f9c0e3ab019b9d8675796400a1fc9bf25461 SHA512 cbbcbe9ffc949c51bdde7f4370fda2cb6ee2f14f0e4b7347ddb9e664a799028f59570a205661cc0185f37d5b18b2acf8f4cd51837fb6ec33a4b43198ad66cda8
 MISC metadata.xml 329 BLAKE2B e14c94d390f181a254eddb7c0ae891c9b736ac30346be5caeba754b9439f17391b5dd1bcabfb58a486d53c9ab4403afaa1b86ecda1c9378b99859a8a01f000d4 SHA512 adcd5f27f011b23bed7d73d3aa88a43d6ed85760e47c0cd8bf89aaf3ab0e7524e52203ea0bba95c6c44d1146998f7e3adcf5430220866c7da9880c0008a9e7d7
diff --git a/sci-libs/lmfit/files/lmfit-9.0-cmake.patch b/sci-libs/lmfit/files/lmfit-9.0-cmake.patch
new file mode 100644
index 000000000000..0c3270052cb6
--- /dev/null
+++ b/sci-libs/lmfit/files/lmfit-9.0-cmake.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,9 +52,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set(destination ${CMAKE_INSTALL_PREFIX})
+ configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
+-    DESTINATION "${destination}/lib/pkgconfig/")
++	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+ 
+ include(CTest)
++include(GNUInstallDirs)
+ 
+ add_subdirectory(lib)
+ add_subdirectory(demo)
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -19,13 +19,13 @@ link_libm(${lib})
+ 
+ install(
+     TARGETS ${lib}
+-    LIBRARY DESTINATION ${destination}/lib
+-    RUNTIME DESTINATION ${destination}/lib
+-    ARCHIVE DESTINATION ${destination}/lib
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
++    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
+     COMPONENT Libraries)
+ install(
+     FILES ${inc_files}
+-    DESTINATION ${destination}/include
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/include
+     COMPONENT Headers)
+ 
+ if(WIN32)
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -15,11 +15,11 @@ function(one_page pname section)
+         )
+     install(
+         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}"
++	DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
+         )
+     install(
+         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html"
++	DESTINATION "${CMAKE_INSTALL_DOCDIR}/html"
+         )
+ endfunction()
+ 
diff --git a/sci-libs/lmfit/lmfit-9.0.ebuild b/sci-libs/lmfit/lmfit-9.0.ebuild
new file mode 100644
index 000000000000..919ba7d7e77a
--- /dev/null
+++ b/sci-libs/lmfit/lmfit-9.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
+HOMEPAGE="https://jugit.fz-juelich.de/mlz/lmfit"
+SRC_URI="https://jugit.fz-juelich.de/mlz/lmfit/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+)
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index d444199d19fc..c9127f95af43 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -3,6 +3,5 @@ AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a0
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-5.1.0-r4.ebuild 1479 BLAKE2B 1dad2bd86123cf3cc78880caef4aa08d2db055bfaabdaee900b5fe22910d2eb63cf6eda2301edcd3207336afd33d5c7311efd28a3660ab5661f2c868e983a9ff SHA512 ec614d74848fda9e75d3929a0e77e85b38b043ec379eb14a8d62c791252bde127e03ad49298b67b235424987657da0c0c39e90bd21e172223265bc976fdacb73
-EBUILD metis-5.1.0-r5.ebuild 1815 BLAKE2B ed7eb5121960cc9ed16f13478332d8b42346e16a23987bef51523cd33991bec86c0a938f6f2b436fb50e8917bd311d7be1488a1406dc9414da88d4237d389c73 SHA512 743e17926e170363cd82bb5a13770bc730a06d4602d112593eb4dbdd19c26ae75278498e026fd77e4398f2d746742bbbc553d6b1e9dcdada9a4af8fbc4638ce7
+EBUILD metis-5.1.0-r5.ebuild 1808 BLAKE2B bc0402a052720419b7e0dcb2de0b88578fcedb2efe22ca218dd19041d5a4cce10afa8730bcaad6798d35c99f41e39913b3dc39c2573c01fe6d649c6ac1b84cfa SHA512 8c85d46ae879871608889f72672e185d57b84ac57e0d1103485fa463d7987d2c29da67fed5afaf71644a0b5484d39bfbc4c76b57bc3a294babcd1787063d4b7e
 MISC metadata.xml 862 BLAKE2B ae00feba4b79f981b8c730758a8b4fb39b93e9bad64ec6b2ea5cc109682d828a7a3c7cbaa4209c18fe26e49f240f0af1b6ba76834961d941d568b635b3f7f729 SHA512 a596e61e9fcd162594e56f68c787c9b8b516e02eb18667c60e13aa012fbd262b1bddccb7e70f05da96bc0480c803c1219935c3595b47fd2acbaac26b388af544
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
deleted file mode 100644
index 692b7617144c..000000000000
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc openmp"
-
-RDEPEND="!sci-libs/parmetis"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-datatype.patch
-	"${FILESDIR}"/${P}-shared-GKlib.patch
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-remove-GKlib-O3.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGKLIB_PATH="${S}"/GKlib
-		-DSHARED=yes
-		-DOPENMP=$(usex openmp)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd graphs || die
-	local PATH="${BUILD_DIR}"/programs/:${PATH}
-
-	ndmetis mdual.graph || die
-	mpmetis metis.mesh 2 || die
-	gpmetis test.mgraph 4 || die
-	gpmetis copter2.graph 4 || die
-	graphchk 4elt.graph || die
-}
-
-src_install() {
-	cmake_src_install
-	dodoc manual/manual.pdf
-
-	cat >> "${T}"/metis.pc <<- EOF || die
-		prefix=${EPREFIX}/usr
-		exec_prefix=\${prefix}
-		libdir=\${exec_prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: METIS
-		Description: Software for partioning unstructured graphes and meshes
-		Version: ${PV}
-		Cflags: -I\${includedir}/metis
-		Libs: -L\${libdir} -lmetis
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${T}"/metis.pc
-}
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
index edba6584954c..f45164ac35cb 100644
--- a/sci-libs/metis/metis-5.1.0-r5.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples int64 openmp"
 
 RDEPEND="!<sci-libs/parmetis-4.0.3-r2"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 37054b163b58..206653550e05 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -2,12 +2,8 @@ AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961e
 AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
-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.14.tar.gz 12460465 BLAKE2B 9505ff6e132581ecc86159fb84192c6bbce0f2974293eaf1b4aca6b96b5da85823bfc1bced65a96930674fd4781ea3e375aed09cbdc9930cef26694c9f8e1c80 SHA512 c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
 DIST openblas-0.3.17.tar.gz 12513037 BLAKE2B bb3a89500f242613a6bed73519702995cf1e82dcfec49f9469ecfd6647121260a4364582dbc257a75212320b5690ba93e75a0f2762dce7f398ef6443b169b4e4 SHA512 a97745c1f050ea44fce5f1722810de469612d374a29796a874d12673d6ad189872160cc2b5d0885790e6562d9d7ade629144c86f2649e668b0d4def36aa74495
-EBUILD openblas-0.3.12-r1.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
-EBUILD openblas-0.3.13.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
-EBUILD openblas-0.3.14.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
+DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
 EBUILD openblas-0.3.17.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
+EBUILD openblas-0.3.18.ebuild 5680 BLAKE2B 1da504eb60a8e08526c85a4ceb15bbfad4f0518cefc9bd33471c7dabe4b913d789f1f5aa7507b50b92004fb21f99862234466089ba4d6ebb7dfbdc15b2e8ac93 SHA512 2372e6dc6be860fbc7c46d00a089083722d83dfa1af07626474b76ed775731bc46e558b6cd81ace9b9a5bf516f8007cd73261c0254e907299892a2bb54760f27
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
deleted file mode 100644
index 4d8d73725fd1..000000000000
--- a/sci-libs/openblas/openblas-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-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 )"
-
-RDEPEND="
-	eselect-ldso? (
-		>=app-eselect/eselect-blas-0.2
-		>=app-eselect/eselect-lapack-0.2
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
-	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
-	elog "This software has a massive number of options that"
-	elog "are configurable and it is *impossible* for all of"
-	elog "those to fit inside any manageable ebuild."
-	elog "The Gentoo provided package has enough to build"
-	elog "a fully optimized library for your targeted CPU."
-	elog "You can set the CPU target using the environment"
-	elog "variable - OPENBLAS_TARGET or it will be detected"
-	elog "automatically from the target toolchain (supports"
-	elog "cross compilation toolchains)."
-	elog "You can control the maximum number of threads"
-	elog "using OPENBLAS_NTHREAD, default=64 and number of "
-	elog "parallel calls to allow before further calls wait"
-	elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-
-	# List of most configurable options - Makefile.rule
-
-	# https://github.com/xianyi/OpenBLAS/pull/2663
-	tc-export CC FC LD AR AS RANLIB
-
-	# HOSTCC is used for scripting
-	export HOSTCC=$(tc-getBUILD_CC)
-
-	# threading options
-	use openmp && tc-check-openmp
-	USE_THREAD=0
-	if use openmp; then
-		USE_THREAD=1; USE_OPENMP=1;
-	elif use pthread; then
-		USE_THREAD=1; USE_OPENMP=0;
-	fi
-	export USE_THREAD USE_OPENMP
-
-	# We need to filter these while building the library, and not just
-	# while building the test suite. Will hopefully get fixed upstream:
-	# https://github.com/xianyi/OpenBLAS/issues/2657
-	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
-	# disable submake with -j and default optimization flags
-	# in Makefile.system
-	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
-	export MAKE_NB_JOBS=-1 \
-	       COMMON_OPT=" " \
-	       FCOMMON_OPT=" "
-
-	# Target CPU ARCH options
-	# generally detected automatically from cross toolchain
-	use dynamic && \
-		export DYNAMIC_ARCH=1 \
-		       NO_AFFINITY=1 \
-		       TARGET=GENERIC
-
-	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
-	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
-	# setting OPENBLAS_TARGET to override auto detection
-	# in case the toolchain is not enough to detect
-	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
-	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
-		export TARGET="${OPENBLAS_TARGET}"
-	fi
-
-	export NO_STATIC=1
-
-	BUILD_RELAPACK=1
-	if ! use relapack; then
-		BUILD_RELAPACK=0
-	fi
-
-	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
-	default
-
-	# Disable tests by default
-	sed -e "/^all ::/s/tests //" -i Makefile || die
-
-	# if 64bit-index is needed, create second library
-	# with LIBPREFIX=libopenblas64
-	if use index-64bit; then
-		cp -aL "${S}" "${S}-index-64bit" || die
-	fi
-}
-
-src_compile() {
-	default
-	cd interface || die
-	emake shared-blas-lapack
-
-	if use index-64bit; then
-		emake -C"${S}-index-64bit" \
-		      INTERFACE64=1 \
-		      LIBPREFIX=libopenblas64
-	fi
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" \
-	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use index-64bit; then
-		dolib.so "${S}-index-64bit"/libopenblas64*.so*
-	fi
-
-	if use eselect-ldso; then
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-		doins interface/liblapacke.so.3
-		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
-	fi
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.14.ebuild b/sci-libs/openblas/openblas-0.3.14.ebuild
deleted file mode 100644
index 4d8d73725fd1..000000000000
--- a/sci-libs/openblas/openblas-0.3.14.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-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 )"
-
-RDEPEND="
-	eselect-ldso? (
-		>=app-eselect/eselect-blas-0.2
-		>=app-eselect/eselect-lapack-0.2
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
-	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
-	elog "This software has a massive number of options that"
-	elog "are configurable and it is *impossible* for all of"
-	elog "those to fit inside any manageable ebuild."
-	elog "The Gentoo provided package has enough to build"
-	elog "a fully optimized library for your targeted CPU."
-	elog "You can set the CPU target using the environment"
-	elog "variable - OPENBLAS_TARGET or it will be detected"
-	elog "automatically from the target toolchain (supports"
-	elog "cross compilation toolchains)."
-	elog "You can control the maximum number of threads"
-	elog "using OPENBLAS_NTHREAD, default=64 and number of "
-	elog "parallel calls to allow before further calls wait"
-	elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-
-	# List of most configurable options - Makefile.rule
-
-	# https://github.com/xianyi/OpenBLAS/pull/2663
-	tc-export CC FC LD AR AS RANLIB
-
-	# HOSTCC is used for scripting
-	export HOSTCC=$(tc-getBUILD_CC)
-
-	# threading options
-	use openmp && tc-check-openmp
-	USE_THREAD=0
-	if use openmp; then
-		USE_THREAD=1; USE_OPENMP=1;
-	elif use pthread; then
-		USE_THREAD=1; USE_OPENMP=0;
-	fi
-	export USE_THREAD USE_OPENMP
-
-	# We need to filter these while building the library, and not just
-	# while building the test suite. Will hopefully get fixed upstream:
-	# https://github.com/xianyi/OpenBLAS/issues/2657
-	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
-	# disable submake with -j and default optimization flags
-	# in Makefile.system
-	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
-	export MAKE_NB_JOBS=-1 \
-	       COMMON_OPT=" " \
-	       FCOMMON_OPT=" "
-
-	# Target CPU ARCH options
-	# generally detected automatically from cross toolchain
-	use dynamic && \
-		export DYNAMIC_ARCH=1 \
-		       NO_AFFINITY=1 \
-		       TARGET=GENERIC
-
-	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
-	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
-	# setting OPENBLAS_TARGET to override auto detection
-	# in case the toolchain is not enough to detect
-	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
-	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
-		export TARGET="${OPENBLAS_TARGET}"
-	fi
-
-	export NO_STATIC=1
-
-	BUILD_RELAPACK=1
-	if ! use relapack; then
-		BUILD_RELAPACK=0
-	fi
-
-	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
-	default
-
-	# Disable tests by default
-	sed -e "/^all ::/s/tests //" -i Makefile || die
-
-	# if 64bit-index is needed, create second library
-	# with LIBPREFIX=libopenblas64
-	if use index-64bit; then
-		cp -aL "${S}" "${S}-index-64bit" || die
-	fi
-}
-
-src_compile() {
-	default
-	cd interface || die
-	emake shared-blas-lapack
-
-	if use index-64bit; then
-		emake -C"${S}-index-64bit" \
-		      INTERFACE64=1 \
-		      LIBPREFIX=libopenblas64
-	fi
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" \
-	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use index-64bit; then
-		dolib.so "${S}-index-64bit"/libopenblas64*.so*
-	fi
-
-	if use eselect-ldso; then
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-		doins interface/liblapacke.so.3
-		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
-	fi
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.13.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index 4566f928af81..7d76564474ca 100644
--- a/sci-libs/openblas/openblas-0.3.13.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -27,7 +27,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
-	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
 )
 
 pkg_pretend() {
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 3149cf759aca..92736d8a13de 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,14 +1,10 @@
-AUX pastix-5.2.2.22-isnan-floating-point-cast.patch 1901 BLAKE2B 3bb02c4898367e02091793064ba23b329913d8567eeb721bc0de0e70acb63e4ab5345ebde859bf6c8b3b8796a6bad1d722cc51b9f5f41cd046974defa0f3e026 SHA512 23b3e4854afb459e0f68c4322bd85db6addc6ec043bb9c404a9a60667de6b01bb17c3d7795f8fd5dacaa0b5db6c45a6f1e1358590c77326610bc271903b920ee
-AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f535ad2922c3b39375d50b81abc572a1363e5e1130e3647083940ffc929e40cf93d35e364eb7e36d84d57a53bd9fe247ff8f7fefde93a08f7 SHA512 c12719176b352b396cc58d7a4474955df0cb01459edce1b2f220c6352d99bf608d39c3b4d6b54b0ae8b4643879ed79b7a5fbd03b746dba0bf4cc265d81d6d38e
 AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953
 AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe
 AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced
 AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c3153eac0cfa5150918db2ae019d8defda1689dd41d584bbd866f4016f3f98102c61a4bb5a18419f88bfc197cd3659afb95311 SHA512 58aebfea042443daf75fb155c39d44e5a2d4ffdc27043b66a6c6089613363b0613ab8ac9e11cde1b749e87ec160aaa0355a0c3a2bb01fbedb43c4d28951e7747
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
-DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.2.22-r1.ebuild 3647 BLAKE2B e2ba880bf58ec003bf701026bd79e8ebb37d148fcc610b1048c1d1b6b2c5b9274c344fa34da559b9e44a861e835b055c04caa4dac8a771ab20d1d0c893e3ef9d SHA512 b4088bd6f0168dc95a79c2624c645257cb9afd9d3019dcce1fd81997b2edd2244de6b76afb251771d5ba13e79289baf6cabc3baa1e4e8302c02c2c7f7ba466c5
-EBUILD pastix-5.2.3.ebuild 3350 BLAKE2B f210ce384cfef354638510995329b4ee5585d6030f757273d47eb8f2c8acade72202caedc8d6bfcd3ec47bcbe5ba033debc4cac4bfb741443d4bb5395b8f3936 SHA512 2692dcc31844aa589061863065446b78d6be497b88caf1e3e216bcf84cce0e1aa2a24e6615feb3793bd3e52c7f5b93da0e3eec8c8bc6f191249bcb5f77d60547
+EBUILD pastix-5.2.3.ebuild 3349 BLAKE2B dbe716c332aad225831c749afbd12b8614dd0f05c4e9273102b935a60e01353e8ed7e7489e6674574ff2a9de18e39913213c6dd1338d6fec93ea856f0f57909c SHA512 a9b88e42904393acb56607bca886357d0b320acee7fb82b96987b274aa27c18b53de5e97c576ed2376a31e29a4b76ddc081da4b9e2ab65d357476339a29add6f
 EBUILD pastix-6.0.3.ebuild 2374 BLAKE2B 58133bf3238c1d5108e5f1c70db54319ae3f6a62f673b9b815c64ac5fbf9efa92b0895e36c5b75f9d0e8b0eedfcdb17a56e32c85d5cd718741dcc43995c410d8 SHA512 4cb031a9cb4281f20d629a7f6f950e768c2d95437d1480ce91357a97bed735e3ddfcc6e397b57a39e90e2ed5941b1dd3e5a924d7844d3ca94bf36a94ce55a6f4
 MISC metadata.xml 1383 BLAKE2B 0a17508eb75ed0066dbbaad286cb00ddd8491aa5b6047f2f32fde75f5e43277233229d4935d94052000c662e729480aaa02cdcbd4572e4b84075f108b1c61800 SHA512 9cc80da6ccb82311e30288696cce006e858121a8d216ba2860a1c0ae833c8e8076d60cd783283d163528976bfd9af11d114fc95a481b36951b5d7caf3c0fad2c
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
deleted file mode 100644
index 8aa7c06e5c93..000000000000
--- a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Add missing cast to floating-point type:
-* sopalin/src/variable_csc.c: In function ‘vcsc_add_node’:
-* sopalin/src/variable_csc.c:138:13: error: non-floating-point argument in call to function ‘__builtin_isnan’
-*              if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=580422
-
---- src/common/src/errors.h
-+++ src/common/src/errors.h
-@@ -140,7 +140,7 @@
-  *   expr - The value to check.
-  */
- #define CHECK_NAN(expr) {					\
--    ASSERT_DEBUG(!isnan(expr), DBG_SOPALIN_NAN);		\
-+    ASSERT_DEBUG(!isnan(((double) expr)), DBG_SOPALIN_NAN);		\
-     ASSERT_DEBUG(!isinf(expr), DBG_SOPALIN_INF);		\
-   }
- #else
---- src/sopalin/src/variable_csc.c
-+++ src/sopalin/src/variable_csc.c
-@@ -135,7 +135,7 @@
- #endif
- 
-           for (ii = 0; ii < dof2; ii++) {
--            if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
-+            if (isnan(((double) vcsc->values[COL-1][i*dof2 + ii]))) {
-               vcsc->values[COL-1][i*dof2 + ii] = VALUE[ii];
-             } else {
-               vcsc->values[COL-1][i*dof2 + ii] = op(vcsc->values[COL-1][i*dof2 + ii],
-@@ -252,7 +252,7 @@
-                     vcsc->rows[COL_NODE][i]);
-           }
- #endif
--          if (isnan(vcsc->values[COL_NODE][idx])) {
-+          if (isnan(((double) vcsc->values[COL_NODE][idx]))) {
-             vcsc->values[COL_NODE][idx] = VALUE;
-           } else {
-             vcsc->values[COL_NODE][idx] = op(vcsc->values[COL_NODE][idx],
-@@ -660,7 +660,7 @@
-           } else {
-             INTS iterdof;
-             for (iterdof = 0; iterdof < dof2; iterdof++) {
--              if (!isnan(vcsc->values[MYCOL-1][dof2*iter2+iterdof])) {
-+              if (!isnan(((double) vcsc->values[MYCOL-1][dof2*iter2+iterdof]))) {
-                 /* ignore NaN values from VCSC */
-                 (*values_o)[dof2*iter3+iterdof] = op(
-                   (*values_o)[dof2*iter3+iterdof],
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
deleted file mode 100644
index c01b02bb8f72..000000000000
--- a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./sopalin/src/updo.c.orig	2016-02-23 01:42:00.000000000 +0000
-+++ ./sopalin/src/updo.c	2016-02-23 01:42:10.000000000 +0000
-@@ -940,8 +940,10 @@
-     i = TASK_CBLKNUM(i);
- #    define END_LOOP(a) } SMP_END_LOOP(a)
- #  else /* SMP_SOPALIN */
--#    define START_LOOP for (i=0;i<SYMB_CBLKNBR;i++)
--#    define END_LOOP
-+#    define START_LOOP \
-+    int bubnum  = me;                             \
-+    for (i=0;i<SYMB_CBLKNBR;i++)
-+#    define END_LOOP(a) a
- #  endif
- 
-   /* Xi=(Dii)-1Xi; */
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
deleted file mode 100644
index dbb6464862a9..000000000000
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 toolchain-funcs
-
-# TODO:
-# testing: emake examples?
-# better doc instalation and building
-# pypastix (separate package?)
-# multilib with eselect?
-# static libs building without pic
-# metis?
-
-# package id: change every version, see the link on inriaforge
-PID=35070
-# commit id: change every version
-#CID=351ef60
-# leave empty if this is not a post release bug fix
-#PPV=bugfix9_
-#MYPN=pastix_release
-#SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${MYPN}_${PPV}${CID}.tar.bz2"
-
-DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://pastix.gforge.inria.fr"
-SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi +smp starpu static-libs"
-
-RDEPEND="
-	sci-libs/scotch:0=[int64?,mpi?]
-	sys-apps/hwloc:0=
-	virtual/blas
-	mpi? ( virtual/mpi )
-	starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-nosmp-undefined-variable.patch"
-	"${FILESDIR}/${P}-isnan-floating-point-cast.patch"
-)
-S="${WORKDIR}/${PN}_${PV}/src"
-
-src_prepare() {
-	default
-	sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-		-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-		-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
-		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
-		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
-		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
-		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
-		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
-		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
-		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
-		-e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
-		-e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
-		-e '/fPIC/s/^#//g' \
-		-e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
-		-e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
-		-e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
-		-e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
-		-e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
-		-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
-		config/LINUX-GNU.in > config.in || die
-	sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
-}
-
-src_configure() {
-	if use amd64; then
-		sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
-			-i config.in || die
-	fi
-
-	if use int64; then
-		sed -e '/VERSIONINT.*_int64/s/#//' \
-			-e '/CCTYPES.*INTSSIZE64/s/#//' \
-			-i config.in || die
-	fi
-
-	if ! use mpi; then
-		sed -e '/VERSIONMPI.*_nompi/s/#//' \
-			-e '/CCTYPES.*NOMPI/s/#//' \
-			-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
-			-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
-			-e 's/-DDISTRIBUTED//' \
-			-e 's/-lptscotch/-lscotch/g' \
-			-i config.in || die
-	fi
-
-	if ! use smp; then
-		sed -e '/VERSIONSMP.*_nosmp/s/#//' \
-			-e '/CCTYPES.*NOSMP/s/#//' \
-			-i config.in || die
-	fi
-
-	if use starpu; then
-		sed -e '/libstarpu/s/#//g' -i config.in || die
-	fi
-}
-
-src_compile() {
-	emake all drivers
-}
-
-src_test() {
-	# both test and tests targets are defined and do not work
-	echo
-}
-
-src_install() {
-	default
-	sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
-	# quick and dirty (static libs should really be built without pic)
-	cd .. || die
-	dodoc README.txt doc/refcard/refcard.pdf
-}
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 79b393d36651..4e2083d49a7f 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 866a1618b88a..eefeb8321b9e 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,6 +1,3 @@
-AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce
-DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
 DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c
-EBUILD qd-2.3.22.ebuild 1100 BLAKE2B 50c55e5d7b4bb1d1e8c0298619aad3ec1d7ba65084dd87f59105cd2be3a4e940ab71e03ecdbb3e3fd842d9604fc84df1c4c5b8ed30a9d5c8a1508be364aa7f5f SHA512 f86a94765cd174ec9d2573d79cb39e94c381d4d752ca13ea47d805336381284dd6382695c375e589899f627cf9bf2fb5b66688f82f598dcd3c5b9dd1461bac95
-EBUILD qd-2.3.23.ebuild 927 BLAKE2B ed541806090cadbd74ddd09f335b239862ed4d0b775a0c4d36f41a5ca34754586ab688d47263465a082e22b2ac4b649ec365ffe79215ec5835fceddbea6f3892 SHA512 7cc669c010d07388201bda2d999234883e75986a3c25d4690dad5274ff3b3dfc5afd341d46069089a0aa76a2951f7fcb33e1aadec27b7f4438fb6ac4cef4d3d2
+EBUILD qd-2.3.23.ebuild 925 BLAKE2B f398349c6067ef3d39b9d0ce5c58b09ca34db094f730bda5a60568aa470a06ddccfd240abdbd2de6631cb287357361a83c0de816129d05e7fac25993bd703b23 SHA512 9536b41dee4d249df116736b262359966613458748914d4b410fdcec3fdd7ef9638aa0a9017e699d1472ad9db5f7aba2a39657e3d6fec4293f199150619ed849
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch b/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch
deleted file mode 100644
index 204880de95cd..000000000000
--- a/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -U3 -r qd-2.3.22.orig/configure.ac qd-2.3.22/configure.ac
---- qd-2.3.22.orig/configure.ac	2018-10-30 23:01:31.000000000 +0700
-+++ qd-2.3.22/configure.ac	2018-11-09 21:45:39.415092314 +0700
-@@ -18,14 +18,14 @@
- 
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE([nostdinc foreign])
--AM_CONFIG_HEADER([config.h])
--AM_CONFIG_HEADER([include/qd/qd_config.h])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_HEADERS([include/qd/qd_config.h])
- 
- AC_CANONICAL_HOST
- 
- # Checks for arguments
- # --enable-inline
--AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
-+AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
- AC_MSG_CHECKING([if commonly used function is to be inlined])
- if test "$enable_inline" != "no"; then
-   enable_inline="yes"
-@@ -34,7 +34,7 @@
- AC_MSG_RESULT($enable_inline)
- 
- # --enable-ieee-add
--AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
-+AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
- AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used])
- if test "$enable_ieee_add" = "yes"; then
-   AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.])
-@@ -44,7 +44,7 @@
- AC_MSG_RESULT($enable_ieee_add)
- 
- # --enable-sloppy-mul
--AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy multiplication is to be used])
- if test "$enable_sloppy_mul" != "no"; then
-   enable_sloppy_mul="yes"
-@@ -53,7 +53,7 @@
- AC_MSG_RESULT($enable_sloppy_mul)
- 
- # --enable-sloppy-div
--AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy division is to be used])
- if test "$enable_sloppy_div" != "no"; then
-   enable_sloppy_div="yes"
-@@ -63,7 +63,7 @@
- 
- 
- # --enable-debug
--AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
-+AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
- AC_MSG_CHECKING([if debugging code is to be enabled])
- if test "$enable_debug" = "yes"; then
-   AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
-@@ -73,7 +73,7 @@
- AC_MSG_RESULT($enable_debug)
- 
- # --enable-warnings
--AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
-+AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
- AC_MSG_CHECKING([if compiler warnings is to be enabled])
- if test "$enable_warnings" != "yes"; then
-   enable_warnings="no"
-@@ -83,13 +83,6 @@
- 
- # Checks for programs.
- AC_LANG(C++)
--if test "$CXXFLAGS" = ""; then
--  if test "$enable_debug" = "yes"; then
--    CXXFLAGS="-O"
--  else
--    CXXFLAGS="-O2"
--  fi
--fi
- 
- # Set up compiler search list.  DUe to possible case insensitive filesystems, 
- # Cygwin and Apple systems sometimes gets confused between cc and CC.
-@@ -106,50 +99,10 @@
- fi
- AC_PROG_CC
- 
--
--CXX_PROG_NAME=`basename $CXX`
--case $host in
--  powerpc*-*-*)
--    case "$CXX_PROG_NAME" in
--      xlC*) 
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict"
--      ;;
--    esac
--  ;;
--  i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*)
--    case "$CXX_PROG_NAME" in
--      icc|icpc|ecc)
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -mp"
--        if test "$enable_warnings" = "yes"; then
--          CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419"
--        fi
--      ;;
--    esac
--  ;;
--  alpha*-*-*)
--    case "$CXX_PROG_NAME" in
--      cxx) 
--        CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak"
--      ;;
--    esac
--  ;;
--esac
--
--AC_SUBST(REQ_CXXFLAGS)
--CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS"
--
--if test "$enable_warnings" = "yes"; then
--  if test "$GCC" = "yes"; then
--    CXXFLAGS="$CXXFLAGS -Wall"
--  fi
--fi
--
--if test "$enable_debug" = "yes"; then
--  CXXFLAGS="$CXXFLAGS -g"
--fi
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- # --enable-fma
--AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
-+AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
-   enable_fma="auto"
- fi
-@@ -248,7 +201,7 @@
-     FCFLAGS="-O2"
-   fi
- fi
--AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
-+AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
-   AC_LANG_PUSH(Fortran)
-   AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])
-@@ -312,8 +265,7 @@
- AC_CHECK_LIB(m,sqrt)
- 
- # libtool stuff
--AC_DISABLE_SHARED
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- # Output
- AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile 
-diff -U3 -r qd-2.3.22.orig/fortran/Makefile.am qd-2.3.22/fortran/Makefile.am
---- qd-2.3.22.orig/fortran/Makefile.am	2018-10-30 23:05:01.000000000 +0700
-+++ qd-2.3.22/fortran/Makefile.am	2018-11-09 21:47:44.530083871 +0700
-@@ -16,7 +16,9 @@
- 
- lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
- libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
-+libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS)
- libqd_f_main_la_SOURCES = main.cpp
-+libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS)
- ddmod.lo: $(DDEXT) ddext.lo
- qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
- $(QDMOD): qdmod.lo $(DDMOD)
-diff -U3 -r qd-2.3.22.orig/qd-config.in qd-2.3.22/qd-config.in
---- qd-2.3.22.orig/qd-config.in	2018-10-30 23:04:56.000000000 +0700
-+++ qd-2.3.22/qd-config.in	2018-11-09 21:49:18.140077553 +0700
-@@ -14,7 +14,7 @@
- build_CXXFLAGS="@CXXFLAGS@"
- build_LDFLAGS="@LDFLAGS@"
- CXX="@CXX@"
--CXXFLAGS="-I$includedir @REQ_CXXFLAGS@"
-+CXXFLAGS="-I$includedir"
- FC="@FC@"
- 
- LDFLAGS="-L$libdir -lqd @LIBS@"
diff --git a/sci-libs/qd/qd-2.3.22.ebuild b/sci-libs/qd/qd-2.3.22.ebuild
deleted file mode 100644
index 46948cd55894..000000000000
--- a/sci-libs/qd/qd-2.3.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran static-libs"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-ieee-add \
-		--disable-sloppy-mul \
-		--disable-sloppy-div \
-		--enable-inline \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
-		$(use_enable fortran)
-}
-
-src_install() {
-	default
-
-	dosym qd_real.h /usr/include/qd/qd.h
-	dosym dd_real.h /usr/include/qd/dd.h
-
-	if ! use doc; then
-		rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/qd/qd-2.3.23.ebuild b/sci-libs/qd/qd-2.3.23.ebuild
index d3c5bfd71d45..e3d6651702a7 100644
--- a/sci-libs/qd/qd-2.3.23.ebuild
+++ b/sci-libs/qd/qd-2.3.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
 
 src_configure() {
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 0d31e41a9424..3d5c0eef92c2 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,6 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
 AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B 99ad2f1d5945c746ddf252c5e12983dad2eef6a99e9f1aecd1e0c3c80e8cf08924a84ddf78ef64851d6737ed4688cca7f11a920b465e3e1f5698a11221c744aa SHA512 6246e05702a13967279242bac9235840a000ab06ef3e02672c97fd1ebf5da7f75e127e3634b82ef14fd1f8d166ecb09e7057e1efb0f82b92f7fd1e57df8dd813
-EBUILD qrupdate-1.1.2-r2.ebuild 1275 BLAKE2B 09c9814bff69c65fc1e2e65cbdab782c42589bd73b9e8d4840cff5bb3d6b337af7ec2ffd00f166ecd2bc904bf3246bd64e1ab372c98f2d0a3b6fffd0aa525110 SHA512 6c35fbebab5841dc6388f0d259c008ae4a758cc50f67306d37491b8cea225f515abedf786cc7c196baefc47b33910e23816c98bc8f85fdfa023bde42fa906b4c
+EBUILD qrupdate-1.1.2-r2.ebuild 1268 BLAKE2B f60dc8f1cb4dc70fce8fd55dd8825823df377d50c7c620a357eac063ae10a8bcb0c5d45ad908d353ca55ac596119624133595b7dd4cafd427bc72bec77d421fc SHA512 78f771cbe7a2a74f3039646377307bd95136044df5609e20c2fc4af2cf0b975e52a98eb635a94c46d2752bb1d04425288de5c3fc68094dcd76f6994f35bf80d2
 MISC metadata.xml 332 BLAKE2B dda33ed8f8a63591e183723ca80d1550d104a4996cba185dbef3bbd2f57e287b1f0c1776296e324e3648f39378cc8fd17225cdb04962c99adda59bb0024f09e7 SHA512 5f787098bc13a29f7905d07e27464a966766fdd65e19ee07fa2ea96517b38da6cb77187fb4b60ed40c81a962a405ad4dcd472f114c7849c5aee730c405062f2e
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
deleted file mode 100644
index efcc931e3385..000000000000
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2 flag-o-matic multilib versionator toolchain-funcs
-
-DESCRIPTION="Library for updating of QR and Cholesky decompositions"
-HOMEPAGE="https://sourceforge.net/projects/qrupdate"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
-IUSE="static-libs"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-Makefiles.patch \
-		"${FILESDIR}"/${PN}-1.1.2-install.patch
-
-	# GCC 10 workaround
-	# bug #741524
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
-	sed -i Makeconf \
-		-e "s:gfortran:$(tc-getFC):g" \
-		-e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
-		-e "s:BLAS=.*:BLAS=$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:LAPACK=.*:LAPACK=$($(tc-getPKG_CONFIG) --libs lapack):" \
-		-e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
-		-e "s:LIBDIR=lib:LIBDIR=$(get_libdir):" \
-		|| die "Failed to set up Makeconf"
-}
-
-src_compile() {
-	emake solib
-	use static-libs && emake lib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-shlib
-	dosym libqrupdate.so.$(get_major_version) /usr/$(get_libdir)/libqrupdate.so
-	use static-libs && emake DESTDIR="${D}" install-staticlib
-	dodoc README ChangeLog
-}
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 3206fe22ce8e..9d471abf2886 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index c2f406477839..913aa0340ed7 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -2,7 +2,7 @@ AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
-EBUILD scotch-6.0.4-r2.ebuild 5046 BLAKE2B 8e69b5110256582554ea1bdbc288f30bba8cb4316692f995f898e7fc16e27011b0d8dae00aba4d3fad6cfadcc82589625e42c43ebdf48f0c61440336d0cc61ec SHA512 5cd78fc6579b56ee2faf5a1b1ae6d584fede1e074513ed612b15b9bf4494ae3b7d89c3c9c9092df972576cc8a3955759667fe0dbfc6a27468089145fd8665497
+EBUILD scotch-6.0.4-r2.ebuild 5045 BLAKE2B 6e67c4623fd0d718d9f4b83fe5e4c36ebb296e5a746a356257fd853bd499df2bdfa7019d2da597867926bedd1dd4ecf8e899eb5dc69696b95bc9d0d2ba817a88 SHA512 2cda8cd3fac970a8fb637f49a6fe8def310e6af30a3491021a0d3662c704020f52a7cdbfd36106444b955a0c46d85edf9ace500477da0c31ecb0122faee28edc
 EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80
 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 4a01b91e5ca2..7f41e2ef543f 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-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 int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index cda234bd93cb..ad4ce52479d1 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,3 @@
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9.ebuild 1091 BLAKE2B 5bac9a253dd349701303f59311b3a99580c4794726a518951c0a840160ab64d3b1b0eef85bdf4e97d8946a5079a2d1fb779475c5ccd0496dffb86df177214e22 SHA512 c4b6965c18c5ae02b055d20d62d02909cf06e101a364f53f87d5d6e0f2348c4fa1ea91f8c0b54cbfa824d805ba7eb8897599245a8ff6ebf0d273554c202a6eb8
+EBUILD spqr-2.0.9.ebuild 1090 BLAKE2B 38dec7e90adc96d97283381e0cd9343e722e3545033a4ab6b9afdd5e4ed56185cc0eaebc2aec3be40a0ba146644261274033df252a91624c38c087ce8bb067c5 SHA512 30ba9fd4fec6917b5ab6f5765d7d7c8044dfd7a2d8a976971df4a5419b3db4a6088a87afbec735c73e99e7d3d7e42d267a44933fb45dd3241fc778e766651be9
 MISC metadata.xml 852 BLAKE2B 9480a2097af529f47896d300d8654b791ef1ea3989b97d8aef287dbe5b322167ef7a425016894b14c975205ebdc35cc5a1f187026688e0cbd7497b51657d0181 SHA512 51150e01477f24a382731c273f83aeb8fa646a7f897e4f6e8ffff4d4050fbf9ff589b7036134d9faf4da2c07a16654b01d1923003bc1e30c380b6fc46a3207f9
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index 7dab6a1a5d55..f8b22bfa58b4 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index ef2ccf9d742c..b82bd21b3d7a 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,5 +1,3 @@
-DIST stellarsolver-1.5.tar.gz 9113711 BLAKE2B 3fe4489df71bbfa4d75f02a8a0ea26202165a7fe321b626fedceccce52122502be0040a47347abdd4e52b3c3402451f10d79b8258db53d6da029bd20dd02c279 SHA512 eb1d8b8b94a4a4d165b49cd55ffef5e0ae32e7da1bb6b3e061421ba1a5a27ec30438b789c5c56bad22b512de9bf091aeb24b991c9a146cc852b22a9ca97cf3ce
 DIST stellarsolver-1.8.tar.gz 9117094 BLAKE2B fbfb08e1225c4285b5ce6f88372c1076fcfa622f63b093ffb0261e81c14f6901788b5bc6d6246008024df3a5ad7a96c07908633fa42453df5f57eeae4b1ada8d SHA512 08aa0647507874c9dfe032c10f7e583a54ca18302bc92731147875100c3f0903e03083ee71af851b2497898211ff8903477dfb56e61360a792a388d14d226db1
-EBUILD stellarsolver-1.5.ebuild 604 BLAKE2B 204afb23c920a8dc249ba0430422fe56f472704bd805d166ad1a36420a858d035de9107dc37da10ec8608e352020f28bff7171ac478469cf7b13b4b68f9abce8 SHA512 cdccdd3a8112c43fb3110ce69099205ee5a729111a4fe4c1a01973296c59b9b5c7a03dd2cd5858d190c288dd8904ea8f378fecfb05bc02fb1f36974078614d22
-EBUILD stellarsolver-1.8.ebuild 606 BLAKE2B b2482938a190e2479bd0f689b247036e11fe0576ff2cb3b593244ec791ff41e95aa8be1e987fbc42e29e9b1db04a3a26d3e5bd4ac95f4707399369850848c091 SHA512 679eab652ee1646ec71ee2a6b2601f233d6495f57e78222354916a9f5c7215b0ffb4e51e029fb00d04fabc6ec002b8428dd3a81d01c4186f63177a004077db57
+EBUILD stellarsolver-1.8.ebuild 604 BLAKE2B 6870dcffaf8680fbe4324ba0bd7ce103a9d23b7df7c308a888bdf028df713238c1f8c59a604bc9a48324b0172bfcce40605058dec63d1a8d3ed6b06ca7ddf72e SHA512 20dfd5ef82102e44010cf5fba5cea37f2c11905cf2838e85f87332cf300ff2c31b931dd3dcbd229bd4e8736bbf75f9df296aee78bb4f5b29db5828503b9c480f
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
deleted file mode 100644
index f3665c5dfa9f..000000000000
--- a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/stellarsolver/stellarsolver-1.8.ebuild b/sci-libs/stellarsolver/stellarsolver-1.8.ebuild
index 21d2375cc427..35969b975220 100644
--- a/sci-libs/stellarsolver/stellarsolver-1.8.ebuild
+++ b/sci-libs/stellarsolver/stellarsolver-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index c59554818489..36bf5e279c61 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,10 +1,7 @@
-AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
 AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b
-AUX sundials-5.7.0-fix-license-install-path.patch 529 BLAKE2B 71aaf0c6362e77379f0f6f7dcfcf77b6746e61d8f015ce78a13f73d4e890e8aea3693ca8d37a0cf0b43fa1fa524dbef7e468f511fe34b65cb93fb911d22f4c72 SHA512 0290df4ec9394f56487d03b6d5a320f252ab60193c1003bcdfc1ead8118beae2fe90c153f8c0c31df9052e4148d27681f557f3c96ff7e43f1946d380cbeae6e5
-DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
+AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aedb7599f6c2de33adc7b63f60ccce831f494006b41664acf31ccf838ca9715c4470309648935b194a0706f487cdc6e4b1a3ba52c0ca3c941 SHA512 7775dd78cd4dfbf647087058126314305232657c6f32d4811bc181902d925cee51142e92e2f50c15c02475b2b6c4f1c7be70a223dbf838b9205a811ed9fca4a9
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
-DIST sundials-5.7.0.tar.gz 22612286 BLAKE2B a21db0d07b8f2056ba244ca52f13bde51a2f745535c7381a4eecf9d8037df3d50f010c8fecd8e37d71150f101c8177b2e3f0ffbed8139702993e01b8ad52e707 SHA512 5e2b6145fdaa72e7d13f43e75e5bc08b9d7eb5b9e048207d5772ddab767e198af5be24b73a942a564a49d56ca0b47fe6493bd2de34a8a93948ccd1c13e5dd170
-EBUILD sundials-3.2.1.ebuild 2132 BLAKE2B b3ee9f4c99687181f963f5cdbd9d769293af28133c45513827081bd3708e6146afec228185355ec04e0204e8408ed70647e98655cb81c8d37e7fca06b739f2a9 SHA512 53c7d6434c0e32de3ce2e7975ec8dbcce0df268081bc0a1fe3372ca0e8c1223001e75f6ddbef7be66b1da3f5d2b9b0d715690c3985031731200480fe5b39f7ae
+DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
 EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
-EBUILD sundials-5.7.0.ebuild 2191 BLAKE2B 7cae104967366aa6fe22b7974b4f5d827672d56a16a416cba9dfc7ee405d0c206bf9423b76e08d6dd3da6f91a749ea1d0beb33554cbd68a571e4a6c6b63ce727 SHA512 d6535c05b58aa9eee2c58744c7e748cfd79a7a064311184cab3fd4819ccf06b9fa8f576a8e2b87b6e9ac42b97ab650ab9eaa46ae8cb72e18778aac2f88f59b81
+EBUILD sundials-5.8.0.ebuild 2712 BLAKE2B 1ee3ce42085318b74dfc64299c6323c81fa18a57adb809994e732dbd445f7342832ab761eba74e16b748b3280cfc9e626a0f4525c3be407302702742ef5d0098 SHA512 1a7ce334cacdddd40ffeb0f73be4b9f5aec8b16663ed4c7d5cedd201c4f145d0d5e978df86f80866db2701bb8140a70c7d1ba7a12cdfe437453160fcb6edf0db
 MISC metadata.xml 1060 BLAKE2B 279da603d6a362703f8142772042d94eca792aa1690988f1fa8efc16d7e125cb70408f11ba26bdabf2e3e121f2a71e09dc7d467f82475eee6dc72696ccf74316 SHA512 6bc695f162e38e409f71185a4ce57a6b87c456aee1c63c62135ed89293c5affeefb9dd87d2e6e8296f6c5c4385cfbf3a914cacc5570d340915617cc52ce8a82f
diff --git a/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
deleted file mode 100644
index eba90b52ac48..000000000000
--- a/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2018-10-11 22:22:09.000000000 +0300
-+++ new/CMakeLists.txt	2019-06-23 00:33:27.000000000 +0300
-@@ -1117,4 +1117,4 @@
- # install license file
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials)
-+  DESTINATION share/doc/sundials-3.2.1)
diff --git a/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
deleted file mode 100644
index 88fb964f8995..000000000000
--- a/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40a650e..2133476 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -231,10 +231,10 @@ endif()
- 
- # install license and notice files
- install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
--        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
-+        DESTINATION share/doc/sundials-5.7.0
- )
- install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
--        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
-+        DESTINATION share/doc/sundials-5.7.0
- )
- 
- # create package version file
diff --git a/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..d4e5fd929b3c
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
@@ -0,0 +1,29 @@
+From 554a760daeda3a04049bfa4cf882aae1207f833d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Apr 2021 11:58:25 +0200
+Subject: [PATCH] fix license install path
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40a650e..d57ca7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,10 +231,10 @@ endif()
+ 
+ # install license and notice files
+ install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+ install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+ 
+ # create package version file
+-- 
+2.31.1
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
deleted file mode 100644
index d58d6a9829ff..000000000000
--- a/sci-libs/sundials/sundials-3.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=(
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-	)
-	use superlumt && mycmakeargs+=(
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-5.7.0.ebuild b/sci-libs/sundials/sundials-5.7.0.ebuild
deleted file mode 100644
index dc933a9a83e0..000000000000
--- a/sci-libs/sundials/sundials-5.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_prepare() {
-	# bug #707240
-	append-cflags -fcommon
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc doc/*/*.pdf
-}
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
new file mode 100644
index 000000000000..894e7ef201cf
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90 2003"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran hypre lapack mpi openmp sparse +static-libs superlumt threads"
+REQUIRED_USE="
+	fortran? ( static-libs )
+	hypre? ( mpi )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? (
+		sci-libs/hypre:=[fortran?,mpi?]
+		virtual/mpi[fortran?]
+	)
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-fix-license-install-path.patch
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_prepare() {
+	# bug #707240
+	append-cflags -fcommon
+	use threads && append-ldflags -pthread
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_FORTRAN77_INTERFACE=$(usex fortran)
+		-DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DENABLE_HYPRE=$(usex hypre)
+		-DENABLE_KLU=$(usex sparse)
+		-DENABLE_LAPACK=$(usex lapack)
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PTHREAD=$(usex threads)
+		-DENABLE_SUPERLUMT=$(usex superlumt)
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DUSE_GENERIC_MATH=ON
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DEXAMPLES_ENABLE_C=ON
+			-DEXAMPLES_ENABLE_CXX=ON
+		)
+		if use fortran; then
+			mycmakeargs+=(
+				-DEXAMPLES_ENABLE_F77=ON
+				-DEXAMPLES_ENABLE_F90=ON
+				-DEXAMPLES_ENABLE_F2003=ON
+			)
+		fi
+	fi
+
+	if use fortran; then
+		mycmakeargs+=(
+			-DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran"
+		)
+	fi
+
+	if use hypre; then
+		mycmakeargs+=(
+			-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+			-DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so"
+		)
+	fi
+
+	if use sparse; then
+		mycmakeargs+=(
+		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 0b17cbea89fc..c7169c772a3d 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,8 +1,10 @@
 AUX superlu-4.3-autotools.patch 17799 BLAKE2B 0676f8a5ca9019aaf047503fc9be675a8de5ac8d68c182c50b23b75b46b793e04ee3560cfbdce2e9b3febc725520177d1e9571f2c75455e7e5ae65b7b8079e74 SHA512 c1f8bc4b0e5314266be9c11f0d536495e7414d62f0df996d5c9192796aa3604e363e1c07b5b6de5755006184cdd2efe04b938598b7936482f9ea091ea3c4dfec
 AUX superlu-4.3-format-security.patch 178 BLAKE2B 3e4982f52d99c79054449822caf2edf37b325e7eb2a49312f4ead42cc733877325c01b63502c1ebf45006ba5b0875109e4d38f919e7ad9f1f99d502daf619deb SHA512 661211470c6e0cefed1c403592c308354331fa9bf8332b86da36284036ba4f98d904b0d510c27232f7b3d84306d182e172a9a2acdd4f4618fec893ca74d27455
 AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26e614b935cc6a067cdd80cc29a4456d419ac20a2b7454f64c27c6dcafaba5eaa1fac1f957d2f78749e4209e73647346e2f62a9 SHA512 c0f5d203c7f764f3cc9e61a4d703cbbe66d0bb982412046af617be8935143026e8cc07d2fee2911d7e9cb7488bcdd32a26850b15eab4776f62a26f139066bb3c
+DIST superlu-5.3.0.tar.gz 2483070 BLAKE2B 2e877c12b698fae6649d3146d4a22a8c701df813d1fa037b7707081229de09e102660e75dd32138264ad9e01e5b3e820012106cd2b0d46cc2a1c37dc5eaafec2 SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
-EBUILD superlu-4.3-r2.ebuild 1635 BLAKE2B ba4e27e4efb6af31a9455169962183e0fd5846edcd2be58bf351d05efa049720841b24cb693f13b709b3141aabb2bcfc4b24ea6c5c0cb7aec273099d587b2c97 SHA512 c3a96fbda74aef2a155ccd532b5f0d42500ae693878359707c1055d7f9fbbe960c15e23fe27f364333112270311ca3e9a150606d2f03d4b023376a083d366265
-EBUILD superlu-5.2.2.ebuild 1177 BLAKE2B 5fd56a2a11d6b43057959bc45d8024c49d9a50e315ecfe5298181f90ad8a6add020d162495c0dec055386c20dd9e710eee31fce20d16e941c1b8d1ea51aa3d86 SHA512 8d95d9fe90b804249efae84486924baad16183813a98412f445dd68c0ba7a4607178988ad2b1220f49f269ab29f4f248b998c922d76b2dc068ecbffd3415df52
+EBUILD superlu-4.3-r2.ebuild 1641 BLAKE2B b11715c747a425f2a7e04568a994ca9973c228b2f811423d7e502659ce6bcc723899645aaf883ed9ef9b3a696645d0263c92ba7ea988efc3a32d297498ac5f37 SHA512 0d667b80c3f443786fe0e8b6fb93c20617b0ac8a2c1393204bd1a0fb1d9a3b6612fc47af48a089e2e99daf728441e3fca07b0cc4404b249d761e188f678f5d76
+EBUILD superlu-5.2.2.ebuild 1176 BLAKE2B 652712da2a495689e09e6aa3a0ee2c57d98f576d4c043d88c93c8aed7b380e278ed9ebbe60c3653191090ebc78cf23a4139844df7cf4b15a27cfad463dc98170 SHA512 c0a3a7aede1ad66ba964f32c5d5e5235df9119cb261cb6a48c68872cb0b5425665cf9beac930a7823bda7fc999a904a673faf905b59feafaa3e5bc3b532a61a3
+EBUILD superlu-5.3.0.ebuild 1204 BLAKE2B ac0a603cb9c00ddc690b9c04536c0c19a9bc16909b327636e5025a024c827e0a3e18aff4189ac0d6e03d999cbd1ef75858b092ca4b6cd10096cf92ed175dc1bf SHA512 b8842e9eb21c387914afc6206277cd3648c206aa63b9822f26aca52da3affe68a2ac87e4460ad9168902729c847a28e541ac83921738ccf3143afddd6a2dbd41
 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 5376cd8d1795..f4d198c2f6de 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -73,12 +73,12 @@ src_install() {
 
 	if use doc; then
 		dodoc DOC/ug.pdf
-		dodoc DOC/html/*
+		dodoc -r DOC/html/.
 	fi
 
 	if use examples; then
 		docinto examples
-		dodoc EXAMPLE FORTRAN
+		dodoc -r EXAMPLE FORTRAN
 	fi
 
 	find "${ED}" -name "*.a" -delete || die
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index 8c50ab63c95f..758d09bbdbe4 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -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 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu/superlu-5.3.0.ebuild b/sci-libs/superlu/superlu-5.3.0.ebuild
new file mode 100644
index 000000000000..e9e68e0bab56
--- /dev/null
+++ b/sci-libs/superlu/superlu-5.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_STANDARD=77
+
+inherit cmake fortran-2
+
+DESCRIPTION="Sparse LU factorization library"
+HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( app-shells/tcsh )
+"
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.2-no-internal-blas.patch
+)
+
+src_prepare() {
+	cmake_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_internal_blaslib=OFF
+		-Denable_tests=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r DOC/html
+	if use examples; then
+		docinto examples
+		dodoc -r EXAMPLE FORTRAN
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 94e8ecf94ab6..3443ba9bcf76 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,5 +1,5 @@
 DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
 EBUILD szip-2.1-r2.ebuild 721 BLAKE2B 158b84da0268e40008349a0c99448b28ede89802cbafebea5d85f3aa055f614ec7417cc0a0f4d93b16678e93c37dd25bd7463f79d2d0123008a72b76a4ecfcbf SHA512 25e9de35c1298ff24cb3476084102cad0bfd1effe2c79f24b147846eeb5906222325ef719d125de41b15d6db007ea962a018472840b0f7446ec6eae0f39f5ec1
-EBUILD szip-2.1.1.ebuild 734 BLAKE2B 78d794364d8a991f06531ba165dbf5d466624680c64ab138cf4aeff46d48c460c2b105e760d542cc5e76867524fb625a018132952aba28f4ef8590444ab782a8 SHA512 2567122aa671952e4e259a36b35caad512411cbd573ce1639bc14f10b74f679fe4dd961d3bdc2ad8432bc74315a99dec9f369d98b1af6a8b34320b4971e231fb
+EBUILD szip-2.1.1.ebuild 729 BLAKE2B 3edd5c408bc7d78b26a9295aa5c0d0eb46ecfad6dd445aabd53aa3602c3023da67fecdef5615f7939a28bd97df0046e196d97894341170b908185bcefc05f19f SHA512 db8e2adad3a5afd925662b8025492dce8ae347d00858b65e7225b5079e8c427e93a5439a79b8e7f4aad523cf09bbeaebc1d9d0b1f70d4f7a38c55d10288038e7
 MISC metadata.xml 766 BLAKE2B bd0e35e752baadb4deefad410c7e1d554cd412744af4a91acbeae68c04491b248d51f8169b81e529dfcc76b33ff8c2534f4b2dfadbda747309d3537de6ce5df2 SHA512 69ffab49952e563f8697a906f810ef7f8ae96bff70287b0f0a1f4c2b01212e6a3ba4fd89068948648979e53fd6efe1cc3c80e18584c54fdb6a8dc61cee21e14e
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index cf6d7a964766..c40a4a6bb077 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
author	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
commit	e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree	4c5f7db60483518201fef36f8cc0712789a08db2 /sci-libs
parent	391b5b359a346aff490103da7dddc85047f83830 (diff)