gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-libs
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
90 files changed, 2317 insertions, 1237 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b3c93804a118..c00464fa7389 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index d98139a5111a..376739447eff 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,7 +1,5 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
-DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
 DIST alglib-3.17.0.cpp.gpl.tgz 3065026 BLAKE2B bc939568a6bfb5e2717995e31b9d7cb485885217ff8d15c2bea3185b1ef62536766f80e02d43999c016e24b10181bddd4ad4ff27611ab19ebcc778a5cb15d55e SHA512 0e4b943b03707950813aea707ae3569ce75a22216c9a4b256b646db16609995b3b63a958b0b8fbe3d7d623d5ac03efbe7c4b1589961f2ca9cdefbd7e1cc0c721
-EBUILD alglib-3.10.0-r1.ebuild 747 BLAKE2B d308644af5f0d8cd54e3b9d97d0cfd7bb5904a6994509a2d1316710833d6f59433a021b44e01e5aa58048622f5dabcf20c2e4aa5ab5f1c1120273b45d2feeed7 SHA512 cb9cf3f23a1b13377eb15db1e6c37835eaa5ad9957cdcedaf6391725061bc0e233b8e6924edc7c0a63a3bbc3477f03a780c206538816625dcd32148424993270
-EBUILD alglib-3.17.0.ebuild 669 BLAKE2B 73f4442d08a0f61f9a79763f0a726fbae38ef533c26b910c88a3c83f4c08b5cee9a36458d032935028dcedb024f354241e97ba2916508afb1d2cfc41c465271c SHA512 52c79e2a3267305f8188a63a3b77cd6636531631ce661ce129e1ae135eae0d414e6e31f84ec85215b8ae1e616f0924c3afa2674d3f3b8ef1a001d4ab5aca2c05
+EBUILD alglib-3.17.0.ebuild 668 BLAKE2B 1ba7311c6e907b70553362ab8a8147416364c23cb51421142cad4235c6e8789f4b99765c7843e6e4a87e707e1af95624cadf9759880c9200972da08b60bd870e SHA512 c338df5444fbcc6a50cf60dde6e2979372bdd95dd90a765ca11c5f39bffe1983f434058bedddfbe39429b5debb9e050ca22d32c0ac7d10210be9c38cf0473630
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.10.0-r1.ebuild b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
deleted file mode 100644
index 234a3c9e71fa..000000000000
--- a/sci-libs/alglib/alglib-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Numerical analysis and data processing library"
-HOMEPAGE="https://www.alglib.net/"
-SRC_URI="https://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
-
-SLOT="0/3.8"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/cpp/
-
-PATCHES=( "${FILESDIR}/${P}-disable-minlm-test.patch" )
-
-src_prepare() {
-	cp "${FILESDIR}"/CMakeLists.txt-3.8.2 CMakeLists.txt || die
-	use x86 && append-cppflags -ffloat-store
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild
index f4f6adc9051a..e8fbf3344823 100644
--- a/sci-libs/alglib/alglib-3.17.0.ebuild
+++ b/sci-libs/alglib/alglib-3.17.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/cpp
 
 LICENSE="GPL-2+"
 SLOT="0/3.8"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index cdf3a0f67909..481523f1163d 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,5 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
-EBUILD armadillo-10.2.0.ebuild 3504 BLAKE2B 706fa316a6563911f9e4dcec84279dc17e8fbd65eb94c07ea2e3db2d670a74e681839cb277ddd754b46a1f75eea84aedf6752c87d5930ef7f0866e2cde951e2b SHA512 2811ad844e67c3dae361f80a279799dfe1b695376bd32d82d32356f1f33c89878c058228dfc329926a15bc840c7c8e08a7ed4652753be746a1129bd4991c65ec
-EBUILD armadillo-10.3.0.ebuild 3507 BLAKE2B 91405e1cd73e801d11dd5bd8a92b2b77b235592d96bfecc61049b3c93b21f17c65b04ee8eab8aacc7097dcf17258fc16b7e7aaf51023f9d05c1673fb92dfce7e SHA512 0e182d9c68a9c21967ac1f86a88a83d185ad76740f1ae42c64f1bfde75224b9f4c1da0db7660e30c121bf6a5bf843420df2d9914e2f8999acc060378455ab9ae
+EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B 1fe0375dd7c2e12d9698301d64506dab980fc772e45113375cdd1b8de4760545c8530f1b9ae83b53aa25d9b85e8127e046c7e5cc77e4d485383eb4bb4bf5e8e1 SHA512 09bcd99b2d3cca9519cf6e7236f9eef292995aacde116f71539d3e54c016f74e0f3584079bcbfd44bd30820ed6b9cb76433fe19a5a82c5673db0015950ae8650
+EBUILD armadillo-10.3.0-r1.ebuild 3488 BLAKE2B ed411f9e1eb824ed40d7331be23250486c97fff5a13700eaef3dce410ca92ab90f8f6e8f2cb8b0d5c4903e0cc7fedc96d1f547e2fde888cff37c50bda0361daf SHA512 5731a22737ea7b24f44303c6467ea820b73823d56d80b9b81189715f017130b86323911e1462c2612da2c20334ab5052720657430da3283820d951f6cecf3e26
 MISC metadata.xml 1455 BLAKE2B dd2a5e02b716e914005267eebf95de988339833b69e4fcd5f7f32d69beb9e04530aebbd4c338350c842f818ba10074debaa3f2a39300367ed65104f25a0bc924 SHA512 1ece1eaac64e507c4b7a706997a9dc70dc50b7930526b5c16336db5b3558c5066e6935064a2816c0f21455487bccf3a8d4a95d4b5f0e6fd9434a9cc1ae46fd50
diff --git a/sci-libs/armadillo/armadillo-10.2.0.ebuild b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
index 3dd605bc2960..0d7210c26cb8 100644
--- a/sci-libs/armadillo/armadillo-10.2.0.ebuild
+++ b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
@@ -138,10 +138,12 @@ src_test() {
 
 src_install() {
 	cmake_src_install
+
 	dodoc README.md
 	use doc && dodoc *pdf *html
+
 	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
+		docinto examples
 		dodoc -r examples/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/sci-libs/armadillo/armadillo-10.3.0.ebuild b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
index b0df3b4fe27d..b7abebcf9b1f 100644
--- a/sci-libs/armadillo/armadillo-10.3.0.ebuild
+++ b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
@@ -138,10 +138,12 @@ src_test() {
 
 src_install() {
 	cmake_src_install
+
 	dodoc README.md
 	use doc && dodoc *pdf *html
+
 	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
+		docinto examples
 		dodoc -r examples/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 80c8800ba9d6..5cf14e4af938 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,3 +1,3 @@
 DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
-EBUILD brial-1.2.10.ebuild 973 BLAKE2B 692fdbe27ed7475dda56eb7ef823d203ab8c7db5c9122a8464437178b7f8456bb5c7fb456ccfda0357f38045f99eac332b09a3ee81afe48cf7c486a21abf7f51 SHA512 8cb4121edcc1ebdd275e7659fef9f6a400b6e09788cc3e7e89297dd9a481b734b2a0de12d24541ac7fecc7b074c049faaee4e2337dd1914cbbaad6e94b99e7ec
+EBUILD brial-1.2.10.ebuild 957 BLAKE2B b37370aef6a8cadcdb0d5ed34b5640bc53eac4a90c1757f3de168c05622ca580b211fd935b0da9237456d4b78365498b85e0a1497a0feb7b124558d73504f09b SHA512 c536b54927457c463cddec863ea3e96753ed11d7fc40e5010b0416810185b3d0b2acf69f4e56e0bcb43cfcc10ade93a11e74dc932eecc28c8132a0c8e982a84c
 MISC metadata.xml 1076 BLAKE2B 475e333944585372d6ece664d99470d5a94d9f6fa43dde497e3aca70d16bdebfccb574e790f15f3175bc6f2b0d9cdfff6f0977af98a7198c2ddbd1df1e6440c6 SHA512 dac2bf9cf472ae000eb53878a6ad09924be52b7ed34a01a3b66b6359fde523d0f3cf72c53f7225c8b39f5b73c6c01b535d3742dce443b9cc37c9be116a77f72a
diff --git a/sci-libs/brial/brial-1.2.10.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
index 7b2dfededbac..704853e303aa 100644
--- a/sci-libs/brial/brial-1.2.10.ebuild
+++ b/sci-libs/brial/brial-1.2.10.ebuild
@@ -20,11 +20,9 @@ DEPEND="dev-libs/boost
 	sci-libs/m4ri[png=]"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
+src_configure() {
 	tc-export PKG_CONFIG
-}
 
-src_configure() {
 	# with-boost-libdir added to deal with some rather quirky setups
 	# see https://github.com/cschwan/sage-on-gentoo/issues/551
 	econf \
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 91352bc67780..49bf55216748 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,11 +1,4 @@
-AUX cantera-2.5.0_env.patch 2218 BLAKE2B b4fa7e25081ba5818163a16b970c8fde8a7faec64495a566b805d593151a48cd67722052e73ce1df70c751852d5e5e58e70d5ff110f0c8e4ef46262ddd951a1d SHA512 7045812de7d8cbcefaa8a22f2caf831bb0811d0c8b73a9f0550462fd2f8778f7f61aeaa8d1f6381a303063fbf7364a7cf22bcd40127bf0e1bc08418b8b10399c
 AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67
-AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
-AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6
-AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
-DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
-EBUILD cantera-2.4.0-r5.ebuild 3069 BLAKE2B 39717e82093e45822879a61834b49b64bab571b850d3e2efccc09e8f2667d9729edea788afb15fc056030d1239ff25bff7e6868ebd62000acd7efc72c3c55e4f SHA512 df6942fc36890820efc815873423b63aea4448b180b201c6ce4e85c4ae9cd67e54f21935de4a9351581f8913ae732c7c85bdb6348ed8dfe0da43cc503e1c1537
-EBUILD cantera-2.5.1-r1.ebuild 3469 BLAKE2B d93bb296e10fd82d3f237c05c6de8bfe14bfa6944c5790ded35a546a64cb821c5164910021f0930edc7cfbf968d6d57b17a69517e38f6b700e5e18350abe3647 SHA512 8a96107d237ffa1794c162b1edf5993fec05e25cb12b595251730ace675c45e3fcc91dc65103db4138c32dc028730150f80bd24e777c632d87da52c775161b5e
-EBUILD cantera-2.5.1.ebuild 3309 BLAKE2B c2719033675b6e1162ad13ff7499562932933c1ed21839cb3998fa1946697f939357a32a5d5c097ec01c38dbcf3b6ad782ef62d76d0602efbadb935b13cb05f5 SHA512 315c10d38a537fd5fe1166bd7018cd889f187b6f587fda0c8e2be42d14cd9904b2cef6605fa061e6f9df8f8a08042147a09e3bd6e46428e543400beb4eefe99b
+EBUILD cantera-2.5.1-r1.ebuild 3468 BLAKE2B 111b26d493dc8627991be85031ee4a9d01b0c29a98fc6acade73777520b64e5ed06273f05a926bdb15ad6fcf2818b58af74b8f8e41dca5424c0487976891298f SHA512 442a7cd16d14ae967ca7b64bfdba8c1395dea07089d3c1dbc0b05c56cd0ce6bb2bb9b63671005ef7134ef6b4f60d1f7c014b65b7cead8039e8910182a43eba2a
 MISC metadata.xml 841 BLAKE2B 6e302ea58d1e915a7b8f868c9e9e5f151434a3c1f8bd4583d0a2c3d28bd7cbd2d381b4c04dc9f2a3e63b3123ea566727ee275c9d4a13ada36f5fab34502fbac1 SHA512 59ffb087b063eeeb0446f66de657b745bea260ae96953673696d2780cb0d4ed86de718e0a3eaab6503e3395044c8c7291cc11e193d0bd72e720640f5df3d962a
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
deleted file mode 100644
index 9e953bbc0bc4..000000000000
--- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	<sci-libs/sundials-5.3.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}_${PV}_env.patch"
-	"${FILESDIR}/${PN}_${PV}_env_python_install_prefix.patch"
-	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${FFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-		python2_package="none"
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python3_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)" python3_prefix="$(python_get_sitedir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index 6f5345f106d5..db21ef944ead 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+cti fortran lapack pch +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/cantera/cantera-2.5.1.ebuild b/sci-libs/cantera/cantera-2.5.1.ebuild
deleted file mode 100644
index 71ba0f78c0f2..000000000000
--- a/sci-libs/cantera/cantera-2.5.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	dev-cpp/yaml-cpp
-	<sci-libs/sundials-5.3.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-		python? (
-			$(python_gen_cond_dep '
-				dev-python/h5py[${PYTHON_MULTI_USEDEP}]
-				dev-python/pandas[${PYTHON_MULTI_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.0_env.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${FCFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-		## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		system_yamlcpp="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-
-	# We install static libs unconditionally here
-	# See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cantera/files/cantera-2.5.0_env.patch b/sci-libs/cantera/files/cantera-2.5.0_env.patch
deleted file mode 100644
index 9551d4b4ca1c..000000000000
--- a/sci-libs/cantera/files/cantera-2.5.0_env.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur old/SConstruct new/SConstruct
---- old/SConstruct	2021-02-13 01:18:43.000000000 +0300
-+++ new/SConstruct	2021-02-13 01:27:06.000000000 +0300
-@@ -193,7 +193,7 @@
-     toolchain = ['default']
- 
- env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix', 'gch'],
--                  ENV={'PATH': os.environ['PATH']},
-+                  ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')},
-                   toolchain=toolchain,
-                   **extraEnvArgs)
- 
-@@ -724,10 +724,7 @@
- env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0)
- env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)
- 
--try:
--    env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD')
--except Exception:
--    env['git_commit'] = 'unknown'
-+env['git_commit'] = 'unknown'
- 
- # Print values of all build options:
- print("Configuration variables read from 'cantera.conf' and command line:")
-diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
---- old/interfaces/cython/SConscript	2021-02-13 01:18:43.000000000 +0300
-+++ new/interfaces/cython/SConscript	2021-02-13 01:59:29.000000000 +0300
-@@ -108,8 +108,7 @@
-     elif localenv['libdirname'] != 'lib':
-         # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
-         extra = localenv.subst(
--            ' --prefix=${{python_prefix}}'
--            ' --install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version))
-+            ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}')
-     else:
-         extra = '--user'
-         localenv.AppendENVPath(
-diff -Naur old/test_problems/SConscript new/test_problems/SConscript
---- old/test_problems/SConscript	2021-02-13 01:18:43.000000000 +0300
-+++ new/test_problems/SConscript	2021-02-13 01:42:19.000000000 +0300
-@@ -222,7 +222,7 @@
- CompileAndTest('VPsilane_test')
- 
- CompileAndTest('clib', 'clib_test', 'clib_test',
--               extensions=['^clib_test.c'], libs=['cantera_shared'])
-+               extensions=['^clib_test.c'])
- 
- # C++ Samples
- Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch
deleted file mode 100644
index 8b0926f7b916..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_env.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct
---- old/SConstruct	2018-08-24 16:24:45.000000000 +0300
-+++ new/SConstruct	2019-07-17 15:50:06.000000000 +0300
-@@ -189,7 +189,7 @@
-     toolchain = ['default']
- 
- env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix', 'gch'],
--                  ENV={'PATH': os.environ['PATH']},
-+                  ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')},
-                   toolchain=toolchain,
-                   **extraEnvArgs)
- 
-@@ -327,6 +327,14 @@
-         'prefix',
-         'Set this to the directory where Cantera should be installed.',
-         defaults.prefix, PathVariable.PathAccept),
-+    PathVariable(
-+        'libdirname',
-+        """Set this to the directory where Cantera libraries should be installed.
-+           Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems
-+           or could use some other library directory name instead of 'lib' depends
-+           on architecture and profile (e.g. Gentoo 'libx32' on x32 profile).
-+           If user didn't set 'libdirname' configuration variable set it to default value 'lib'""",
-+        'lib', PathVariable.PathAccept),
-     EnumVariable(
-         'python_package',
-         """If you plan to work in Python, then you need the ``full`` Cantera Python
-@@ -723,10 +731,7 @@
- env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version)
- env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2])
- 
--try:
--    env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD')
--except Exception:
--    env['git_commit'] = 'unknown'
-+env['git_commit'] = 'unknown'
- 
- # Print values of all build options:
- print("Configuration variables read from 'cantera.conf' and command line:")
-@@ -1061,7 +1066,7 @@
- 
-     # Ignore the minor version, e.g. 2.4.x -> 2.4
-     env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
--    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1'):
-+    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
-         print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
-         sys.exit(1)
-     print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
-@@ -1465,12 +1470,6 @@
- # *** Set additional configuration variables ***
- # **********************************************
- 
--# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems
--if any(name.startswith('/usr/lib64/python') for name in sys.path):
--    env['libdirname'] = 'lib64'
--else:
--    env['libdirname'] = 'lib'
--
- # On Debian-based systems, need to special-case installation to
- # /usr/local because of dist-packages vs site-packages
- env['debian'] = any(name.endswith('dist-packages') for name in sys.path)
-diff -Nur old/cantera-2.4.0/test_problems/SConscript new/cantera-2.4.0/test_problems/SConscript
---- old/test_problems/SConscript	2018-08-24 16:24:45.000000000 +0300
-+++ new/test_problems/SConscript	2019-07-17 15:41:35.000000000 +0300
-@@ -282,7 +282,7 @@
- CompileAndTest('VPsilane_test', 'VPsilane_test', 'VPsilane_test', 'output_blessed.txt')
- 
- CompileAndTest('clib', 'clib_test', 'clib_test', 'output_blessed.txt',
--               extensions=['^clib_test.c'], libs=['cantera_shared'])
-+               extensions=['^clib_test.c'])
- 
- # Force explicitly-named tests to run even if SCons thinks they're up to date
- for command in COMMAND_LINE_TARGETS:
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch
deleted file mode 100644
index 838907996361..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_env_python_install_prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
---- old/interfaces/cython/SConscript	2018-08-24 16:24:45.000000000 +0300
-+++ new/interfaces/cython/SConscript	2019-08-14 04:28:41.000000000 +0300
-@@ -83,10 +83,10 @@
-             extra = ''
-         elif localenv['OS'] == 'Darwin':
-             extra = localenv.subst(' --prefix=${python%s_prefix}' % major)
--        elif localenv['libdirname'] == 'lib64':
--            # 64-bit RHEL / Fedora
-+        elif localenv['libdirname'] != 'lib':
-+            # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
-             extra = localenv.subst(
--                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor))
-+                ' --prefix=${stage_dir}${prefix} --install-lib=${python%s_prefix}' % (major))
-         else:
-             extra = '--user'
-             localenv.AppendENVPath(
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
deleted file mode 100644
index 0b4d3abf8541..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -Naur a/SConstruct b/SConstruct
---- a/SConstruct	2020-04-21 13:55:06.000000000 +0300
-+++ b/SConstruct	2020-04-21 13:55:54.000000000 +0300
-@@ -1013,23 +1013,29 @@
- 
- import SCons.Conftest, SCons.SConf
- context = SCons.SConf.CheckContext(conf)
--ret = SCons.Conftest.CheckLib(context,
--                              ['sundials_cvodes'],
--                              header='#include "cvodes/cvodes.h"',
--                              language='C++',
--                              call='CVodeCreate(CV_BDF, CV_NEWTON);',
--                              autoadd=False,
--                              extra_libs=env['blas_lapack_libs'])
--if ret:
-+
-+# Check initially for Sundials<=3.2 and then for Sundials>=4.0
-+for cvode_call in ['CVodeCreate(CV_BDF, CV_NEWTON);','CVodeCreate(CV_BDF);']:
-+    ret = SCons.Conftest.CheckLib(context,
-+                                  ['sundials_cvodes'],
-+                                  header='#include "cvodes/cvodes.h"',
-+                                  language='C++',
-+                                  call=cvode_call,
-+                                  autoadd=False,
-+                                  extra_libs=env['blas_lapack_libs'])
-     # CheckLib returns False to indicate success
-+    if not ret:
-+        if env['system_sundials'] == 'default':
-+            env['system_sundials'] = 'y'
-+        break
-+
-+# Execute if the cycle ends without 'break'
-+else:
-     if env['system_sundials'] == 'default':
-         env['system_sundials'] = 'n'
-     elif env['system_sundials'] == 'y':
-         config_error('Expected system installation of Sundials, but it could '
-                      'not be found.')
--elif env['system_sundials'] == 'default':
--    env['system_sundials'] = 'y'
--
- 
- # Checkout Sundials submodule if needed
- if (env['system_sundials'] == 'n' and
-@@ -1066,13 +1072,14 @@
- 
-     # Ignore the minor version, e.g. 2.4.x -> 2.4
-     env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
--    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
-+    sundials_ver = LooseVersion(env['sundials_version'])
-+    if sundials_ver < LooseVersion('2.4') or sundials_ver >= LooseVersion('6.0'):
-         print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
-         sys.exit(1)
-     print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
- 
-     #Determine whether or not Sundials was built with BLAS/LAPACK
--    if LooseVersion(env['sundials_version']) < LooseVersion('2.6'):
-+    if sundials_ver < LooseVersion('2.6'):
-         # In Sundials 2.4 / 2.5, SUNDIALS_BLAS_LAPACK is either 0 or 1
-         sundials_blas_lapack = get_expression_value(['"sundials/sundials_config.h"'],
-                                                        'SUNDIALS_BLAS_LAPACK')
-@@ -1690,7 +1697,7 @@
- 
- if env['system_sundials'] == 'y':
-     env['sundials_libs'] = ['sundials_cvodes', 'sundials_ida', 'sundials_nvecserial']
--    if env['use_lapack'] and LooseVersion(env['sundials_version']) >= LooseVersion('3.0'):
-+    if env['use_lapack'] and sundials_ver >= LooseVersion('3.0'):
-         if env.get('has_sundials_lapack'):
-             env['sundials_libs'].extend(('sundials_sunlinsollapackdense',
-                                          'sundials_sunlinsollapackband'))
-diff -Naur a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h
---- a/include/cantera/numerics/CVodesIntegrator.h	2018-08-24 16:24:45.000000000 +0300
-+++ b/include/cantera/numerics/CVodesIntegrator.h	2020-04-21 13:55:54.000000000 +0300
-@@ -49,7 +49,6 @@
-         m_maxord = n;
-     }
-     virtual void setMethod(MethodType t);
--    virtual void setIterator(IterType t);
-     virtual void setMaxStepSize(double hmax);
-     virtual void setMinStepSize(double hmin);
-     virtual void setMaxSteps(int nmax);
-diff -Naur a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h
---- a/include/cantera/numerics/Integrator.h	2018-08-24 16:24:45.000000000 +0300
-+++ b/include/cantera/numerics/Integrator.h	2020-04-21 13:55:54.000000000 +0300
-@@ -34,17 +34,6 @@
-     Adams_Method //! Adams
- };
- 
--//! Specifies the method used for iteration.
--/*!
-- * Not all methods are supported by all integrators.
-- */
--enum IterType {
--    //!  Newton Iteration
--    Newton_Iter,
--    //! Functional Iteration
--    Functional_Iter
--};
--
- //!  Abstract base class for ODE system integrators.
- /*!
-  *  @ingroup odeGroup
-@@ -163,11 +152,6 @@
-         warn("setMethodType");
-     }
- 
--    //! Set the linear iterator.
--    virtual void setIterator(IterType t) {
--        warn("setInterator");
--    }
--
-     //! Set the maximum step size
-     virtual void setMaxStepSize(double hmax) {
-         warn("setMaxStepSize");
-diff -Naur a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp
---- a/src/kinetics/ImplicitSurfChem.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ b/src/kinetics/ImplicitSurfChem.cpp	2020-04-21 13:55:54.000000000 +0300
-@@ -79,7 +79,6 @@
-     // numerically, and use a Newton linear iterator
-     m_integ->setMethod(BDF_Method);
-     m_integ->setProblemType(DENSE + NOJAC);
--    m_integ->setIterator(Newton_Iter);
-     m_work.resize(ntmax);
- }
- 
-diff -Naur a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp
---- a/src/numerics/CVodesIntegrator.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ b/src/numerics/CVodesIntegrator.cpp	2020-04-21 13:55:54.000000000 +0300
-@@ -88,7 +88,6 @@
-     m_type(DENSE+NOJAC),
-     m_itol(CV_SS),
-     m_method(CV_BDF),
--    m_iter(CV_NEWTON),
-     m_maxord(0),
-     m_reltol(1.e-9),
-     m_abstols(1.e-15),
-@@ -218,17 +217,6 @@
-     }
- }
- 
--void CVodesIntegrator::setIterator(IterType t)
--{
--    if (t == Newton_Iter) {
--        m_iter = CV_NEWTON;
--    } else if (t == Functional_Iter) {
--        m_iter = CV_FUNCTIONAL;
--    } else {
--        throw CanteraError("CVodesIntegrator::setIterator", "unknown iterator");
--    }
--}
--
- void CVodesIntegrator::sensInit(double t0, FuncEval& func)
- {
-     m_np = func.nparams();
-@@ -284,7 +272,11 @@
-     //! Specify the method and the iteration type. Cantera Defaults:
-     //!        CV_BDF  - Use BDF methods
-     //!        CV_NEWTON - use Newton's method
--    m_cvode_mem = CVodeCreate(m_method, m_iter);
-+    #if CT_SUNDIALS_VERSION < 40
-+        m_cvode_mem = CVodeCreate(m_method, CV_NEWTON);
-+    #else
-+        m_cvode_mem = CVodeCreate(m_method);
-+    #endif
-     if (!m_cvode_mem) {
-         throw CanteraError("CVodesIntegrator::initialize",
-                            "CVodeCreate failed.");
-@@ -394,7 +386,11 @@
-         #if CT_SUNDIALS_VERSION >= 30
-             SUNLinSolFree((SUNLinearSolver) m_linsol);
-             SUNMatDestroy((SUNMatrix) m_linsol_matrix);
--            m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
-+            #if CT_SUNDIALS_VERSION < 40
-+                m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
-+            #else
-+                m_linsol_matrix = SUNBandMatrix(N, nu, nl);
-+            #endif
-             #if CT_SUNDIALS_USE_LAPACK
-                 m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
-             #else
-diff -Naur a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp
---- a/src/numerics/IDA_Solver.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ b/src/numerics/IDA_Solver.cpp	2020-04-21 13:55:54.000000000 +0300
-@@ -442,7 +442,11 @@
-         #if CT_SUNDIALS_VERSION >= 30
-             SUNLinSolFree((SUNLinearSolver) m_linsol);
-             SUNMatDestroy((SUNMatrix) m_linsol_matrix);
--            m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
-+            #if CT_SUNDIALS_VERSION < 40
-+                m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
-+            #else
-+                m_linsol_matrix = SUNBandMatrix(N, nu, nl);
-+            #endif
-             #if CT_SUNDIALS_USE_LAPACK
-                 m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
-             #else
-diff -Naur a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp
---- a/src/zeroD/ReactorNet.cpp	2018-08-24 16:24:45.000000000 +0300
-+++ b/src/zeroD/ReactorNet.cpp	2020-04-21 13:55:54.000000000 +0300
-@@ -28,7 +28,6 @@
-     // numerically, and use a Newton linear iterator
-     m_integ->setMethod(BDF_Method);
-     m_integ->setProblemType(DENSE + NOJAC);
--    m_integ->setIterator(Newton_Iter);
- }
- 
- void ReactorNet::setInitialTime(double time)
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index bb4af472b40a..96814208e5ab 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,5 +1,3 @@
-DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b60285e7dfa760905e2cb5b01f1570c27920728c12fc6994135e4b29ba8e1709066ddf2e2eff00f8f48b093ebd43e SHA512 b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6
 DIST cddlib-0.94m.tar.gz 1351298 BLAKE2B 0e1931ba94771f0dcae0ee10b003940ca331839eb8ce001ab02c4f1b382dde74d7dfcf74f4c62e1ae7214a3139547c09f56ef0cba5df74fc03a63ab741b64690 SHA512 50997bda38c36990456345881dc1eac65b1880aa510ea3812ae46a122ba7696bf3577f2b6976ff16811ee00f0a920c8ed6f1e7de0a4060bfaa96def11bab816e
-EBUILD cddlib-094j.ebuild 1396 BLAKE2B 032b697c46fd170dea85951451389f30fafe5ec67cee387583514bc8cff83ee8e5bf570308078f14deb88d42821bfaae6f8f847aa4e8df83827a00f81f413f2b SHA512 3fe5afeedefabaae12a1becc1ec735020802cf4b4b8184591a4b51c34147b087fbcf1a4a46c246ddf84a7dd320c056f70d6739a13c76d662776755e9dc125c74
-EBUILD cddlib-094m-r1.ebuild 1409 BLAKE2B 5d2d806df3b05611cdfe8ce235f1aa97917b9989cfbb3f4e5293b88817c6874e799d23bb823d63e434a70a16457855686124cb9c6b2ac4179966f9f69aeb26c1 SHA512 b9c324bb0c382fae96518e7e1cba92b20a3ee240dad56d402c521cb92aabfbb6c2c5297913b7fcc49dc5465b9527a0e8611602da68f1d91b85a9d261572944ca
+EBUILD cddlib-094m-r1.ebuild 1406 BLAKE2B 9fd279d6051a414e49c84f40f70e10f00f0de47788d4ce3b0f5e381c56847affbb79a336a79d96d0d11d92ff26043d4f13b70f9fff9e685da3af8f43ad5a791f SHA512 83195fe0ff4f39e76885119d6c0aad8d61799b3db2317f7c6ec89f935ef45fd669db252ae7260c92efb24787795ef445c9450dc5a71e460a7586bd61f803409b
 MISC metadata.xml 1847 BLAKE2B 2917e4e43137206b759b78f5fa5d94f68f7dbf767e648ace868c3052a7351fcf1184232817141987e730ab596e0bb7c48c3273a872e7e1e5ec3ca60685055462 SHA512 70d46548955ccce28224210acafbafe4bf12dc471950298f214a9db78107d13c011cfc472fa41d9d5b14001bdb29d1afed0653683186085d37b6d117980cc8b7
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
deleted file mode 100644
index e53e3ec982f7..000000000000
--- a/sci-libs/cddlib/cddlib-094j.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This should have been dealt with versionator in the direction
-# 0.94x -> 094x - now we are screwed.
-MY_PV="0.94j"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="C library implementing the Double Description Method"
-HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs tools"
-
-DEPEND="dev-libs/gmp:0"
-RDEPEND="dev-libs/gmp:0="
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use tools; then
-		rm "${ED}"/usr/bin/* || die
-	fi
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	# Nobody wants the dvi/ps manual...
-	rm "${ED}/usr/share/doc/${PF}"/cddlibman.{dvi,ps} || die
-
-	# since the PDF manual is installed by default.
-	if ! use doc; then
-		rm "${ED}/usr/share/doc/${PF}"/cddlibman.pdf || die
-	fi
-
-	# The docs and examples are *both* installed by default, so we
-	# have to remove the examples if the user doesn't want them.
-	docompress -x "/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d}
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d} || die
-	fi
-}
diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild
index 6dc83abed745..3fd1ce1f01e5 100644
--- a/sci-libs/cddlib/cddlib-094m-r1.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 2b78dc445a4e..63a89ad3bdb9 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,6 +1,7 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
 AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
 AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
+AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953
 DIST cdf350crm.pdf 2139671 BLAKE2B fbfcc12d919ca07beb1df621f967bbe69b33d0c403613e1b12c01354e53e86f93920104d24dab4f3d1260d72f5e6de663ae3a87ef310dfabf46af2c216424f07 SHA512 382c3cfd73b7c75a017f0c563c61473fccc11ca344f33f4f5a543f4c339a52879400532dbff9956ae8c2b7706f63223132666c3154ad7ada281cd4418e48b4dd
 DIST cdf350frm.pdf 2194293 BLAKE2B 40b269a7987a1522ec7f92eae8efba1117993e459df574afe89d5325d21c3e685a5ed09216bfa56e22f40e831c99bf6d69faa14b9d3a1014d1cbceba43dc3bc9 SHA512 1c1db067f42b56ddb01399821103ced7207da1dc191f62f7acf6776a05c15a992f7be060790233e1b94444724aedb6f83ba687f60b7a20b4988f9d591b40d481
 DIST cdf350jrm.pdf 4009791 BLAKE2B 5b0ea4fcfe2237b4105707d2a3a9945e13333c4ee073d7d9a5a2b839a250308697aa9291aa1e224b886f821235b4d6c4f5f5304a1ad61d45436e1dc4f2b0425a SHA512 cf42de6d94168337936403fc2e504b03fdd676ae8daf8020186d3261bc7331822d47b7c509c804ca5fd637af3696308d09c5db102aaa546138d0630c3df999c3
@@ -9,5 +10,15 @@ DIST cdf350ug.pdf 1396156 BLAKE2B 39f3e3b0441ef103c9131b3c5523c5a387eb785d545c68
 DIST cdf35_0-dist-cdf.tar.gz 1137065 BLAKE2B df3235338e63686dd0446663b8738618c45c4e86c858b4f41d3326ebf14d391ecce43309cf5d6a3db4a9f9e53820bf8a73acb77549a0432594859b24acb7eb84 SHA512 f26bd1e298494563cb30c52751bd175124814dca2fe2c05ae056d6c2ad905fb5ddc7da35888c6a07d69914f52481cb4e9fcab9684c9a8a0ca4b80ca449ad3406
 DIST cdf35_0-dist-java.tar.gz 724055 BLAKE2B 563542821106b040bb0eaefa303cbda46ace5a127cda1936c55e5eaf3b395eb67073a622e84d1bfc33cb65faa4b51710008cfbae86fd680e5cca2c80dbc5162b SHA512 2e69447e9c36ced39a6bfcd1f2a5dfa7c36c04e9a5acac12952c1b415c5191471efbf2cc432b5b31eb37c8ee31bda3e27bce0fa266c5549fb1b0ab86c4dd6c4f
 DIST cdf35ifd.pdf 560458 BLAKE2B c44722d30c4217b492fe140833ae9c58721040b629cf414fe8d9d7d44433b3f62241d621d4b6d634f54e4f0ecb4c026b66a1e752a1d868b0861eed54d4a95bee SHA512 018a524f7fc8dc5b8b3512ed8bdea42bae141eb65d24b4fbbdac6ecebaeac5c458caf3a476fc4b7c0313b17441cbe7dce32d1002f9344d056cd46853ee3cd438
-EBUILD cdf-3.5.0.2.ebuild 3205 BLAKE2B 7932444280df28afa7142c3f79befbe9764257410d35173d5fd604c6897de15ab365b14662630b720f79a8ea3e2c49859af4033f38672a80094d328ef03adfef SHA512 f4cef0a15d1ee771abb614d5244a69a1d6209ce6fe65a337ed59c0c621f964d89643a279192df5a07edd74666b53ddc0d7e52c5bd282439237e6e52426a655a6
+DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
+DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
+DIST cdf380frm.pdf 2570409 BLAKE2B c8fb1444c7e02297af0c3bffbf58c048077e0d69c4aca8cb3e48331f496dba1551289d2e2b95f9f2d9fabe8048bd56f73a72bab58a52772cae22f184a6b39745 SHA512 de90e4893b976ab9e77f1e9512b2f310b043b8dc921ca43cf1d37e767bf5cbae5d06f91388ff5f4fb1258db5a1149712fa9a5dbc1c2d18f78705021fc31087bb
+DIST cdf380prm.pdf 1521804 BLAKE2B 4afa792f3b5f2bda7e896e10ccb6b2b073e127fca9ece229bb3dbe3b8e8920ef5b8cce5a45a15fa648525c8241fbcc678c8eea0a32a3dabad4cd3b9e959e0913 SHA512 413ce06f36d151cc5380884111376fb54108fcf692ac56ed4d96204f56d4d434ca695d42114e1e89626288802cb4d5d48097664e8e0411a041950aff8199fea0
+DIST cdf380ug.pdf 1716882 BLAKE2B e36f0a9624756d6d5bf71fcc0958d33d060b7f32dd7bbb93fcf6a58a33a5154017fd0ba8a598fe652919785398d306e84fe7a89b5c4aa0d305ee0bc2fbf20b8f SHA512 f2e865b55d293a17a5d85c36e04d14050b7f17adc97dfc284d95db36ae1b94678e31b107cbab32ad690630bbde0f3f0caf558ecdb4e1d0e60cd5f53b30faa0fc
+DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a787bcdb9d179d334f4cb79f2b5c6d98427ab9a6451b44e333f48932c152674ce7c9229291b3b714e0f70 SHA512 8552d1f1a83a0f327bc20e8dc03f8728aad132e5765084839ee02900d19c93f9c7f67a1e3f4429cc01d51d75ab00b666d18a247522da2b4fda529cf6333889b5
+DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
+DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
+DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
+EBUILD cdf-3.5.0.2.ebuild 3224 BLAKE2B 9df2c75735c47956c48404dfe407b90fd85b3409f0f97b162711206cd21d25ac78c622f3448423b73f037eff31b9e7e80e469a31b5697f6c29794a569045e113 SHA512 4d5c92f58891aeb519ddf4a0975d642cc2166e87b79fb137bf97b265491d678ead449f6f07f28574f568e269fb216e82c9ad23811dfc109879a77148fb4adcbd
+EBUILD cdf-3.8.0.ebuild 3250 BLAKE2B d8aae20b0039338238f3331368966779e82a77eb55035728a3f198ba8a6bf2e7ab337bc44c4f6c6e9982919fc45bcf35e7032d613c4d1f4c7e9e9185a049bdcb SHA512 20819048c9c075111701f20f2189722fdcf5c709e9ed8518ae8dfb0ce4cb6aa89dd0743d8c154ca30c86f8fa84882833cc89038ec68591aac95c0dc5f0e3b47a
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index 1bdd8d2b12b9..2942136cd5fb 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -27,6 +27,7 @@ LICENSE="CDF"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
 
 RDEPEND="
 	java? ( >=virtual/jre-1.5:= )
diff --git a/sci-libs/cdf/cdf-3.8.0.ebuild b/sci-libs/cdf/cdf-3.8.0.ebuild
new file mode 100644
index 000000000000..4350f3e58cc9
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.8.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multilib toolchain-funcs
+
+MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
+MY_P="${MY_DP}_$(ver_cut 3)"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="https://cdf.gsfc.nasa.gov"
+SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
+
+SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
+	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
+	doc? (
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
+	)"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.8:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+# respect cflags, ldflags, soname
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# use proper lib dir
+	sed -i \
+		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	PV_SO=${PV:0:1}
+	emake \
+		OS=linux \
+		CC=$(tc-getCC) \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
+		CURSES=$(usex ncurses) \
+		${myconf} \
+		all
+
+	if use java; then
+		export CDF_BASE="${S}"
+		export CDF_LIB="${S}/src/lib"
+		cd cdfjava/jni
+		$(tc-getCC) \
+			${CFLAGS} -fPIC \
+			-I${CDF_BASE}/src/include \
+			-I$(java-config -O)/include \
+			-I$(java-config -O)/include/linux \
+			-c cdfNativeLibrary.c \
+			-o cdfNativeLibrary.o \
+			|| die "compiling java lib failed"
+		$(tc-getCC) \
+			${LDFLAGS} \
+			-shared cdfNativeLibrary.o \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-L${CDF_LIB} -lcdf -lm \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir)
+	# -j1 (fragile non-autotooled make)
+	emake -j1 \
+		INSTALLDIR="${ED}/usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
+	dodoc Release.notes CHANGES.txt Welcome.txt
+	doenvd "${FILESDIR}"/50cdf
+
+	if use doc; then
+		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/examples
+		dodoc samples/*
+	fi
+
+	if use java; then
+		cd cdfjava || die
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		java-pkg_dojar */*.jar
+		if use examples; then
+			docinto /usr/share/doc/${PF}/examples/java
+			dodoc examples/*
+		fi
+	fi
+
+	# move this to a better location
+	dodir "/usr/share/${PF}"
+	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
+}
diff --git a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
new file mode 100644
index 000000000000..8ffd226a1ed1
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
@@ -0,0 +1,96 @@
+diff --git a/Makefile b/Makefile
+index 9857fa9..6dc0953 100644
+--- a/Makefile
++++ b/Makefile
+@@ -896,7 +896,7 @@ install.tools: create.bin copy.tools
+ install.help_: create.help copy.help
+ 
+ install.lib: create.lib copy.lib.a
+-	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
++	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
+ 	   $(MAKE) MAKE=$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
+ 	 else \
+ 	   $(NULL) ; \
+@@ -1010,10 +1010,10 @@ copy.include:
+ 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
+ 
+ copy.lib.so:
+-	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+-	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so
+-	      rm -f $(INSTALLDIR)/lib/libcdf.so
+-	      cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so
++	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
++	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib/libcdf.$(VERSION).so
++	      rm -f $(INSTALLDIR)/lib/libcdf.$(SHAREDEXT)
++	      cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.$(SHAREDEXT)
+ 
+ copy.lib.sl:
+ 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
+diff --git a/src/lib/Makefile b/src/lib/Makefile
+index 2017c46..b666ce3 100644
+--- a/src/lib/Makefile
++++ b/src/lib/Makefile
+@@ -62,9 +62,9 @@ AR=ar
+ RANLIBcmd=ranlib
+ MACos=Darwin
+ 
+-CFLAGS=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
++CFLAGS+=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
+ CFLAGS2=-DZ_PREFIX
+-LDFLAGS=$(LDOPTIONS)
++LDFLAGS+=$(LDOPTIONS)
+ ARFLAGS=$(AROPTIONS)
+ ZLIB=zlib
+ 
+@@ -120,13 +120,13 @@ ranlib.yes:
+ 
+ shared.yes: libcdf.$(SHAREDEXT)
+ 
+-libcdf.so \
++libcdf.$(SHAREDEXT) \
+ libcdf.dylib \
+ libcdf.dll \
+ libcdf.sl: $(OBJs)
+ 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
+-	@echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+-	      $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++	@echo $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
++	      $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
+ #	@if [ $(MACVERSION) -gt 0 ]; then \
+ #	  rm -f $(MACLIB)/$@; \
+ #	  cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \
+@@ -134,8 +134,8 @@ libcdf.sl: $(OBJs)
+ #	fi
+ 
+ libcdf.o: $(OBJs)
+-	@echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+-	      $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++	@echo $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++	      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+ 
+ .c.o:
+ 	@if [ "$<" = "cdfgzip.c" ] || [ "$<" = "cdfgzip64.c" ] ; then \
+diff --git a/src/tools/Makefile b/src/tools/Makefile
+index bac4ca0..ef44264 100644
+--- a/src/tools/Makefile
++++ b/src/tools/Makefile
+@@ -33,7 +33,7 @@
+ SHELL=/bin/sh
+ 
+ CURSES=yes
+-CCx=gcc
++CCx=$(CC)
+ COPTIONS=-I/usr/include/ncurses -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -O2
+ COPTIONSld=
+ SYSLIBS=-lgcc
+@@ -43,8 +43,8 @@ MAKE=make
+ INCLUDEcdf= ../include
+ 
+ CC=$(CCx)
+-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
+-CFLAGSld=$(COPTIONSld)
++CFLAGS+=$(COPTIONS) -I$(INCLUDEcdf)
++CFLAGSld=$(COPTIONSld) $(LDFLAGS)
+ 
+ WHICHOS=$(shell uname -a | cut -f1 -d" ")
+ ifeq ("$(WHICHOS)","Darwin")
diff --git a/sci-libs/cmpfit/Manifest b/sci-libs/cmpfit/Manifest
index ba65284ae88a..845526fd1b2f 100644
--- a/sci-libs/cmpfit/Manifest
+++ b/sci-libs/cmpfit/Manifest
@@ -1,5 +1,3 @@
-DIST cmpfit-1.2.tar.gz 30431 BLAKE2B 3613fc307b0f1cd792ea9b1436109da77960dcb1985920de2c97e3b8f22d49d68358c0077dd3af5c6d2ea6e7b172d715643221b8df8f84a704688fda2f1ef51a SHA512 232a39538396f166efd9c7a9fc687e0ac8fd3090f871f54fb0c131a1ed02cc05a60904894d853d8eb76d88e70a1fbab4bce3ad0b5990408c77d5a6028a3b466c
 DIST cmpfit-1.4.tar.gz 30659 BLAKE2B f076f69e83d1eb78eda2894cded85f920cef1c95bcb60b042e98d33919e12cac62ffe4ad76ddc9ca0ef17f887289dc37b0bde969e4e04470b491b03b841bbeea SHA512 0a0c869bcf202a0dbc9fd6b6939a6382cc8701f09ca9aada90dde809135c2a8436709a84a8be53696e8d09f49f1d14f80c9d4c8c1c6cd418260939fc0ec5dced
-EBUILD cmpfit-1.2-r1.ebuild 1113 BLAKE2B 337ec245d43379a061e9ebdfe3b6f452cf9bac62f33b4c918ae599ba7bc1cf1174fd395a30e17f6eebbdd4138d9962b513c0bd865d528cee508fbe2b829b2b37 SHA512 7b5f03cdf045396ec88611dcc75e8776cb1313d707273a538cd05a10ff61c8f99c7cf5db425f1928d0950be627d0a2cee30156476c7df4ee111fd64a8dc3d54e
 EBUILD cmpfit-1.4.ebuild 896 BLAKE2B 7ee10f67c79d0ba016e53ae5e8dc79fd9fad8d97460d20fa92461976a57024ce9a9d41017d0d67cacdcb625f7d1d8b4b797eddc56f19f99d20a1883641d7a658 SHA512 e1ebcc31bf049818154cde4d96b9197444f0ceeca2c9be7752c057b12915c3c9de8e5cb98b774f7334411e60cf602f41f95f5d1425608e3975d5826bec4bf635
 MISC metadata.xml 622 BLAKE2B 28a0413ff6666359d8d905c6a057f53a489f8314b32411de6737e4876c2916a4a48f034f33278aeab54e7d6adc79af8584e40d71af7174b0b90f00ba362e740a SHA512 90f290806ede879fb12e180453c46f76e9f505e7bb61deb72a8a127a8493f08daa6f1b432288e0400b44ceef6346e5cc760940ce45ec1a8a5e5ef80305f6d9e7
diff --git a/sci-libs/cmpfit/cmpfit-1.2-r1.ebuild b/sci-libs/cmpfit/cmpfit-1.2-r1.ebuild
deleted file mode 100644
index 4ddf2df64b53..000000000000
--- a/sci-libs/cmpfit/cmpfit-1.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MINPACK-1 Least Squares Fitting Library in C"
-HOMEPAGE="http://www.physics.wisc.edu/~craigm/idl/cmpfit.html"
-SRC_URI="http://www.physics.wisc.edu/~craigm/idl/down/${P}.tar.gz"
-
-LICENSE="public-domain minpack"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DOCS=( README DISCLAIMER )
-
-src_compile() {
-	if use static-libs; then
-		$(tc-getCC) ${CFLAGS} -c mpfit.c || die "non-PIC compilation failed"
-		$(tc-getAR) cr libmpfit.a mpfit.o || die "creation of static archive failed"
-	fi
-	$(tc-getCC) ${CFLAGS} -fPIC -c mpfit.c -o mpfit.so || die "PIC compilation failed"
-	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname=libmpfit.so mpfit.so -lm -o libmpfit.so || die "linking failed"
-}
-
-src_test() {
-	$(tc-getCC) ${CFLAGS} testmpfit.c -L. -lmpfit -lm -o testmpfit || die
-	LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} ./testmpfit || die
-}
-
-src_install() {
-	dolib.so libmpfit.so
-	use static-libs && dolib.a libmpfit.a
-	doheader mpfit.h
-	einstalldocs
-}
diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 05c95cf6f935..505b7aac202c 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1,3 +1,3 @@
 DIST coinor-dip-0.95.0.tar.gz 5213061 BLAKE2B 6f40e5d20832b0463e302519da168a30bdeea011a45047acb9dbe904763fc94ccaffbee3599b6f959e0eea5e40a0456771012707b9daafc50875194a1ff9967e SHA512 a9ea2bc23d625fa19e11943f46b3bf2db49aa894fe336c8de4a9a0c735e1569bd8bef015fd671eb856ee39a334adf06c95e2708bd69c4735d5f6bf994c9e41a2
-EBUILD coinor-dip-0.95.0-r1.ebuild 1313 BLAKE2B 905ec39fbafd8a632533826c8c06b1d8c70704b28b17575bc19431eca6517b6c04207b9ba5184bf10aa4c6c8920c9d6f52f004aaa3251a43bea7bd835dacfa08 SHA512 c1069c63cad11b9c38ba9f99198b0ad44b132d49b29e481b041cbbb82923f7eaf366e48e6fb2358b4cc3d601556ae37d43ae92e7cba8543a2ff84ce89a5e57d0
+EBUILD coinor-dip-0.95.0-r2.ebuild 1427 BLAKE2B e74ec06e5ca923ab5b15f91890e48b590ad73a5ea4d8c4833b6fe7047271a7843ce871f846e663b0f29a5acfb295d7b5399c403203d4bc42838bbc8be1528761 SHA512 5fe82fc17304c88ca7eeb6c10101f98e57e882f0143394b4e3f6ec521fdfca8415d05978f505d56c7eeef9b6d29fb1d0d5c20a3b33c5b5ece43a3ebc427b5db0
 MISC metadata.xml 798 BLAKE2B 44623c203a56df6ad4a5fedd020357ea090f71597bc503fc0dc233b5abcb9f98bfab9c90c14b45eaa2cf204d8f8aa4e3979f96140f82f973107d88f5aa1eec75 SHA512 174a513d37e350d66a8b6cd9774abc0a49952b58b8ab641292b67352cfe047be37a16bbaa621524dcf39e6e43c062a5d45fdab47da9950415367913f93168c82
diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
index d19f69dd1fb7..9ea837d36076 100644
--- a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r2.ebuild
@@ -32,6 +32,9 @@ src_prepare() {
 	default
 	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
 	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+
+	# Prevent python:2.7 automagic for dippy (bug #778965)
+	sed -i 's/@HAVE_PYTHON_TRUE@/#/' src/Makefile.in || die
 }
 
 src_configure() {
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index b6c4cf999ac9..93057c269365 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,3 @@
-DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
 DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94
-EBUILD dlib-19.16-r1.ebuild 2841 BLAKE2B 0764d949505216763578cf8eb658f5486051b3206c796d43bcd13c89de303477c66c13f9052dc21d513e0a050f08044faebcfeb30c1a4602bf507722df137f21 SHA512 39a3b0c7c506f9f7eae79f1ef1b6098b1974f907230a623cd4533bdb73440345cb8235f764036daff646e2b9b544ba98978280a362558bd48095c23b96ad1f3e
 EBUILD dlib-19.22.ebuild 2408 BLAKE2B ea18c8f137dc925a5fdffbd728c346906bfccb703d597df09bd08cca29d1c655b3897a71557015336c4edfc2ea4bedc65f8c5134007df0ee7871d7a854eb3a67 SHA512 c7cedc466f3ac4af898c797f328c6c095d548c93f1c45be39c55bf326bb783317bbb3fd83bb57f11caae0ac1c51011fa16f0bb3b04a2ae9fe4b4b82313a2dcf9
 MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.16-r1.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
deleted file mode 100644
index b962a0da02e0..000000000000
--- a/sci-libs/dlib/dlib-19.16-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL=1
-inherit cmake cuda distutils-r1
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-RDEPEND="
-	cblas? ( virtual/cblas )
-	cuda? ( dev-libs/cudnn:= )
-	gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-BDEPEND="python? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
-
-DOCS=( docs/README.txt )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--"$(usex gif)" DLIB_GIF_SUPPORT
-		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
-		--"$(usex png)" DLIB_PNG_SUPPORT
-		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
-		--"$(usex cblas)" DLIB_USE_BLAS
-		--"$(usex cuda)" DLIB_USE_CUDA
-		--"$(usex lapack)" DLIB_USE_LAPACK
-		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
-	)
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
-		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
-		-DDLIB_GIF_SUPPORT="$(usex gif)"
-		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
-		-DDLIB_PNG_SUPPORT="$(usex png)"
-		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
-		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
-		-DDLIB_USE_BLAS="$(usex cblas)"
-		-DDLIB_USE_CUDA="$(usex cuda)"
-		-DDLIB_USE_LAPACK="$(usex lapack)"
-		-DUSE_AVX_INSTRUCTIONS="$(usex cpu_flags_x86_avx)"
-		-DUSE_SSE2_INSTRUCTIONS="$(usex cpu_flags_x86_sse2)"
-		-DUSE_SSE4_INSTRUCTIONS="$(usex cpu_flags_x86_sse4_1)"
-	)
-	cmake_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test || die
-	emake
-	./dtest --runall || die
-	popd > /dev/null || die
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake_src_install
-	use python && distutils-r1_src_install
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 512611200bdd..d25436400717 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,10 +1,14 @@
 AUX gdal-2.2.3-soname.patch 1959 BLAKE2B f6cdba1af819b3416e18be1e584384b3df6858133773d2606dce96a78c239d23c204b55df62b09b16e5a0ddfee4c9469e7e6aa527088d53710884aa93287d41c SHA512 c7986792549557683125b331e0c1417cfe49ecffd067f5330ffaeb039ec0ec329d5967697210292edad6ccdcc912397cc2f4781808a87cec8de70e78d99f0a26
 AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d2ec386fdb5bc7a15cafc6472d1264020358223d2505992124177a0ae106cad26b8da671bbd1ece83762ee1 SHA512 5bd2df7712c6487e5968fbef84b4154f20d13ffe88f22886325be3c03fc882e2699e258e11c54eec750225fde1b2001d4dd35ace751a5f3c8ae59a9572241373
 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
 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
+DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4 SHA512 39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e
 EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612
 EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154b8e6b34e1eb9fa1a0adc3f2e5cd26e60f0333a19a456907f270baeab5b5c971d47b3be63626c55fa1122dd SHA512 502b3419bd6b3046733036cbe23d5b6aa277c32539c2a8819cb6b6b8a907cffa91eff81cdb75dfe7dfb5465871be4b49db8c7e631520689677c351933bf2b606
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
+EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
new file mode 100644
index 000000000000..1671845707a3
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.0-configure-geos-disable.patch
@@ -0,0 +1,187 @@
+https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6.patch
+https://github.com/OSGeo/gdal/issues/3782
+
+From b414b0a0594b3e9c175a001e8455819463039eb6 Mon Sep 17 00:00:00 2001
+From: Thomas Bonfort <thomas.bonfort@airbus.com>
+Date: Tue, 4 May 2021 08:13:45 +0200
+Subject: [PATCH] configure: fix explicit disabling of geos/sfcgal
+--- a/configure
++++ b/configure
+@@ -38323,6 +38323,7 @@ fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5
+ $as_echo "GEOS support disabled" >&6; }
+     GEOS_CONFIG=no
++    HAVE_GEOS=no
+ 
+   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
+ 
+@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your system, but the library could
+ 
+   else
+ 
+-    if test $ac_geos_config_auto = "no" ; then
++    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
+       as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5
+     fi
+ 
+   fi
+ 
+-HAVE_GEOS_RESULT="no"
+ if test "${HAVE_GEOS}" = "yes" ; then
+-
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5
+ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
+ 
+@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
+ 
+   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${GEOS_LIBS} ${LIBS}"
+-  HAVE_GEOS_RESULT="yes"
+ fi
+ 
+ 
+@@ -38625,6 +38623,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
+ $as_echo "SFCGAL support disabled" >&6; }
++    HAVE_SFCGAL=no
+     SFCGAL_CONFIG=no
+ 
+   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
+@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your system, but the library coul
+ 
+   else
+ 
+-    if test $ac_sfcgal_config_auto = "no" ; then
++    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
+       as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5
+     fi
+ 
+   fi
+ 
+-HAVE_SFCGAL_RESULT="no"
+ if test "${HAVE_SFCGAL}" = "yes" ; then
+-
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5
+ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
+ 
+@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
+ 
+   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${SFCGAL_LIBS} ${LIBS}"
+-  HAVE_SFCGAL_RESULT="yes"
+ fi
+ 
+ 
+@@ -44998,7 +44994,7 @@ echo "  FreeXL support:            ${HAVE_FREEXL}"
+ echo "  GEORASTER support:         ${HAVE_GEORASTER}"
+ 
+ 
+-echo "  GEOS support:              ${HAVE_GEOS_RESULT}"
++echo "  GEOS support:              ${HAVE_GEOS}"
+ 
+ 
+ echo "  Google libkml support:     ${HAVE_LIBKML}"
+@@ -45162,7 +45158,7 @@ echo "  RasterLite2 support:       ${HAVE_RASTERLITE2}"
+ echo "  RDB support:               ${RDB_SETTING}"
+ 
+ 
+-echo "  SFCGAL support:            ${HAVE_SFCGAL_RESULT}"
++echo "  SFCGAL support:            ${HAVE_SFCGAL}"
+ 
+ 
+ echo "  SOSI support:              ${SOSI_ENABLED}"
+diff --git a/configure.ac b/configure.ac
+index ffc71b7faf76..1f88370c4045 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4541,14 +4541,11 @@ dnl Check if geos library is available.
+ dnl ---------------------------------------------------------------------------
+ 
+ GEOS_INIT(3.1.0)
+-HAVE_GEOS_RESULT="no"
+ if test "${HAVE_GEOS}" = "yes" ; then
+-
+   AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION])
+   STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}")
+   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${GEOS_LIBS} ${LIBS}"
+-  HAVE_GEOS_RESULT="yes"
+ fi
+ 
+ dnl ---------------------------------------------------------------------------
+@@ -4556,14 +4553,11 @@ dnl Check if SFCGAL library is available.
+ dnl ---------------------------------------------------------------------------
+ 
+ SFCGAL_INIT(1.2.2)
+-HAVE_SFCGAL_RESULT="no"
+ if test "${HAVE_SFCGAL}" = "yes" ; then
+-
+   AC_MSG_NOTICE([Using C API from SFCGAL $SFCGAL_VERSION])
+   STRIP_SYSTEM_LIBRARY_PATHS("${SFCGAL_LIBS}")
+   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
+   LIBS="${SFCGAL_LIBS} ${LIBS}"
+-  HAVE_SFCGAL_RESULT="yes"
+ fi
+ 
+ dnl ---------------------------------------------------------------------------
+@@ -6077,7 +6071,7 @@ LOC_MSG([  EXR support:               ${HAVE_EXR}])
+ LOC_MSG([  FGDB support:              ${FGDB_ENABLED}])
+ LOC_MSG([  FreeXL support:            ${HAVE_FREEXL}])
+ LOC_MSG([  GEORASTER support:         ${HAVE_GEORASTER}])
+-LOC_MSG([  GEOS support:              ${HAVE_GEOS_RESULT}])
++LOC_MSG([  GEOS support:              ${HAVE_GEOS}])
+ LOC_MSG([  Google libkml support:     ${HAVE_LIBKML}])
+ LOC_MSG([  GRASS support:             ${GRASS_SETTING}])
+ LOC_MSG([  GTA support:               ${GTA_SETTING}])
+@@ -6135,7 +6129,7 @@ LOC_MSG([  QHull support:             ${QHULL_SETTING}])
+ LOC_MSG([  Rasdaman support:          ${RASDAMAN_ENABLED}])
+ LOC_MSG([  RasterLite2 support:       ${HAVE_RASTERLITE2}])
+ LOC_MSG([  RDB support:               ${RDB_SETTING}])
+-LOC_MSG([  SFCGAL support:            ${HAVE_SFCGAL_RESULT}])
++LOC_MSG([  SFCGAL support:            ${HAVE_SFCGAL}])
+ LOC_MSG([  SOSI support:              ${SOSI_ENABLED}])
+ LOC_MSG([  SpatiaLite support:        ${HAVE_SPATIALITE}])
+ if test "x$SPATIALITE_SONAME" != "x"; then
+diff --git a/m4/geos.m4 b/m4/geos.m4
+index 1c685039740e..608466c67c69 100644
+--- a/m4/geos.m4
++++ b/m4/geos.m4
+@@ -55,6 +55,7 @@ AC_DEFUN([GEOS_INIT],[
+ 
+     AC_MSG_RESULT([GEOS support disabled])
+     GEOS_CONFIG=no
++    HAVE_GEOS=no
+ 
+   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
+ 
+@@ -160,7 +161,7 @@ AC_DEFUN([GEOS_INIT],[
+ 
+   else
+ 
+-    if test $ac_geos_config_auto = "no" ; then
++    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
+       AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found])
+     fi
+ 
+diff --git a/m4/sfcgal.m4 b/m4/sfcgal.m4
+index 2384f0f0dc5d..1a8d26460ce7 100644
+--- a/m4/sfcgal.m4
++++ b/m4/sfcgal.m4
+@@ -53,6 +53,7 @@ AC_DEFUN([SFCGAL_INIT],[
+   if test x"$with_sfcgal" = x"no" ; then
+ 
+     AC_MSG_RESULT([SFCGAL support disabled])
++    HAVE_SFCGAL=no
+     SFCGAL_CONFIG=no
+ 
+   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
+@@ -159,7 +160,7 @@ AC_DEFUN([SFCGAL_INIT],[
+ 
+   else
+ 
+-    if test $ac_sfcgal_config_auto = "no" ; then
++    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
+       AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found])
+     fi
+ 
diff --git a/sci-libs/gdal/files/gdal-3.3.0-libdir.patch b/sci-libs/gdal/files/gdal-3.3.0-libdir.patch
new file mode 100644
index 000000000000..cd75a39f3196
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.0-libdir.patch
@@ -0,0 +1,392 @@
+[Dropped a few hunks for this to apply for now. Needs some rework to send upstream.]
+
+https://github.com/OSGeo/gdal/pull/3560
+https://bugs.gentoo.org/696106
+--- a/configure.ac
++++ b/configure.ac
+@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
+ 
+ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
+ 
+-  LIBS="-L$with_libz -L$with_libz/lib $LIBS"
++  LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS"
+ 
+-  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+   if test "$LIBZ_SETTING" = "external" ; then
+-    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+      if test "$LIBZ_SETTING" = "external" ; then
+         AC_MSG_RESULT([using libz library from $with_libz])
+     else
+@@ -1166,7 +1166,7 @@ AC_ARG_WITH(libdeflate,
+ if test "$with_libdeflate" != "no" ; then
+ 
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+-    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/lib)
++    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/${libdir})
+   else
+     AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no])
+   fi
+@@ -1197,7 +1197,7 @@ fi
+ if test "$LIBDEFLATE_SETTING" = "yes" ; then
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+     EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES"
+-    LIBS="-L$with_libdeflate/lib -ldeflate $LIBS"
++    LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS"
+   else
+     LIBS="-ldeflate $LIBS"
+   fi
+@@ -1290,7 +1290,7 @@ else
+     LIBS="-L$with_libtiff -ltiff $LIBS"
+     EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
+   else
+-    LIBS="-L$with_libtiff/lib -ltiff $LIBS"
++    LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS"
+     EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
+   fi
+ 
+@@ -1414,52 +1414,22 @@ else
+     fi
+   else
+     ORIG_LIBS="$LIBS"
+-    LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++    LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+     AC_LANG_PUSH([C++])
+     AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+     AC_LANG_POP([C++])
+     if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+         unset ac_cv_lib_proj_proj_create_from_wkt
+         AC_LANG_PUSH([C++])
+         AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+         AC_LANG_POP([C++])
+     fi
+     if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-        unset ac_cv_lib_proj_proj_create_from_wkt
+-        AC_LANG_PUSH([C++])
+-        AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-        AC_LANG_POP([C++])
+-    fi
+-    if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+         AC_LANG_PUSH([C++])
+         AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+         AC_LANG_POP([C++])
+-        if test "$PROJ_FOUND" = "no"; then
+-            LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-            unset ac_cv_lib_proj_internal_proj_create_from_wkt
+-            AC_LANG_PUSH([C++])
+-            AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-            AC_LANG_POP([C++])
+-        fi
+-        if test "$PROJ_FOUND" = "yes"; then
+-            PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+-        fi
+-    fi
+-    if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-        AC_LANG_PUSH([C++])
+-        AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-        AC_LANG_POP([C++])
+-        if test "$PROJ_FOUND" = "no"; then
+-            LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-            unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt
+-            AC_LANG_PUSH([C++])
+-            AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-            AC_LANG_POP([C++])
+-        fi
+         if test "$PROJ_FOUND" = "yes"; then
+             PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+         fi
+@@ -1523,7 +1493,7 @@ elif test "$with_spatialite" = "dlopen"; then
+       SPATIALITE_SONAME="spatialite.so"
+   fi
+ else
+-    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/lib -lspatialite)
++    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/${libdir} -lspatialite)
+ 
+     if test -f "$with_spatialite/include/spatialite.h" -a \
+         "$SPATIALITE_INIT_FOUND" = "yes"; then
+@@ -1531,7 +1501,7 @@ else
+         if test "$HAVE_SQLITE3" = "yes"; then
+             SPATIALITE_INC="-I$with_spatialite/include"
+             HAVE_SPATIALITE=yes
+-            SPATIALITE_LIBS="-L$with_spatialite/lib -lspatialite"
++            SPATIALITE_LIBS="-L$with_spatialite/${libdir} -lspatialite"
+             LIBS="$SQLITE3_LDFLAGS $LIBS $SPATIALITE_LIBS"
+             AC_MSG_RESULT(spatialite enabled)
+         else
+@@ -1593,10 +1563,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
+   fi
+ elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then
+ 
+-  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/lib)
++  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/${libdir})
+ 
+   if test "$ZSTD_SETTING" = "yes" -a -f "$with_zstd/include/zstd.h" ; then
+-    LIBS="-L$with_zstd/lib -lzstd $LIBS"
++    LIBS="-L$with_zstd/${libdir} -lzstd $LIBS"
+     EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES"
+   else
+     AC_MSG_ERROR([libzstd not found])
+@@ -1919,20 +1889,20 @@ fi
+ # TODO: separate libs for rasters and vectors
+ if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then
+ 
+-  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   if test "$GRASS_SETTING" = "no" ; then
+-    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   fi
+ 
+   if test "$GRASS_SETTING" != "no" ; then
+     if test "$GRASS_SETTING" = "grass70+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     else
+       G_RASTLIBS="-lgrass_I"
+       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     fi
+     GRASS_INCLUDE="-I$with_grass/include"
+     GRASS_GISBASE="$with_grass"
+@@ -1956,10 +1926,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
+ 
+ else
+ 
+-  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/lib)
++  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/${libdir})
+ 
+   if test "$GRASS_SETTING" = "libgrass" ; then
+-    LIBS="-L$with_libgrass -L$with_libgrass/lib -lgrass5 $LIBS"
++    LIBS="-L$with_libgrass -L$with_libgrass/${libdir} -lgrass5 $LIBS"
+     GRASS_INCLUDE="-I$with_libgrass -I$with_libgrass/include $EXTRA_INCLUDES"
+   else
+     AC_MSG_ERROR([--with-libgrass=$with_grass requested, but libgrass5 not found!])
+@@ -2006,7 +1976,7 @@ dnl Fedora has cfitsio headers in /usr/include/cfitsio
+ else
+ 
+   FITS_SETTING=external
+-  LIBS="-L$with_cfitsio -L$with_cfitsio/lib -lcfitsio $LIBS"
++  LIBS="-L$with_cfitsio -L$with_cfitsio/${libdir} -lcfitsio $LIBS"
+   EXTRA_INCLUDES="-I$with_cfitsio -I$with_cfitsio/include $EXTRA_INCLUDES"
+ 
+   echo "using libcfitsio from $with_cfitsio."
+@@ -2055,7 +2025,7 @@ elif test "$with_pcraster" = "internal" ; then
+ else
+ 
+   PCRASTER_SETTING=external
+-  LIBS="-L$with_pcraster/lib -lcsf $LIBS"
++  LIBS="-L$with_pcraster/${libdir} -lcsf $LIBS"
+   EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES"
+ 
+   echo "using libcsf from $with_pcraster."
+@@ -2106,7 +2076,7 @@ elif test "$with_png" = "internal" ; then
+ else
+ 
+   PNG_SETTING=external
+-  LIBS="-L$with_png -L$with_png/lib -lpng $LIBS"
++  LIBS="-L$with_png -L$with_png/${libdir} -lpng $LIBS"
+   EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
+ 
+   echo "using libpng from $with_png."
+@@ -2141,7 +2111,7 @@ else
+ 
+   DDS_SETTING=yes
+   CRUNCHDIR="$with_dds"
+-  LIBS="-L$with_dds/lib/ -lcrunch $LIBS"
++  LIBS="-L$with_dds/${libdir}/ -lcrunch $LIBS"
+   echo "using libcrunch from $with_dds."
+ 
+ fi
+@@ -2179,7 +2149,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
+ else
+ 
+   GTA_SETTING=yes
+-  LIBS="-L$with_gta -L$with_gta/lib -lgta $LIBS"
++  LIBS="-L$with_gta -L$with_gta/${libdir} -lgta $LIBS"
+   EXTRA_INCLUDES="-I$with_gta -I$with_gta/include $EXTRA_INCLUDES"
+ 
+   echo "using libgta from $with_gta."
+@@ -2292,10 +2262,10 @@ else
+ 
+   dnl We now require libgeotiff 1.5.0
+   dnl first check if $with_geotiff/lib has the library:
+-  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/lib)
++  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/${libdir})
+ 
+   if test $GEOTIFF_SETTING = "external" ; then
+-    LIBS="-L$with_geotiff/lib -lgeotiff $LIBS"
++    LIBS="-L$with_geotiff/${libdir} -lgeotiff $LIBS"
+     if test  -d $with_geotiff/include ; then
+       EXTRA_INCLUDES="-I$with_geotiff/include $EXTRA_INCLUDES"
+     fi
+@@ -2518,7 +2488,7 @@ elif test "$with_gif" = "internal" ; then
+ else
+ 
+   GIF_SETTING=external
+-  LIBS="-L$with_gif -L$with_gif/lib -lgif $LIBS"
++  LIBS="-L$with_gif -L$with_gif/${libdir} -lgif $LIBS"
+   EXTRA_INCLUDES="-I$with_gif -I$with_gif/include $EXTRA_INCLUDES"
+ 
+   echo "using libgif from $with_gif."
+@@ -2584,10 +2554,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then
+ 
+ else
+ 
+-  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi)
++  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi)
+   if test "$HAVE_OGDI" = "yes" ; then
+     if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+-        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi $LIBS"
++        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi $LIBS"
+         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+ 
+         echo "using libogdi from $with_ogdi."
+@@ -2597,10 +2567,10 @@ else
+      fi
+   else
+     dnl For backward compatibility. Retry with ogdi31 as a name
+-    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi31)
++    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi31)
+     if test "$HAVE_OGDI" = "yes" ; then
+       if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+-        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS"
++        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi31 $LIBS"
+         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+ 
+         echo "using libogdi31 from $with_ogdi."
+@@ -2718,10 +2688,10 @@ elif test "$with_sosi" = "yes" ; then
+     rm -f testfyba
+ else
+ 
+-  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/lib])
+-  if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/lib/libfyut.a ; then
++  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/${libdir}])
++  if test -r $with_sosi/${libdir}/libfyba.a -a -r $with_sosi/${libdir}/libfygm.a -a -r $with_sosi/${libdir}/libfyut.a ; then
+     AC_MSG_RESULT([found.])
+-    SOSI_LIB="$with_sosi/lib/libfyba.a $with_sosi/lib/libfygm.a $with_sosi/lib/libfyut.a"
++    SOSI_LIB="$with_sosi/${libdir}/libfyba.a $with_sosi/${libdir}/libfygm.a $with_sosi/${libdir}/libfyut.a"
+     SOSI_ENABLED=yes
+   else
+     AC_MSG_ERROR([not found.])
+@@ -2782,14 +2752,14 @@ else
+   AC_ARG_WITH(boost-lib-path,
+           [  --with-boost-lib-path=ARG   Path to boost libraries for mongocxx client],,,)
+ 
+-  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/lib])
++  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/${libdir}])
+   MONGODB_ENABLED=yes
+-  if test -r $with_mongocxx/lib/libmongoclient.so; then
++  if test -r $with_mongocxx/${libdir}/libmongoclient.so; then
+     AC_MSG_RESULT([found.])
+-    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
+-  elif test -r $with_mongocxx/lib/libmongoclient.dylib; then
++    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
++  elif test -r $with_mongocxx/${libdir}/libmongoclient.dylib; then
+     AC_MSG_RESULT([found.])
+-    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
++    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
+   else
+     AC_MSG_ERROR([not found.])
+   fi
+@@ -4770,8 +4740,8 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs
+ elif test "$with_libjson_c" = "internal" ; then
+   LIBJSONC_SETTING=internal
+ elif test "$with_libjson_c" != "no"; then
+-  LIBS="-L$with_libjson_c/lib $LIBS"
+-  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib)
++  LIBS="-L$with_libjson_c/${libdir} $LIBS"
++  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/${libdir})
+ else
+   AC_MSG_ERROR([libjson-c (internal or external) is required])
+ fi
+--- a/frmts/grass/pkg/configure.in
++++ b/frmts/grass/pkg/configure.in
+@@ -99,7 +99,7 @@ else
+   if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then
+     AUTOLOAD_DIR=`$GDAL_CONFIG --autoload`
+   else
+-    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/lib/gdalplugins
++    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/${libdir}/gdalplugins
+   fi
+ fi
+ 
+@@ -123,11 +123,11 @@ fi
+ 
+ if test "$with_grass" != "yes" ; then
+ 
+-  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   if test "$GRASS_SETTING" = "no" ; then
+-    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+     if test "$GRASS_SETTING" = "no" ; then
+-      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+     fi
+   fi
+ 
+@@ -135,15 +135,15 @@ if test "$with_grass" != "yes" ; then
+     if test "$GRASS_SETTING" = "grass72+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
+     elif test "$GRASS_SETTING" = "grass70+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     else
+       G_RASTLIBS="-lgrass_I"
+       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     fi
+     GRASS_INCLUDE="-I$with_grass/include"
+     GRASS_GISBASE="$with_grass"
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT],
+                     expat_lib_flags="-lexpat"
+                 fi
+             else
+-                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/lib)
++                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/${libdir})
+                 if test "$run_expat_test" = "yes"; then
+-                    expat_lib_flags="-L$expat_prefix/lib -lexpat"
++                    expat_lib_flags="-L$expat_prefix/${libdir} -lexpat"
+                 fi
+             fi
+         fi
+--- a/m4/ax_lib_libkml.m4
++++ b/m4/ax_lib_libkml.m4
+@@ -172,7 +172,7 @@ kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory();
+             if test "$libkml_prefix" = "/usr"; then
+                 libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+             else
+-                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
++                libkml_lib_flags="-L$libkml_prefix/${libdir} -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+             fi
+             run_libkml_test="yes"
+         elif test "$libkml_requested" = "yes"; then
+--- a/m4/ax_lib_xerces.m4
++++ b/m4/ax_lib_xerces.m4
+@@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_XERCES],
+         if test "$xerces_prefix" = "/usr"; then
+             xerces_lib_flags="-lxerces-c -lpthread"
+         else
+-            xerces_lib_flags="-L$xerces_prefix/lib -lxerces-c -lpthread"
++            xerces_lib_flags="-L$xerces_prefix/${libdir} -lxerces-c -lpthread"
+         fi
+         run_xerces_test="yes"
+     elif test "$xerces_requested" = "yes"; then
diff --git a/sci-libs/gdal/gdal-3.3.0.ebuild b/sci-libs/gdal/gdal-3.3.0.ebuild
new file mode 100644
index 000000000000..dbe6b4590fce
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.0.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+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}/${PN}-3.3.0-configure-geos-disable.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index b031f6f64fb2..b7b2a633ef9f 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -4,6 +4,6 @@ DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe5
 DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
-EBUILD gsl-1.16.ebuild 3067 BLAKE2B d2678122d1be3f538847315011b3bac7d5f735822a14b091f00be56bee73bb448d300ae2a0796f5a3e6e67b51ab8ec3a0ecb3a276ca907d0f08e08626b927061 SHA512 3d418828a5a6372cf18ba80cce335980e7d0568197bb0afef3a738f47958754fe4cd4c95a35f3c8d6520de8b5f61c76f48a65a8b141eafee92a5cf34ff200180
+EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index b4ccad464d8c..eac9c3b6f75d 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
-RDEPEND="cblas-external? ( virtual/cblas )"
+RDEPEND="
+	cblas-external? ( virtual/cblas )
+	app-eselect/eselect-cblas"
 DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f81b97622a32..5b3cba695bc7 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -3,5 +3,5 @@ AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24c
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.13-r1.ebuild 1920 BLAKE2B 5122f7010fd75a545ef87057b72ca67911f01c67ead8911b643c76808bebc1051c96fe781eb37cc40fb31d066d0eda767c77d39ec5aee25aecb3653b155de300 SHA512 f809f598f273fded8a747d9d9da4955cb5221e6132f3666a8ad86b461fa69f3b7b9d25f11a6413c127156a7b478604abaf2c2d3e92fbbaf750f7c9804c1dfc58
+EBUILD hdf-4.2.13-r1.ebuild 1945 BLAKE2B dcb348ffbc90a69e6230b6ea72625e9f7c11f2ca1c7dfe015a5bdfb60b0e7b702296fa55da8b57118168b45be8f86ad33f71b14f9e155312928d04d9d987dddf SHA512 6b547d1d5f46318ec1c5c01393cf759efeeea6409c4ff5e1fe8e341958e656ae9cd6baaa8e39ace87be83f35f18c28e8663117880eac7db3fdbbe154c9642cbd
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 7937f8032bdf..cf5dc153dc11 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
 
 MYP=${P/_p/-patch}
 
@@ -61,8 +61,13 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
 	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+
 	cd "${ED}"usr
 	if use examples; then
 		mv  share/hdf4_examples share/doc/${PF}/examples || die
@@ -70,6 +75,7 @@ src_install() {
 	else
 		rm -r share/hdf4_examples || die
 	fi
+
 	mv bin/ncgen{,-hdf} || die
 	mv bin/ncdump{,-hdf} || die
 	mv share/man/man1/ncgen{,-hdf}.1 || die
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index a160a2d8626e..e6252bb9c74a 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,5 +1,5 @@
-DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
 DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
-EBUILD hypre-2.18.2-r1.ebuild 2752 BLAKE2B 6998f04eecaa6fcf81e817a63b0f99423893fb2378e67de52ab860a37bc932d5be3391a9a753920eb3b3c597496afe0b6080dec95ede32f3fe8c012267d190fe SHA512 85b026a7842e7baa0371aba406f1f0412c36234ef3c9eea8f69d8370c2d04f256631b4b2387ed4369d5ad139cfe6e21f4398b28f9f55e46bed51eccbcd8731a6
+DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0
 EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab
+EBUILD hypre-2.21.0.ebuild 2772 BLAKE2B 02f3bef55c9fddfee73b06f753d659c428ecc9e79d27667eae0b7c92822b168d1a32aa49ffc1de8d46636adbeaed17c63512e05349e36fb7a560b0dc5c54aebd SHA512 f89b1fe7d8055ab71a44b74ece9d873e3572d17887baad401a97c3e4e292e1be738f20ca64b7f92885ccad6ddaa127715ef1e6208c0c852b03f00b816d12e475
 MISC metadata.xml 615 BLAKE2B 8bd8c87a70e3203b79255f63bf25671cbaed470d177d2dca5ba77348fcf3430482f80b06d2f48beaa24eb49664aaaf2b93410d7240f402313694031362bcf899 SHA512 51002ae26a7957688265381df0619348726b6f6a39a036421e8574dc56382b21c1b642f3f0592f8eb02b1435979adcc0936fe734f1a01080093a0802af30d205
diff --git a/sci-libs/hypre/hypre-2.18.2-r1.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild
index e47dfb45334e..ba8ee592057c 100644
--- a/sci-libs/hypre/hypre-2.18.2-r1.ebuild
+++ b/sci-libs/hypre/hypre-2.21.0.ebuild
@@ -9,11 +9,11 @@ inherit fortran-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Parallel matrix preconditioners library"
 HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples fortran int64 openmp mpi"
 
 BDEPEND="virtual/pkgconfig"
@@ -21,19 +21,20 @@ RDEPEND="
 	sci-libs/superlu:=
 	virtual/blas
 	virtual/lapack
-	mpi? ( virtual/mpi )"
+	mpi? ( virtual/mpi )
+"
 DEPEND="${RDEPEND}"
 
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] &&\
-		use openmp && [[ $(tc-getCC) == *gcc* ]] && tc-check-openmp
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
+		tc-check-openmp
+	fi
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		   use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
 		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
 		die "Need an OpenMP capable compiler"
 	fi
@@ -41,12 +42,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	# link with system superlu and propagate LDFLAGS
 	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
 		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
 		-i src/config/Makefile.config.in || die
+
 	sed -e '/HYPRE_ARCH/s: = :=:g' \
 		-i src/configure || die
+
 	# link with system blas and lapack
 	sed -e '/^BLASFILES/d' \
 		-e '/^LAPACKFILES/d' \
@@ -56,9 +60,16 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
-	use openmp && [[ $(tc-getCC) == *gcc* ]] && \
+
+	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
 		append-flags -fopenmp && append-ldflags -fopenmp
-	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
+	fi
+
+	if use mpi ; then
+		CC=mpicc
+		FC=mpif77
+		CXX=mpicxx
+	fi
 
 	cd src || die
 
@@ -85,15 +96,15 @@ src_compile() {
 
 src_test() {
 	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
-				   PATH="${S}/src/test:${PATH}" \
-				   emake -C src check
+		PATH="${S}/src/test:${PATH}" \
+		emake -C src check
 }
 
 src_install() {
 	emake -C src install \
-		  HYPRE_INSTALL_DIR="${ED}" \
-		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
-		  HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+		HYPRE_INSTALL_DIR="${ED}" \
+		HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
 
 	if use examples; then
 		dodoc -r src/examples
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 46a4b98ecd75..6f08024afef9 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
-AUX klu-1.3.9-dash_doc.patch 1008 BLAKE2B 97f5f169cdb1220bf8970fc2a31767237b81363f9950ebe48a03d94dadcb9f270d4ce625788052c20cb4cde2c81137a68e26a4498c5e404ae9011811b2c70da1 SHA512 1b11b38c701a41f4a5d166dfa2f3c6cd2760fe6745083b042b1fc3d6bc93e05e3becfcde0f6be3504ba520bbeeaa70671d7c928665a256c71581a8e97f9c9f5a
+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-r1.ebuild 862 BLAKE2B 9cad442383ebfb08ad27749a04a0429fdb78a9fdbd45ba12b54097eee11448195539d03c34353cf8d25d5d2d2d9e939a48d54cb505e28b3d1381033e403ab401 SHA512 2c79bc8030d60213c06c26963bcc8659d3dc6666d5f75117dd09e8ca569cca00c49969761248ac9eca1d9a4c2e0ea84ce8a8d57abb325373ae0c9667d19f2926
+EBUILD klu-1.3.9-r2.ebuild 836 BLAKE2B 120112badf63f7d7312f0b997db35fbd81ca950415b5947c233edb9870400185bfdc0cebeb73f6c84c5bceca750cf93068ad0cb965e3623663f1bea69ef8ac2a SHA512 a649d6c26d498edce6a155ddc81587bf0776f62583b96d9a7f445b9abac4228c2127d2e752dff22e7a2278700a7d1d04b0755f3873374741b25f9ac01c2871c8
 EBUILD klu-1.3.9.ebuild 652 BLAKE2B d1de231723de826b04a2251f37813f28ca7cf7c545149c8c345b02563f884cb086ada7462ee9d5390dc1afe00769fcf377478c3aaa1fc7abaf90982b59650f93 SHA512 8146668bcc64b4bc8b854d44c1ef5c97661ba32a226225503650c7f1aea9479ed73f152dbf008a377b7d98dd187d121d2c5622ea7ce4cd9ab2543b63ff547333
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/files/klu-1.3.9-dash_doc.patch b/sci-libs/klu/files/klu-1.3.9-dash_doc.patch
index 1f7bc8edfe10..a0db5d45c597 100644
--- a/sci-libs/klu/files/klu-1.3.9-dash_doc.patch
+++ b/sci-libs/klu/files/klu-1.3.9-dash_doc.patch
@@ -1,5 +1,3 @@
-diff --git a/Doc/Makefile.am b/Doc/Makefile.am
-index 7d1116a..fd46b1d 100644
 --- a/Doc/Makefile.am
 +++ b/Doc/Makefile.am
 @@ -1,15 +1,14 @@
diff --git a/sci-libs/klu/klu-1.3.9-r1.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index 9e0c9c6d2aa0..3851e767c375 100644
--- a/sci-libs/klu/klu-1.3.9-r1.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -12,9 +12,10 @@ 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"
+IUSE="doc"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	doc? ( virtual/latex-base )"
 DEPEND="
 	>=sci-libs/amd-2.4
@@ -32,7 +33,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with doc)
 }
 
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index d8d84281a3f8..6d135e3ce191 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,3 +1,5 @@
 DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
+DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8
 EBUILD libecpint-1.0.5.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
+EBUILD libecpint-1.0.6.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.6.ebuild b/sci-libs/libecpint/libecpint-1.0.6.ebuild
new file mode 100644
index 000000000000..47004ee7019c
--- /dev/null
+++ b/sci-libs/libecpint/libecpint-1.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
+HOMEPAGE="https://github.com/robashaw/libecpint"
+SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/pugixml"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBECPINT_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index df8a356525b0..5be6ad1f9e6a 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,7 +1,4 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
-AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c50415ded096ce08cf0cb88f70206c3e471cbdd2d619d61e3bd08aecfcb8a2fbf7deafdd773768e9cfb80ffcde0aaa05d4a96e3cacaf SHA512 f4c8fadce30f3ade704cc38b1646beefbc3676e9f68e06067e89617fe584b3f2a2b13615e5e8949c6a1ec4d88fcf4937922d8d47f498f1feefddb096b17df51b
-DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
-EBUILD libgeotiff-1.5.1-r1.ebuild 1326 BLAKE2B 6049afbf19b1aaa323ca2403984f207de3c7830e9664b0b7ed774149c3a9976ac902f8aa545250fd8a344ed5a9b6c5b18e8092d864849d77647ebb3633b54d05 SHA512 f7a3143274f2ce1c692c53dc1359c0c1bfd347f9325f42bc975fb1f7afbe19de9620b26bea721a45602f3b4db06946032eb11267afa144519179d602fba1bb08
-EBUILD libgeotiff-1.6.0.ebuild 1275 BLAKE2B e6e3c64b34370e20cbe23fbbc75a0ad1315392cc2bec54c560091462a39682a81b3cabe0cbfb3d25769dbb68685d6de0b579f174e120d040ad8ae56c735b23af SHA512 04e1cd4f46a175ae4a70759bee7b38de253cc51ac3d8cf1fc7d55198e9da4adb46e33eb3dd7330a20535e1be56c00a58e26992013485b6e02856dfd33035cf95
+EBUILD libgeotiff-1.6.0.ebuild 1263 BLAKE2B 501a0503040baacee952966b1a627e1cbb10d0ac266bf06ea0d57bf56d099e497d3802d96f5f29dd70432f0fd724a23cf5ea94ce00ab0c66b70279ebe85a9a7d SHA512 19963a11645ad5bc7ae9cc4eef2fd484502a5314fcc560a1dd954f09b7ec87522ef3fa03c1005eab8f46245b390cea8e02f8ba732144b7caa43dca3f52799a87
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
deleted file mode 100644
index 5004aadb9817..000000000000
--- a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 4 Sep 2019 16:11:37 +0200
-Subject: [PATCH] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
-
----
- libgeotiff/test/testlistgeo          | 8 +++++++-
- libgeotiff/test/testlistgeo_out.dist | 4 ++--
- 3 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/test/testlistgeo b/test/testlistgeo
-index 7fb4a2f..571f5d0 100755
---- a/test/testlistgeo
-+++ b/test/testlistgeo
-@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT}
- $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
- echo "" >>${OUT}
- 
-+# Normalize for results depending on the exact version of PROJ / EPSG database
-+sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
-+mv ${OUT}.tmp ${OUT}
-+
-+sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp
- 
- # do 'diff' with distribution results
- echo "diff ${OUT} with testlistgeo_out.dist"
--diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
-+diff -u ${OUT} testlistgeo_out.dist.tmp
- if [ $? -ne 0 ] ; then
-     echo  ""
-     echo "PROBLEMS HAVE OCCURRED"
-@@ -224,6 +229,7 @@ else
-     echo "TEST OK"
-     echo "test file ${OUT} removed"
-     echo
-+    rm testlistgeo_out.dist.tmp
-     /bin/rm -f ${OUT}
-     exit 0
- fi
-diff --git a/test/testlistgeo_out.dist b/test/testlistgeo_out.dist
-index 68a948c..c157f00 100644
---- a/test/testlistgeo_out.dist
-+++ b/test/testlistgeo_out.dist
-@@ -1738,11 +1738,11 @@ Geotiff_Information:
-    Keyed_Information:
-       GTModelTypeGeoKey (Short,1): ModelTypeProjected
-       GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
--      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
-+      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe)
-       End_Of_Keys.
-    End_Of_Geotiff.
- 
--PCS = 3035 (ETRS89 / LAEA Europe)
-+PCS = 3035 (ETRS89-extended / LAEA Europe)
- Projection = 19986 (Europe Equal Area 2001)
- Projection Method: CT_LambertAzimEqualArea
-    ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N)
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
deleted file mode 100644
index 3ffe18121a54..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
-SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=media-libs/tiff-3.9.1:0
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib
-	virtual/jpeg:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-proj-6.2-tests.patch" )
-
-src_prepare() {
-	default
-	sed -e "s:-O3::g" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-debug=$(usex debug) \
-		$(use_enable static-libs static) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/api/. )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
index e8b6bced15be..fb7b410ebb3e 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/5"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
+IUSE="debug doc"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 30d08d3cd8ea..d7092e9169d3 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,7 +1,7 @@
-AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
+AUX libint-1.1.6-as-needed.patch 1982 BLAKE2B ee6fdcd80c2ba8e9b40b3a25aecdd3dced861b2b0a0b6abd535266cce23a35b41e7a6bb65e35cf994b9cf37e2e94ad5910e5f3730e7147250eece28c536c9ced SHA512 6677550cae8aca9cd7905594e1c229e16057e3efa4c1b96e4f03586d694189bc5c8121884397b9d618300f05dc9c86fad3c0c82bb701bf82f6e07613ac9e8c5b
 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 874 BLAKE2B 334ebcd9d4a9a076197af69a0ce563173ba550917c4edb5427010355873716d2210d46e978e97078926cf280914129ff61fdf8d399f743d182bad68145cdb542 SHA512 0a8a04f2416c199d9c346d02cd11011cf3558f04d9c141a67b073cd9ecf2b77cace9ff8eda1b3a6e611a018ad235e5febd6a62e2d1a809444952a191c2f20210
+EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274
 EBUILD libint-2.6.0-r2.ebuild 1419 BLAKE2B 97eb79e76322556df6ce310dacf96024dfcc0ced9e59bcd287510cecae07d04e4cc4137c0b95759c1ae9d4e9755ad97ffb5d3aeca5206d8fe90b4197cc89d769 SHA512 84ae51c30ec02658cdf30e609f3ab7ec5c37e8120fbf8c07f15efa6b407e653a42f3cd563f4edf1b2dfde52c2b152db5199723cbd3b73a7e79f40339444c64c9
-EBUILD libint-2.6.0-r4.ebuild 1527 BLAKE2B 6c0e8ddd9c88f4524e9647fc44a13589013b426896e5325cd7c179dcbee2c2289b9281a205c455f32f5867e9976fba4ac7e13c71e2dad94fe8cff806ca29e90c SHA512 7aa9c96bfa2166579e48bd548bba4b8d72f4c4a6f28d79942dbaf2b3d87317ef9dd33aa779611a2d9cf3758eb74993363d42a1a16758fc6ebe4ba2d5c82845c3
+EBUILD libint-2.6.0-r4.ebuild 1596 BLAKE2B 14d5d25ae9618ada2fc3ea6ef3ec57afe518b82723c1352db88041d33ed14c96fd8bf5d8e4d58aaebade03d0ffab990b0d70d9e40b3e61fe74b0c50577f30af4 SHA512 e8fc69b0ded3b2bdb33e3a2af6cf9c6f763d0fe63ab2364b05577dc424ce40d1ba68ba17c54ad2576a888d5ab8072ebe1f304044e473220f1764c9ce888330e5
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/files/libint-1.1.6-as-needed.patch b/sci-libs/libint/files/libint-1.1.6-as-needed.patch
index c48505314b39..d9f6e449ba08 100644
--- a/sci-libs/libint/files/libint-1.1.6-as-needed.patch
+++ b/sci-libs/libint/files/libint-1.1.6-as-needed.patch
@@ -1,12 +1,3 @@
- configure.ac                      | 3 +--
- src/bin/MakeRules.in              | 2 +-
- src/lib/libderiv/Makefile.library | 2 +-
- src/lib/libint/Makefile.library   | 2 +-
- src/lib/libr12/Makefile.library   | 2 +-
- 5 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dc86e88..8cc3aac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -317,12 +317,11 @@ LIBS=$withval
@@ -23,8 +14,6 @@ index dc86e88..8cc3aac 100644
  echo Using extra library directories: $withval
  )
  
-diff --git a/src/bin/MakeRules.in b/src/bin/MakeRules.in
-index 5b90607..8ea5005 100644
 --- a/src/bin/MakeRules.in
 +++ b/src/bin/MakeRules.in
 @@ -3,7 +3,7 @@ HAVE_MAKERULES = yes
@@ -36,8 +25,6 @@ index 5b90607..8ea5005 100644
  
  .PHONY: install install_inc install_target uninstall clean oclean distclean targetclean realclean
  install::
-diff --git a/src/lib/libderiv/Makefile.library b/src/lib/libderiv/Makefile.library
-index ee152ef..8debfe8 100644
 --- a/src/lib/libderiv/Makefile.library
 +++ b/src/lib/libderiv/Makefile.library
 @@ -23,7 +23,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
@@ -49,8 +36,6 @@ index ee152ef..8debfe8 100644
  
  $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
  	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libint/Makefile.library b/src/lib/libint/Makefile.library
-index 23e2918..01c4225 100644
 --- a/src/lib/libint/Makefile.library
 +++ b/src/lib/libint/Makefile.library
 @@ -41,7 +41,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
@@ -62,8 +47,6 @@ index 23e2918..01c4225 100644
  
  $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
  	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
-diff --git a/src/lib/libr12/Makefile.library b/src/lib/libr12/Makefile.library
-index 1510807..26d47a4 100644
 --- a/src/lib/libr12/Makefile.library
 +++ b/src/lib/libr12/Makefile.library
 @@ -47,7 +47,7 @@ $(TOPDIR)/lib/$(NAME).a: $(LIBOBJ)
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index f3a93eaaacdf..1abdfd1fd795 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-MY_PV="$(ver_rs 0- -)"
 inherit autotools fortran-2 toolchain-funcs
 
+MY_PV="$(ver_rs 0- -)"
+
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
 SRC_URI="https://github.com/evaleev/libint/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
diff --git a/sci-libs/libint/libint-2.6.0-r4.ebuild b/sci-libs/libint/libint-2.6.0-r4.ebuild
index b8166abf35c6..b112d1144fc2 100644
--- a/sci-libs/libint/libint-2.6.0-r4.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r4.ebuild
@@ -25,6 +25,9 @@ DEPEND="
 src_prepare() {
 	default
 	eautoreconf
+
+	# bug 725454
+	sed -i -e '/RANLIB/d' src/bin/libint/Makefile || die
 }
 
 src_configure() {
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 11d8ea4e43a6..0b9acf76fc9a 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -2,6 +2,10 @@ AUX liborigin-3.0.0-buildsystem.patch 5563 BLAKE2B c9905687284e0a81b504d765ff237
 AUX liborigin-3.0.0-missing-header.patch 978 BLAKE2B 717a5bc981d5695688a5ae588c87da7501fa97e76fc8df4a71da57021d75a8e33c8696ea9ef606854a8943431debc0fcb998913f4d09ddd7833e6c7029ad83b0 SHA512 d515977558b0938a0d0453a6c1e4c9c506a7cafeeac39cc881d748ca3d8ff0e6153f8552b2efd5f2c0e478bf8b2075fc225bfc1d0b9f4542c3b6848918e88203
 AUX liborigin-3.0.0-no-exit-calls.patch 2452 BLAKE2B d635890d02f2605d52b869e09522bbb2aae9062eee9403c0f6e9639620229f983dc1031301d926617b63dbfa8cb0c163988119cf17b82db1786425499efe56bf SHA512 db491659f27168c2a4ce27517abcf5464fdc75ca9356500dde7a22987f5a766015e843c1b0c0b4f3d9bbf74c53d7b840a9aab64090173c2433e1176eefc816ec
 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
-MISC metadata.xml 330 BLAKE2B 1327fe176e03cb3f671b64e5a20efbabb375773c4c3633367feef929feeca52c835fb313a7cb315fb96d29f38ec26c6144f41af43b83957a22ba9a3ddd420bb8 SHA512 1eabc021a57d8928ca58b415f906293576c225aedb9f5fc88f8ad247d2a08a9e16650b2693cee1636d011b3f03cdf1255f125feb8f8fb7f55413baf1d519a6be
+EBUILD liborigin-3.0.1.ebuild 1174 BLAKE2B 12d27c9ef6740b63b7ad115d3c3cbc685fbc208987eb127f45195543618cd3c26d903c73fd1d2f6600e4304b8f71a27314a1b6927cabb64af7433518f8c3298b SHA512 dfc54d056c43d4b8c5c7be4f1c26a59c6b7890ed44da3d154af4d3e4ea9c59704c74d905e8f4a7f95fd04c461f1e3bae00de5e220b1503f2dc02d147c2cddc0c
+MISC metadata.xml 467 BLAKE2B 2a9bbd29ba2804158242f10ec4000d6599e3f6f42eca7987c8544af466cd0945283482035020008d0bfdae83c4ac8b23e4d42f453450b360baed739e505a22fa SHA512 2fb6e35216e09212a79659dc3b9f3eb2d4d6546a096ceaff3c6b1153c94b18f50b916d18d068ae8169bfefe0fab59cb14dea16ef947c8c188eb9e02286e16238
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
new file mode 100644
index 000000000000..36e5d7fc7a9c
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f3b26d..4c543bf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ else()
+     set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic" )
+ endif()
+ 
++option(ENABLE_TOOLS "Install opj2dat command line util" ON)
++
+ # compile-time configuration variables to be linked in
+ configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -44,7 +46,6 @@ set (devel-headers
+     OriginObj.h
+     OriginFile.h
+     OriginParser.h
+-    tree.hh
+ )
+ 
+ # object library
+@@ -87,6 +88,7 @@ if (BUILD_SHARED_LIBS)
+ endif ()
+ 
+ # command line util
++if(ENABLE_TOOLS)
+ if (BUILD_STATIC_LIBS)
+     add_executable(opj2dat opj2dat.cpp)
+     target_link_libraries (opj2dat origin_static)
+@@ -94,6 +96,7 @@ elseif (BUILD_SHARED_LIBS)
+     add_executable(opj2dat opj2dat.cpp)
+     target_link_libraries (opj2dat origin_shared)
+ endif ()
++endif ()
+ 
+ # Generate a pkg-config file matching this config
+ configure_file("liborigin.pc.in" "liborigin.pc" @ONLY)
+@@ -103,7 +106,9 @@ install(FILES ${devel-headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liborigin
+ # install pkg-config file
+ if (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++    if(ENABLE_TOOLS)
+     install(TARGETS opj2dat DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
++    endif ()
+ endif ()
+ 
+ # documentation
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch
new file mode 100644
index 000000000000..3f78c61ebabe
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.1-missing-header.patch
@@ -0,0 +1,24 @@
+diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
+index 05bfb95..dd5dd9b 100644
+--- a/OriginAnyParser.cpp
++++ b/OriginAnyParser.cpp
+@@ -22,6 +22,7 @@
+ #include "OriginAnyParser.h"
+ #include <sstream>
+ #include <cinttypes>
++#include <iostream>
+ 
+ /* define a macro to get an int (or uint) from a istringstream in binary mode */
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+diff --git a/opj2dat.cpp b/opj2dat.cpp
+index 4b8d57a..5a31b4e 100644
+--- a/opj2dat.cpp
++++ b/opj2dat.cpp
+@@ -31,6 +31,7 @@
+ #include <cmath>
+ #include <fstream>
+ #include <sstream>
++#include <iostream>
+ #include <string>
+ 
+ using namespace std;
diff --git a/sci-libs/liborigin/liborigin-3.0.1.ebuild b/sci-libs/liborigin/liborigin-3.0.1.ebuild
new file mode 100644
index 000000000000..c7fb5af70c2b
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-3.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 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/ https://github.com/SciDAVis/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=(
+	# add missing header
+	"${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)
+		-DBUILD_STATIC_LIBS=NO
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
diff --git a/sci-libs/liborigin/metadata.xml b/sci-libs/liborigin/metadata.xml
index e7dc202da9b1..54bfdbb82e34 100644
--- a/sci-libs/liborigin/metadata.xml
+++ b/sci-libs/liborigin/metadata.xml
@@ -8,4 +8,8 @@
 	<use>
 		<flag name="tools">Install opj2dat command line util</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">liborigin</remote-id>
+		<remote-id type="github">SciDAVis/liborigin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index a12b16166638..4796652f7ddc 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,5 +1,7 @@
 DIST libqalculate-3.17.0.tar.gz 1770500 BLAKE2B 247c74db32e63437c556dd60f00f56acf53d9ba90ea1027b34b98b455215e6c03e3ee34116b6d3989fa43b449e18b6f2ebaed67f9dff36f08dd8b38c685c6586 SHA512 b204dc44b6fdb2b72d3c85840fee38482db071f0f8241420ea24093dcdcc377c66f516c571827fbede40237618a53153a75bb7afee7f3bee7a1a71aedd779a11
 DIST libqalculate-3.18.0.tar.gz 1788899 BLAKE2B 7701dab4d11c9d54f95454cd7be530cfa9f5a8dbe438dac6d734c294ce1eb5be1f4fdb30ef6d041d19f389df88dce4fa7dea68d555ad441992498685bfb3b919 SHA512 37d870f6fd147745747ac971758a512e85e33c42605b99ac4ba68b53ca42a6f0da7ede3869fe3ea4e47d77961e826ad999e0f0c0d87039042563f124bea1250e
+DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081cce609935b4282add885d7277a20696cc3c69272b8255d9da3e79907ec4c57b4b87c971908fc3da890d46ff4849e65ccc SHA512 19df6e46e88478df4dd7ae592557c8c984f76c137708892b01f88737c2a8d72ca01324fd1b1322069292795cd158483b3fc0cc99c6559279e7a2f76ca4a47a56
 EBUILD libqalculate-3.17.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
-EBUILD libqalculate-3.18.0.ebuild 1430 BLAKE2B 5ad7454423b04634dba7f119e0626a16b0a1eb84b5652293ce60a2f42c6c89faddd599deb68ee8ccdd1efaebb49f492b960762d6b298057a94a4f30e062f06f5 SHA512 fa4967817bd224a292a93ff1b0c698180f9de41fc374c1c6f9dab2654f5705d21435d8fd49a1214cf47cc669106fa53f93b6c178846ed54e2cc2d7a393aa206f
+EBUILD libqalculate-3.18.0.ebuild 1425 BLAKE2B 0f0fda5beade49b1679eeba309e4b5f4a5a654f4fcbf1840ba0c83017e872bcaaf493f1abfeb0e61fe7a9811071078737c0cdc1ecb3aa8b9d70df74bb04de112 SHA512 827d75e23f474d9570987cb78a631c2df78a71bb178220de58d35dcdf7da386d6a287ee666395078733e8580f5eb91ef4c48d74fcbb4e18bf6f8ed587fa12093
+EBUILD libqalculate-3.19.0.ebuild 1609 BLAKE2B 0b94f2b0efce772c01aa861c72e8499d6e32dca53bdd3ee338cd147edd988f4764733786a76052a86c6b749c10b6961d9fb2b0dca9369e5123a07ba0e6ebd7a2 SHA512 098a1bae358bdabb33207fca12efb737f6510fd4c478c577504e10c87e7298ab3ea2c1ab1c5308a6cb5c363b9cc96f7c2797c2c048a08b12370580decd25bbcf
 MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9
diff --git a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
index 94aa33f3f886..293e9185760a 100644
--- a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-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="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
new file mode 100644
index 000000000000..3aa3d2f4f4cc
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		--disable-static \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 8644f1cfd73d..f7d2ab7802b3 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,5 +1,5 @@
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
-DIST libxc-5.1.1.tar.gz 43264474 BLAKE2B 887dc11a6385559edc5e2e62f3e00b16ff5695e1c384196bc3efe5aceff0a223d5f69fafaa08290bdf72f95390cb82d43e541ffaf6c4569e850eed3cb63aa5f6 SHA512 467ff09c39df30ccd50447dda5bbfe9e5f3e8f2876e069b6c16d49b3cfcc8b45316640f5b16c56ff7645355be9ec4dc571c794a17accb7731cd22bcce53f8b99
+DIST libxc-5.1.4.tar.gz 43036222 BLAKE2B 10348ccd2e8e512bf576a03eb19bf714ae4f0e590ae3a7266ae8f46c42ee12ef91e049f0007ce42023e7f13c865fedef6d1ab0fb76195ca47f62a50702741c49 SHA512 ef7f44e773a0a8a9c1a53ddd12301e123f9a4606f22420cf011d579314c1bf3164b82299aca0ef32cb130b380e5e9534d4fcc658c549ac4cb8b6f86d025cfe1e
 EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13
-EBUILD libxc-5.1.1.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
+EBUILD libxc-5.1.4.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
 MISC metadata.xml 1353 BLAKE2B 67a7f1b8762d95341462bfccbe06e25bc9fbbab891e09f6dbd0a97a58860d743ba062ba6bd4f4158946f4b35e255b59d96e646d08d3166456df23784913440f3 SHA512 3491e9cd3c6c915fd555f0dcfe580abb8130526ffd128906e67b2fc996d845f629c9ac9343b1b55551c7c22fec5cdbba75a4cf6f704b9727b53d6dd915d015c2
diff --git a/sci-libs/libxc/libxc-5.1.1.ebuild b/sci-libs/libxc/libxc-5.1.4.ebuild
index 884100437a30..884100437a30 100644
--- a/sci-libs/libxc/libxc-5.1.1.ebuild
+++ b/sci-libs/libxc/libxc-5.1.4.ebuild
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 3f2f081eb03d..bd0a9c84ceb0 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,5 +1,3 @@
-DIST matio-1.5.19.tar.gz 10108869 BLAKE2B db641bda8d68e203af765aa83ecf661e011995e242c4f91aacb4bcc8ba2b545c36a3eec3f4954b3d7ecc286e630acd15b34ec48b372063bfb8b892259fc49ec7 SHA512 c087944a7d87d78a7de662d7e19f5f81c55858cf5bf315c28d5a0f7544555b0816045e20bb0c83752eb3d54b589d9237a27cf3de98e3ebefcc7ea0af9311740e
 DIST matio-1.5.21.tar.gz 10110430 BLAKE2B 1c43d44e69b28eacd9cc672a393df6a55c4ea0e06334eace9058b45bb0bd1582d43cafd30ad121bad33ad29dda52d5259be8c38f6cbacdb05a47da3644dfb984 SHA512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c
-EBUILD matio-1.5.19.ebuild 966 BLAKE2B 7bfd290e52e38a2805caad4580b1c5400c2c7ab9df3081347e82a5e055337808a408a16f7395b88d2c7a00cdbeb7cdfaa639bc29ef6b3140c3e74aaafb2ae7c7 SHA512 047f6456e2954383b004cabdf8c4e20684188714fc65e266ca4c9cdcc4375273db6d5e1ee059660a6059752e3d48c5c035d73f0fa6c28debd272c1fe5ae28834
 EBUILD matio-1.5.21.ebuild 966 BLAKE2B 7bfd290e52e38a2805caad4580b1c5400c2c7ab9df3081347e82a5e055337808a408a16f7395b88d2c7a00cdbeb7cdfaa639bc29ef6b3140c3e74aaafb2ae7c7 SHA512 047f6456e2954383b004cabdf8c4e20684188714fc65e266ca4c9cdcc4375273db6d5e1ee059660a6059752e3d48c5c035d73f0fa6c28debd272c1fe5ae28834
 MISC metadata.xml 591 BLAKE2B f3e23baf2a3e7bd304987be8296034faf78988c95b4d9fbb9eedc7e8cc6efa0c1479a4ed48ecc10d9b0aee6c92603f4436e8d6b34811b227e86a5f822f47adf3 SHA512 d6f20bbc3bff29f3d163909acb1aa6f3cc6557c5717c3ee9771ef17fbd14fe17836f26c2b2dc4defb4223cdeb5b978ef13c4d4a294a1ac11f0559e2518d58009
diff --git a/sci-libs/matio/matio-1.5.19.ebuild b/sci-libs/matio/matio-1.5.19.ebuild
deleted file mode 100644
index adb63f7b65e3..000000000000
--- a/sci-libs/matio/matio-1.5.19.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for reading and writing matlab files"
-HOMEPAGE="https://sourceforge.net/projects/matio/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/11" # subslot = soname version
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 sparse"
-
-RDEPEND="
-	sys-libs/zlib
-	hdf5? ( sci-libs/hdf5:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/latex-base )"
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable hdf5 mat73) \
-		$(use_enable sparse extended-sparse)
-}
-
-src_compile() {
-	default
-	use doc && emake -C documentation pdf
-}
-
-src_install() {
-	default
-	use doc && dodoc documentation/matio_user_guide.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc test/test*.c
-		insinto /usr/share/${PN}
-		doins share/test*
-	fi
-
-	# no static archives
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 653c9a1858f1..265f9f16d750 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,4 +1,4 @@
-AUX mpir-2.7.2-ABI-multilib.patch 3902 BLAKE2B 915c6dabaf88115869eb34de98b6739fc552aeaf3df0293ef6465e9af6cdf2de6cf1c3e9bc39dd87c0d84a131e97b4017efe311ce3fd4a68a8ff00acafbe94d3 SHA512 81dd03d85dde94fedd4777ae1e5075420de0886675a4f8fba065cfba46f8bf0a3caf15c1efecbed4125ff27bad9c5b39e5eb05719aeabc72b52723f973d59eeb
+AUX mpir-2.7.2-ABI-multilib.patch 3830 BLAKE2B e1f39b6f8d21546680cda9f82307af4601ba3e3cb16f5b9039fcf43a8d9ff28261bc2f4ff204f03d794254c4edc906b9babd0a51ee70cf0f5a6d89a3a245fbe3 SHA512 d55ef6f1b3a41755623a64d8873317887c4e5b630d52a5bd8d139e70bb746817899e3983f4f1178e7b1efc21ac0864debaa752e70369b5e071b4012e6cc965eb
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-3.0.0.ebuild 1857 BLAKE2B 98ac00bb3413fc6896409079d5ba852e51ad144ac9c3f7aa4a1e60706e55d4c712566da46fd2cf77831dbddf47551f8e33f753b0098e09eb3514294ee4704d07 SHA512 983ced141e91d063cd15d19226c71d4321637417a499426f2c376c7d7b81a06ec2aa429662bf083a6c42502c8414f5a9d066559586b97d9894680d5919ac030e
+EBUILD mpir-3.0.0-r1.ebuild 1798 BLAKE2B 0af285eb415d2f5e8543b285d291847eb839d7226556eb318eff346b5baaa389f1c9fc735e00f17d459cca84b43fc9cc82bd0b0726fc25e46defc5b2aed5e0ed SHA512 42ceeace02ca4438759cf89c8b1a9719dcfd769486171f44d228b0741012e0deeafadcb8594278c7c64aab328b922de1f9ed5c25008d09cf1108848627eb37e6
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch b/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
index f02df55ccf98..100a6ae7088d 100644
--- a/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
+++ b/sci-libs/mpir/files/mpir-2.7.2-ABI-multilib.patch
@@ -1,5 +1,5 @@
---- a/configure.ac	2009-11-28 10:48:59.196977657 +0000
-+++ b/configure.ac	2009-11-28 10:54:50.717976971 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -361,7 +361,7 @@
  # hugely bloat the output.
  
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
index ccd38ea08c0d..eab814932b38 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs
 
@@ -12,14 +12,12 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0/23"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx cpudetection static-libs"
+IUSE="+cxx cpudetection"
 
-DEPEND="
+BDEPEND="
 	x86? ( dev-lang/yasm )
 	amd64? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
 "
-RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.2-ABI-multilib.patch
@@ -35,7 +33,7 @@ src_prepare() {
 	ebegin "Patching assembler files to remove executable sections"
 	local i
 	for i in $(find . -type f -name '*.asm') ; do
-		cat >> $i <<-EOF
+		cat >> $i <<-EOF || die
 
 			#if defined(__linux__) && defined(__ELF__)
 			.section .note.GNU-stack,"",%progbits
@@ -44,7 +42,7 @@ src_prepare() {
 	done
 
 	for i in $(find . -type f -name '*.as') ; do
-		cat >> $i <<-EOF
+		cat >> $i <<-EOF || die
 
 			%ifidn __OUTPUT_FORMAT__,elf
 			section .note.GNU-stack noalloc noexec nowrite progbits
@@ -62,16 +60,16 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable cxx)
 		$(use_enable cpudetection fat)
-		$(use_enable static-libs static)
+		--disable-static
 	)
 	# https://bugs.gentoo.org/661430
 	if ! use amd64 && ! use x86; then
-		myeconfargs+=( --with-yasm=/bin/false )
+		myeconfargs+=( --with-yasm="${BROOT}"/bin/false )
 	fi
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*la
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index aa119d72413d..56a90434cef8 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,3 +1,3 @@
 DIST netcdf-fortran-4.4.3.tar.gz 1286951 BLAKE2B 6e68505359328bac4155065419cb9c2fb2df0de875210c0eb9a4e63312b2ec272d63ecfa73b5dcebe7cf75b58a184d1a0ccb2c06c45869d3f4573590d610d9e0 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924
-EBUILD netcdf-fortran-4.4.3.ebuild 924 BLAKE2B 387ad080924a896bd3a221454a813dd144b3238fa640629afa14113aa77f22c50460097341d3631429ae1be0223832c77067d33504b52208a29e91bf71006069 SHA512 728252cce3af359ff5d668b6e195debeeb7a96750b85feb8ae74332500f89d914333368ad8d808853b26258678d7b8bf3dbafa78a74e4d6e539228271a627bdf
+EBUILD netcdf-fortran-4.4.3.ebuild 937 BLAKE2B 2ccb918d39570ade14e367cee764a6e3a9fdd166c87eb7c3124fef20f8c18015b95a8cb16b8e75f918d350594a001103f2306320c5e4afc174332ac22b531f59 SHA512 58f0e5ae08fe063a66847757fa737d856de2d7d213623fda7f3b00546a26841edb760e8534e6905393fe5e8e62fd8dd67c84b583681d316e76a4c93c470101da
 MISC metadata.xml 838 BLAKE2B 321e0b4dff6a06c50482f2614daee76c38498d83ed34aebc47e485e04e09e523199a8959f077cbfeb50111478ce4213932d6854212f9c7d5e9b6167d559a4ccb SHA512 9e4f8789f36ab7442f11f60145510bb4a74a7182027845caa6e0b014713311f821808eb48877a860e1c5328d2383481a5616156432f5a7e3fe78f0e3440890da
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
index 6d87c1dd19ba..b2463eb94be9 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_STANDARD="77 90"
 
-inherit autotools fortran-2 flag-o-matic ltprune
+inherit autotools fortran-2 flag-o-matic
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -40,5 +40,5 @@ src_configure() {
 src_install() {
 	default
 	use examples && dodoc -r examples
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/o2scl/Manifest b/sci-libs/o2scl/Manifest
index f306b3f33b12..dbe8876e2b1a 100644
--- a/sci-libs/o2scl/Manifest
+++ b/sci-libs/o2scl/Manifest
@@ -1,3 +1,3 @@
 DIST o2scl-0.920.tar.gz 34498666 BLAKE2B de269d1d6d329786d34dcbf84b6cb89d5bfae709ff1e0116455dbf8cee9e66d45b2a66086ca467037c572a8495ad198a23836861914c681050471810dda00354 SHA512 a80c959b76d15473e206f1caac496607af254f0617f7a18d13bd9732861b6c51f5db8ca3ff6866bb8d0ea70865d4ac94cb972e0a0c158f19034667340341467c
-EBUILD o2scl-0.920.ebuild 1695 BLAKE2B 4bf249767cc4011b78b82f56f266b9038c70b478782c98347fa4e3600a627c2090fc717edbc0e86c4894a8198bfdb4f6e4f9da42c54d4f02cb6e9c9955c8ca7d SHA512 ed949a98fd4d12e523aae68ada79e2732bfbe59d2e6da798aabbe51117a8260843a359340cd4621905fe88d42c3726ead1e0cbd9b36f87d381d9f3827a5c8c8e
+EBUILD o2scl-0.920.ebuild 1724 BLAKE2B 88a0b8f2b2ead321b624444735641f5ad7d6aff39fcc7ff6de2abf252fc5d446d045f5b36e63338cc452fcc466606c27d06d64eb3160f75e47c23fa287da523d SHA512 346c6f831e5f2e02b141eca538e3bd59ba5735ab48e2414cb6b063bf232f15b0319c5b10bca29faa226a98d30de9416a37eed6da5db905decff017696a8b02d3
 MISC metadata.xml 916 BLAKE2B 446190d6db707ff332ea9c475587e1be18182cc86119b0e10c85760cd9d7ede66cf1a169aaa6e7eb78b35aaca1907af3184f26929804fb51748c9a5e1c98e4a4 SHA512 f3dba036852bd676a220405744752ba03d1b276dc7e3e1781d093151dda4b21afb5dc2653f4e0809849be8f70918ed56c6798b8542039dd90640df9789c8897e
diff --git a/sci-libs/o2scl/o2scl-0.920.ebuild b/sci-libs/o2scl/o2scl-0.920.ebuild
index 44c7333a984d..14402ce10a5c 100644
--- a/sci-libs/o2scl/o2scl-0.920.ebuild
+++ b/sci-libs/o2scl/o2scl-0.920.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic ltprune toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Object-oriented Scientific Computing Library"
 HOMEPAGE="https://web.utk.edu/~asteine1/o2scl/"
@@ -55,7 +55,11 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
 	rm -r "${ED}"/usr/doc || die
 	if use doc; then
 		dodoc -r doc/o2scl/html
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index 351b79acb097..d80a2b237f9c 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,3 +1,5 @@
 DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
+DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
 EBUILD openlibm-0.7.4.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
+EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/openlibm-0.7.5.ebuild b/sci-libs/openlibm/openlibm-0.7.5.ebuild
new file mode 100644
index 000000000000..ca3ab8af5117
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.7.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	default
+	sed -e "/^OLM_LIBS :=/s/^/#/" \
+		-e "/install: /s/install-static//" \
+	-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX FC AR LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc README.md
+}
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 75931431889e..e78ffc1c26a9 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,4 +1,4 @@
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
-EBUILD parmetis-4.0.3-r1.ebuild 4120 BLAKE2B f3c5293939e260fbdec5268c854bee3831e5581aa746d70c12794ec3138d969dfeea7ac2fc3c9b651454b615c86ca4cf28a2a60238f0f8925a0e8a903e26b76d SHA512 5ab948e1c62267f7512e12eeb0f21348a78950b8fdd4fd917804cb7042b9e5457e88d8499d0e66a8d2832d36eba63b311c3d51a25fff4ee5f46e79db8ad2a864
+EBUILD parmetis-4.0.3-r1.ebuild 4028 BLAKE2B e5529c9b1ac73f54184fb85e7a8f3dc0bc5c80d5ae6e17ad23944fa45e227466ec9e4c671a366a7a8353bcbf05f5e320b7a581a14e4634d7c2472f549ef023ad SHA512 5c0945e3974c92c0f05d5bd0fb968e2d0b1efad060fe443d3b433408628b2182294526087f33d8387d0f37a4de35a8995dab4957d4fd585dad3c79a4e8bcf8fa
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
index 4bcc0ab1385f..017c930a97ff 100644
--- a/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,17 +22,13 @@ KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"
 RESTRICT="mirror bindist"
 
-DEPEND="mpi? ( virtual/mpi )"
+DEPEND="mpi? ( virtual/mpi )
+	pcre? ( dev-libs/libpcre:= )"
 RDEPEND="${DEPEND}
 	!<sci-libs/metis-5"
 
 pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-			ewarn "You are using gcc but openmp is not available"
-			die "Need an OpenMP capable compiler"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index 07dcccfa6a11..2285ca76956e 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,5 +1,3 @@
-DIST pyshp-2.1.2.tar.gz 217857 BLAKE2B f4c50e16987b13b7968fe37e4e7f20329b6871c879b837113aac281527f6a00d5d13e10f93e8ecd5896cf089d801d76cec5d93645a6919fbc48d96d4318bb767 SHA512 54fadaa133d3fbf3b9a318be02dd21c2a35a3c58c15de8e6d0cffa6ca83eefe12603fe5930d3df63ad4c6a6d711336752f08923c6406168207ac291d05592582
 DIST pyshp-2.1.3.tar.gz 219626 BLAKE2B 2da94cb4b1514a504b9f961b58add973a73dea641ad5867b670860000decd29af72092079b5d16f516b99a59be83028f4698faa2cb013200e533bbe772746d48 SHA512 249302e784bb38860037242b70899faaf504ef626c37decca44dc0d7c4f9482737e3234c0002393d1ef9800778715fc2b9946f3e3f3ecf507921e9db218d0d33
-EBUILD pyshp-2.1.2.ebuild 548 BLAKE2B ec38091a6c861119b8720a562b65d77b20ab1a3436100b371aeea7d92517df89cf5a5751ce4e85c47c2e1f5cf48cf7d70c90d8e303dbc7817de771f4019a7f55 SHA512 bd531baf392399be7a3a0cb9aa8b94aba509802068a0b5a1d04935838bc84188dddbd06b4d1dc82c1636cb4b1990dba20d2e457a3fda89c52546059550262228
-EBUILD pyshp-2.1.3.ebuild 548 BLAKE2B d7a5e8c753a116c82d58be22b8640fc1f819bec1e07b0991b8b4873a5087c8ba50156378ee24c2c75a6a7b2fa9869e8fa7b1ea64e2506d64e16f18a60e1efac5 SHA512 3edd1679372b15ececdc4522fdadeb5702d0ef27159d29d2dd184a3f136aad26f0956117c21f496ba07c812ffe7f04db919352bfb164e1bd1b5e7d5ca9703424
+EBUILD pyshp-2.1.3.ebuild 549 BLAKE2B a48d9defa84bed8d33e05da68c64daa98d2f4af0265e35d7ddecb7458d8104536b9c7f16070fb009d0aa72d244440ca13e1effec239efbcd9efce276df07abc5 SHA512 ff101b2859f9d70b3f4b06356820709f55d6451d3b7116a3ed17f3e0331d364a2c76f9e405ec078a39b09a829e50848b8ca4b602b5c1d54ef8a9ddc8a3f439b3
 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/pyshp-2.1.2.ebuild b/sci-libs/pyshp/pyshp-2.1.2.ebuild
deleted file mode 100644
index 8f2c827ab103..000000000000
--- a/sci-libs/pyshp/pyshp-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +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 distutils-r1
-
-DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.org/project/pyshp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" shapefile.py || die
-}
diff --git a/sci-libs/pyshp/pyshp-2.1.3.ebuild b/sci-libs/pyshp/pyshp-2.1.3.ebuild
index 0b4603541d4d..39660da99825 100644
--- a/sci-libs/pyshp/pyshp-2.1.3.ebuild
+++ b/sci-libs/pyshp/pyshp-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index 3b9a9d0e7e35..ab48a5117475 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,5 +1,6 @@
+AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8
 DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
-DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
+DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
 EBUILD scikit-learn-0.22.2_p1-r1.ebuild 1636 BLAKE2B c0a9c93eff797279d36a47d6990b76dd290c6b170c982a7179557043d0a7f84b8eea598c925166ded61ab4acc8ea2d5ec2ddf61d0549b51170e7626521694d3c SHA512 08f222a4c3d0e250e6a2ddd73fb1073898812c29f3728618ca1a33b9c559a69bd84e2d949df8bd15b8066909677292e0ee2c13815efbd8fe33a06a8ebe8c0c02
-EBUILD scikit-learn-0.23.2.ebuild 1508 BLAKE2B 46a4295f6e5fb78b5687744d78ae790447879a655e090a76c395ad43f0f4eae44be9b036559b4e429b52f1d8a6e8f384a7662d25aff0690f8fbea19be5387b20 SHA512 7dc7e7a4237a899a1515e49ec065ce3295dd35aacf936842023fe6a4e00c2e7c14b3653cb601bd25fc7e783e31258e030ca70396912f7b9c580a55a725910885
+EBUILD scikit-learn-0.24.2.ebuild 1807 BLAKE2B d3208c01ce56f170091968c3c7c5b9a017b895135d349691f04d26a590d3525cbb0b979cdaefa263dc8c0648a4421c5f18c532f6425eaf5188ddd3f55b386940 SHA512 6e2758fe1dc095f5f23ef85d748839563015884512391ba6127b9ac50e9c5bd37b73dde9924af91dd369fe1719f6d5cd0162e12a8f0a09753ff51f919cb333af
 MISC metadata.xml 736 BLAKE2B eb5c07231e185d9f9bd985209815f8515abf6bcff68e38563524542c8f591c1625711238b0d1b028776c8d658c32df3de4052a9dc88627a009eef5b8a7e68b5a SHA512 ee09304bdd96093bac49584a10b71650a3c764c28f03b851e197c31f8bbb6529b40433ad70f8100f33901b5b7fac8d349aad83ea10ad4770e16574484223af56
diff --git a/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch b/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch
new file mode 100644
index 000000000000..58caf95a9cf1
--- /dev/null
+++ b/sci-libs/scikit-learn/files/scikit-learn-0.24.2-no-O3.patch
@@ -0,0 +1,55 @@
+diff --git a/sklearn/manifold/setup.py b/sklearn/manifold/setup.py
+index 0db2d5d..fb4fc38 100644
+--- a/sklearn/manifold/setup.py
++++ b/sklearn/manifold/setup.py
+@@ -15,14 +15,14 @@ def configuration(parent_package="", top_path=None):
+     config.add_extension("_utils",
+                          sources=["_utils.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=["-O3"])
++                         libraries=libraries)
++
+ 
+     config.add_extension("_barnes_hut_tsne",
+                          sources=["_barnes_hut_tsne.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=['-O3'])
++                         libraries=libraries)
++
+ 
+     config.add_subpackage('tests')
+ 
+diff --git a/sklearn/tree/setup.py b/sklearn/tree/setup.py
+index 079ae9d..b38ee4b 100644
+--- a/sklearn/tree/setup.py
++++ b/sklearn/tree/setup.py
+@@ -12,23 +12,19 @@ def configuration(parent_package="", top_path=None):
+     config.add_extension("_tree",
+                          sources=["_tree.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=["-O3"])
++                         libraries=libraries)
+     config.add_extension("_splitter",
+                          sources=["_splitter.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=["-O3"])
++                         libraries=libraries)
+     config.add_extension("_criterion",
+                          sources=["_criterion.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=["-O3"])
++                         libraries=libraries)
+     config.add_extension("_utils",
+                          sources=["_utils.pyx"],
+                          include_dirs=[numpy.get_include()],
+-                         libraries=libraries,
+-                         extra_compile_args=["-O3"])
++                         libraries=libraries)
+ 
+     config.add_subpackage("tests")
+ 
diff --git a/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
deleted file mode 100644
index 4d66f60873c2..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/threadpoolctl[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -rf sklearn/src || die "failed to remove bundled cblas"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	pushd "${TEST_DIR}/lib" >/dev/null || die
-	pytest -vv || die "testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
new file mode 100644
index 000000000000..7fe7e3be3a4f
--- /dev/null
+++ b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="https://scikit-learn.org/stable/"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/threadpoolctl[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# For some reason this wants to use urllib to fetch things from the internet
+# distutils_enable_sphinx doc \
+# 	dev-python/matplotlib \
+# 	dev-python/memory_profiler \
+# 	dev-python/numpydoc \
+# 	dev-python/pandas \
+# 	dev-python/pillow \
+# 	dev-python/seaborn \
+# 	dev-python/sphinx-gallery \
+# 	dev-python/sphinx-prompt \
+# 	sci-libs/scikit-image
+
+PATCHES=( "${FILESDIR}"/${P}-no-O3.patch )
+
+python_test() {
+	distutils_install_for_testing
+	# manually run tests as they need some weird thingies
+	# skip tests which need data files that are not installed
+	local tfile
+	for tfile in sklearn/tests/test_*.py ; do
+		if [[ "${tfile}" =~ "test_multiclass.py" ||
+		      "${tfile}" =~ "test_multioutput.py" ||
+		      "${tfile}" =~ "test_pipeline.py" ]]; then
+			continue
+		fi
+		einfo "Testing: ${tfile}"
+		${EPYTHON} "${tfile}" || die "tests failed for ${tfile} with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete || die
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index a675d66b56d2..3cff08e67f79 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -2,4 +2,4 @@ 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_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B d280f08077dd93265b86458d7b9585451c1388344e96f410df601993550b79494d494d433e0ef9e46638108495b5903c3a2b646cc6d7f34ad26c4c3fbbad0226 SHA512 64c12a7fb1d4b6493e416e9a4d860a9135001541896068a718e8df3461fb5c226daa78f187e39d8e48cead80688390080051814fa546d35414b2211e3aa4b30e
-MISC metadata.xml 1274 BLAKE2B e140dd2a836530be2e4f61dd42200172d1b5c54608fd77d743ab349546ae1d9cb06d3be48c847fc646b31be3df78928d08168a53e90fe6a103cceb799a4429dd SHA512 7a0f3fdfdc71568a0a0ce2972ba93f2b17dce7725f0eeb56f046fa94dfc62747ffa0a33186e91265d6f46ab35c201ae49481db1077dac6c4866df818fb2b7136
+MISC metadata.xml 1168 BLAKE2B e77807bd62ed2b78c83b9b0c99b4dd62f79259bacd1559a017ad7e22d5e7b23bfde27c512630da9243739f11a180ae76f280bf5b524ca5ef2b8adc95bf2ce207 SHA512 15d84db92f7c2fb144f9385686041193cd35b2dda682eb0cef254e9ee62a20d38b748131d3878f4a326568993a23eb0c971909d62402ea3f1c30f4ec89300968
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index acd9751ef399..fcab05eb73d6 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
-</maintainer>
 <maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 096870f59f4a..14a47ebe3585 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -5,10 +5,17 @@ AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc083
 AUX vtk-8.2.0-pugixml.patch 599 BLAKE2B 4dc03d18d15acb351e817a4916a60c2dc76f97165f8a440e56399cc968e33a40575b5c3fc9fa35b5dd1af3dbf7e75b6330066d2fddfadefb48722884896663d4 SHA512 d72ed9d36b4e4ffd63d877ecdc17e5773f563dc1be1e3ab4888d6b6bac7308447bcafd8b0ee65d02ac83be20256f8c05dc36d1f077ace79a2d30b869073302fc
 AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
 AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
+AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529 BLAKE2B 6e3890d824cd3362439f3fdea0f3d01a37d7a5c1e871ed6ecbcecfb4e6e425ce4caf6176b122df4b80fbe1b95661a729428be0e3302205309949080894be7563 SHA512 1177b4815a800afbbaf8ee92a4d52df513c702fcc965cd0c12ba7f91cf58b2ed035277138ef2a091a4649eaf84e6f9b9275f8875385d4cfb89f6d3262c5eef4a
+AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00
 DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
+DIST VTK-9.0.1.tar.gz 34687900 BLAKE2B 2c1cc2a35eb6f05d23ec49d8c3c8d787134ce840f940d948da1e03d6875c15e2660c52776218fc3dbccf77959d9affaef051cba14991e6dd150ef5d50b5ae2eb SHA512 eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
+DIST VTKData-9.0.1.tar.gz 413680549 BLAKE2B 2804f8261763553408c1de8b0d47091875a262cf670604289879253922932f260d4ce8d1586e9b2a8ef3a1286c90e8a61c6472fafcddbd9b40090818eb310d49 SHA512 2fc418a6e15bd4e30ce181bb209c39666982645dbdbe2d6491683497662b72712689e58cf54b7af91865d0e3d0cb3f9ab66606b02964d57bf88d769d292dd938
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
+DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
+DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4
 EBUILD vtk-8.2.0-r1.ebuild 9708 BLAKE2B c2a3febf381f2dbc8298361bfe5c832c2e4dc5eb7f0ecab1357791c464d96ee5857b50086a517315682a8e6ffad837ba0c32f70cc4541cd3c6b53ad7966e3663 SHA512 c68899d16abe366d5286b4840605e8d173141681fee3489152524a70dfdb25611a9d2934d457284b6199261f0b3c2c34a4d4b097069feaae6d234cedcdcf137a
 EBUILD vtk-8.2.0.ebuild 9415 BLAKE2B f1784bad98faef85b698e73889943c1177783bd2b356baac8b7024f536c7f64e7343a0d26c003a948fa9917f8946a7482bcddf836a0334927185f38d6d98a37a SHA512 f4c5d23f72f69994241337e0bc20a936c64d3c0d5fb785b3da72d7e6612de4f35f98dbc2e4b6e670388051952cacc1d4827a0b0ea92ce909123a35606e9dc1c7
-MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
+EBUILD vtk-9.0.1.ebuild 13556 BLAKE2B b21501eeedd084b6887ed1c68bd5d9ef69d8336cd2f77458bc33fad938f42f321aec1fb56e08b3ef8dd08d042a5b6a6104e400a1f11c3ad674cc5b01d6d51016 SHA512 0c00f57c8d20d6ac7e1b692a12557f5256462aa2756a2b7a765ad60017c4c63c8b8d2c60fa0ada241e6d8fac2dcbf8016b70dbb67057805bfed534c2dff19f86
+MISC metadata.xml 1467 BLAKE2B 9d3762c4dbcc6b7f499350523fa3e55dd7c1f4fd5074ccdbe72c68a0c275758e5e4db187574dfc9180345e81ea263373232f826de8d55aa966fd3378569bf200 SHA512 6c8bf52de0c5591af316acc5c8a008893445241fd638d645733146af78fbbc2b0109e267be4e9b8fb8ec8841e5003ae7fdb9c948d3db0b0a24163d6380722078
diff --git a/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch b/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
new file mode 100644
index 000000000000..2514dac6356a
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
@@ -0,0 +1,32 @@
+From 33d9b7ded14ce36e3f63810f3403623ee5c2059c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 10 Jan 2021 20:29:56 +0100
+Subject: [PATCH] fix kepler compute_arch if CUDA toolkit >=11 is used.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ .../vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake     | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
+index ff0b2581..e565e783 100644
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake
+@@ -229,8 +229,12 @@ if(VTKm_ENABLE_CUDA)
+     if(VTKm_CUDA_Architecture STREQUAL "fermi")
+       set(arch_flags --generate-code=arch=compute_20,code=sm_20)
+     elseif(VTKm_CUDA_Architecture STREQUAL "kepler")
+-      set(arch_flags --generate-code=arch=compute_30,code=sm_30
+-                     --generate-code=arch=compute_35,code=sm_35)
++      if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.0)
++        set(arch_flags --generate-code=arch=compute_30,code=sm_30
++                       --generate-code=arch=compute_35,code=sm_35)
++      else()
++        set(arch_flags --generate-code=arch=compute_35,code=sm_35)
++      endif()
+     elseif(VTKm_CUDA_Architecture STREQUAL "maxwell")
+       set(arch_flags --generate-code=arch=compute_50,code=sm_50)
+     elseif(VTKm_CUDA_Architecture STREQUAL "pascal")
+-- 
+2.30.0
+
diff --git a/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch b/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch
new file mode 100644
index 000000000000..5473378512f9
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.0.1-limits-include-gcc11.patch
@@ -0,0 +1,84 @@
+From c7d6a8d81367a4ed92163c059aa3181386eabc24 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <ben.boeckel@kitware.com>
+Date: Mon, 3 May 2021 11:55:27 -0400
+Subject: [PATCH] vtkDataArrayPrivate: include <limits> for std::numeric_limits
+
+See: #18194
+---
+ Common/Core/vtkDataArrayPrivate.txx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Common/Core/vtkDataArrayPrivate.txx b/Common/Core/vtkDataArrayPrivate.txx
+index eb366f1c6d0..6709f7f3ac1 100644
+--- a/Common/Core/vtkDataArrayPrivate.txx
++++ b/Common/Core/vtkDataArrayPrivate.txx
+@@ -24,6 +24,7 @@
+ #include <algorithm>
+ #include <array>
+ #include <cassert> // for assert()
++#include <limits>
+ #include <vector>
+ 
+ namespace vtkDataArrayPrivate
+-- 
+GitLab
+diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h
+index f278e27..de6d842 100644
+--- a/Common/Core/vtkGenericDataArrayLookupHelper.h
++++ b/Common/Core/vtkGenericDataArrayLookupHelper.h
+@@ -25,6 +25,7 @@
+ #include "vtkIdList.h"
+ #include <algorithm>
+ #include <cmath>
++#include <limits>
+ #include <unordered_map>
+ #include <vector>
+ 
+diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx
+index c75935fd..9459ce90 100644
+--- a/Common/DataModel/vtkPiecewiseFunction.cxx
++++ b/Common/DataModel/vtkPiecewiseFunction.cxx
+@@ -22,6 +22,7 @@
+ #include <cassert>
+ #include <cmath>
+ #include <iterator>
++#include <limits>
+ #include <set>
+ #include <vector>
+ 
+diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx
+index 40504e5..125597b 100644
+--- a/Rendering/Core/vtkColorTransferFunction.cxx
++++ b/Rendering/Core/vtkColorTransferFunction.cxx
+@@ -21,6 +21,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <iterator>
++#include <limits>
+ #include <set>
+ #include <vector>
+ 
+diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+index 9944db6..01a1517 100644
+--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
++++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+@@ -28,6 +28,7 @@
+ #include "vtkHyperTreeGridNonOrientedCursor.h"
+ 
+ #include <cmath>
++#include <limits>
+ 
+ vtkStandardNewMacro(vtkHyperTreeGridThreshold);
+ 
+diff --git a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
+index 7823d61..02f627d 100644
+--- a/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
++++ b/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
+@@ -14,6 +14,7 @@
+ =========================================================================*/
+ 
+ #include <cmath>
++#include <limits>
+ 
+ #include "vtkLine.h"
+ #include "vtkMath.h"
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 6c1a962488c6..b7fedcbd9163 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>waebbl-gentoo@posteo.net</email>
+    <name>Bernd Waibel</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <description>Gentoo Proxy Maintainers</description>
+  </maintainer>
   <use>
     <flag name="all-modules">Build all modules</flag>
     <flag name="boost">Add support for boost</flag>
+    <flag name="cuda">Add support for CUDA</flag>
     <flag name="gdal">Support for gdal formated data</flag>
     <flag name="imaging">Building Imaging modules</flag>
     <flag name="json">Support for json formatted data</flag>
+    <flag name="kits">Build kits in addition to modules</flag>
     <flag name="offscreen">Offscreen rendering through OSMesa</flag>
+    <flag name="pegtl">Use pegtl to build parsers</flag>
     <flag name="rendering">Building Redering modules</flag>
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
new file mode 100644
index 000000000000..848e2fce63de
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO:
+# - add USE flag for remote modules? Those modules can be downloaded
+#	properly before building.
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit check-reqs cmake cuda flag-o-matic java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx webapp
+
+# Short package version
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? ( https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz )
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+# Note: external xdmf2 has no recognized target
+IUSE="+X all-modules boost cuda doc examples ffmpeg gdal imaging java
+	+json kits mpi mysql odbc offscreen openmp pegtl postgres python
+	qt5 +rendering tbb theora tk video_cards_nvidia views web"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views )
+	cuda? ( X )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( X rendering )
+	tk? ( X rendering python )
+	web? ( python )
+"
+
+RDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	dev-db/sqlite
+	dev-cpp/eigen[cuda?,openmp?]
+	dev-libs/double-conversion:=
+	dev-libs/expat
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/libogg
+	media-libs/libpng
+	media-libs/libtheora
+	media-libs/tiff
+	sci-libs/hdf5:=[mpi=]
+	sci-libs/kissfft[openmp?]
+	sci-libs/netcdf:=[mpi=]
+	sys-libs/zlib
+	virtual/jpeg
+	all-modules? ( sci-geosciences/liblas[gdal] )
+	boost? ( dev-libs/boost:=[mpi?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gdal? ( sci-libs/gdal:= )
+	java? ( >=virtual/jdk-1.8:* )
+	json? ( dev-libs/jsoncpp:= )
+	mpi? (
+		sci-libs/h5part
+		sys-cluster/openmpi[cxx,romio]
+	)
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	rendering? (
+		media-libs/freeglut
+		media-libs/glew:=
+		sci-libs/proj:=
+		virtual/opengl
+		x11-libs/gl2ps
+	)
+	tbb? ( dev-cpp/tbb )
+	tk? ( dev-lang/tk:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	views? (
+		x11-libs/libICE
+		x11-libs/libXext
+	)
+	web? ( ${WEBAPP_DEPEND} )
+	$(python_gen_cond_dep '
+		python? (
+			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_MULTI_USEDEP}] )
+			gdal? ( sci-libs/gdal:=[python?,${PYTHON_MULTI_USEDEP}] )
+			mpi? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/jsoncpp
+	dev-libs/utfcpp
+	pegtl? ( <dev-libs/pegtl-3 )
+"
+BDEPEND="
+	mpi? ( app-admin/chrpath )
+	openmp? (
+		|| (
+			sys-devel/gcc[openmp(+)]
+			sys-devel/clang-runtime[openmp(+)]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
+	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+	"${FILESDIR}"/${PN}-9.0.1-limits-include-gcc11.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+CHECKREQS_DISK_BUILD="3G"
+
+pkg_pretend() {
+	if use examples; then
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	if use cuda; then
+		# NOTE: This should actually equal to (number of build jobs)*7G,
+		# as any of the cuda compile tasks can take up 7G!
+		# 10.2 GiB install directory, 6.4 GiB build directory with max. USE flags
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_setup() {
+	if use examples; then
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	if use cuda; then
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+	check-reqs_pkg_setup
+
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	# If we have system libraries available use these and delete
+	# the respecting files in ${S}/ThirdParty to save some space.
+	# Note: libharu is omitted: vtk needs an updated version (2.4.0)
+	# Note: no valid xdmf2 targets are found for system xdmf2
+	# Note: no valid target found for h5part and mpi4py
+	# TODO: diy2 exodusII h5part libharu verdict vpic vtkm xdmf2 xdmf3 zfp
+	local -a DROPS=( doubleconversion eigen expat freetype gl2ps glew
+		hdf5 jpeg jsoncpp libproj libxml2 lz4 lzma netcdf ogg png pugixml
+		sqlite theora tiff utf8 zlib )
+	use pegtl && DROPS+=( pegtl )
+
+	local x
+	for x in ${DROPS[@]}; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+	unset x
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	if use test; then
+		if use java; then
+			eapply "${FILESDIR}/${P}-0004-disable-failing-java-test.patch"
+		fi
+		if use examples; then
+			eapply "${FILESDIR}/${P}-0005-disable-failing-tests.patch"
+		fi
+	fi
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	if use test; then
+		ebegin "Copying data files to ${BUILD_DIR}"
+		mkdir -p "${BUILD_DIR}/ExternalData" || die
+		pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
+		ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die
+		popd >/dev/null || die
+		eend "$?"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+# TODO: defaults for some variables to consider as USE flags
+#		-DVTK_ANDROID_BUILD=OFF
+#		-DVTK_BUILD_COMPILE_TOOLS_ONLY=OFF
+#		-DVTK_ENABLE_LOGGING=ON
+#		-DVTK_ENABLE_REMOTE_MODULES=ON
+#		-DVTK_INSTALL_SDK=ON
+#		-DVTK_IOS_BUILD=OFF
+#		-DVTK_LEGACY_REMOVE=OFF
+#		-DVTK_LEGACY_SILENT=OFF
+#		-DVTK_WHEEL_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		-DVTK_ENABLE_KITS=$(usex kits ON OFF)
+		# default to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		-DVTK_DATA_STORE="${S}/.ExternalData"
+
+		# Use upstream default, where USE flags are not given.
+		# Passing "DONT_WANT" will restrict building of modules from
+		# those groups and will severly limit the built libraries.
+		# Exceptions are MPI, where the default is "DONT_WANT" and
+		# StandAlone using "WANT".
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Qt=$(usex qt5 "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_StandAlone="WANT"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "WANT" "DEFAULT")
+
+		-DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
+		-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm="WANT"
+
+		-DVTK_PYTHON_VERSION="3"
+		-DVTK_RELOCATABLE_INSTALL=ON
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# use system libraries where possible
+		-DVTK_USE_EXTERNAL=ON
+		-DVTK_USE_MPI=$(usex mpi ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=$(usex X ON OFF)
+
+		-DVTK_VERSIONED_INSTALL=ON
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	if use examples || use test; then
+		mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	if use cuda; then
+		mycmakeargs+=( -DVTKm_CUDA_Architecture="native" )
+	fi
+
+	if use ffmpeg; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" )
+	fi
+
+	if use gdal; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+		)
+	fi
+
+	if use json; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" )
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTKm_ENABLE_MPI=ON
+		)
+		if use python; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		fi
+	fi
+
+	if use mysql; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use odbc; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	fi
+
+	if use offscreen; then
+		mycmakeargs+=(
+			-DVTK_OPENGL_HAS_OSMESA=ON
+			-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON
+			-DVTK_DEFAULT_RENDER_WINDOW_HEADLESS=ON
+		)
+	fi
+
+	if use openmp; then
+		if use tbb; then
+			einfo "NOTE: You have specified both openmp and tbb USE flags."
+			einfo "NOTE: Tbb will take precedence. Disabling OpenMP"
+			# Sequential is default SMP implementation, nothing special to do
+		else
+			mycmakeargs+=(
+				-DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP"
+				-DVTKm_ENABLE_OPENMP=ON
+			)
+		fi
+	fi
+
+	if use pegtl; then
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON )
+	else
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF )
+	fi
+
+	if use postgres; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_WRAPPING=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" )
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering || use web || use all-modules; then
+		# needs patched version
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF )
+	fi
+
+	if use rendering; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
+			-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON
+			-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON
+			-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-DVTK_SMP_IMPLEMENTATION_TYPE="TBB"
+			-DVTKm_ENABLE_TBB=ON
+		)
+	fi
+
+	if use test; then
+		ewarn "Testing requires VTK_FORBID_DOWNLOADS=OFF by upstream."
+		ewarn "Care has been taken to pre-download all required files."
+		ewarn "In case you find missing files, please inform me."
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=ON
+			-DVTK_DATA_EXCLUDE_FROM_ALL=ON
+			-DVTK_FORBID_DOWNLOADS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=OFF
+			-DVTK_FORBID_DOWNLOADS=ON
+		)
+	fi
+
+	if use theora; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" )
+	fi
+
+	if use all-modules; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+			-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOADIOS2="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOPDAL="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_MomentInvariants="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_PoissonReconstruction="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_Powercrust="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_SignedTensor="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_SplineDrivenImageSlicer="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_vtkDICOM="DONT_WANT"
+			-DVTK_MODULE_USE_EXTERNAL_vtkkissfft=ON
+		)
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	nonfatal virtx cmake_src_test
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	# Stop web page images from being compressed
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}/html/." )
+	fi
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+		einfo "Installing datafiles"
+		insinto /usr/share/${PN}/data
+		doins -r "${S}/.ExternalData"
+	fi
+
+	# with MPI runpath's are not deleted properly
+	if use mpi; then
+		chrpath -d "${ED}"/usr/$(get_libdir)/*.so.${PV} || die
+	fi
+
+	use python && python_optimize
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+
+	if use examples; then
+		einfo "You can get more and updated examples at"
+		einfo "https://kitware.github.io/vtk-examples/site/"
+	fi
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /sci-libs
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)