gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
135 files changed, 1044 insertions, 583 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e07d055be2db..c48873263771 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 0bc9c1089725..cdf3a0f67909 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 3511 BLAKE2B 348bdfbf3adefd3c633a5208e6ecd2ee14be9806a50b571d6805cb7288d517ae214571b17edc7fa991cd4612cda2f6d23815fdbfa9731f7a88875428f98efc14 SHA512 29cc6caa4fc7d65d3420013ae072c1b2a2d6b07407cb2223ab02741c3dd0cb863791d3df69f450379113c408e559e21f70870bbd8b3f0aa19790b059dffd5816
-EBUILD armadillo-10.3.0.ebuild 3514 BLAKE2B 8fcf3eeb1c06d0d4c9cdf64dcd0856a48c320c84b001d3813cb0c54a488eefba3ab2efb57173e3101a267c09d331faef0b9d34a25c1b0faee2706affd3e3fd01 SHA512 dccc8e0116de10becb4a5776b4d4227f72f80261b3ba4c1d24e9e0d84a8d8ec04a9cc561782f2fe6a60d8e84b2481f62e16e56af813d5f0b563ed50e53232ef5
+EBUILD armadillo-10.2.0.ebuild 3504 BLAKE2B 706fa316a6563911f9e4dcec84279dc17e8fbd65eb94c07ea2e3db2d670a74e681839cb277ddd754b46a1f75eea84aedf6752c87d5930ef7f0866e2cde951e2b SHA512 2811ad844e67c3dae361f80a279799dfe1b695376bd32d82d32356f1f33c89878c058228dfc329926a15bc840c7c8e08a7ed4652753be746a1129bd4991c65ec
+EBUILD armadillo-10.3.0.ebuild 3507 BLAKE2B 91405e1cd73e801d11dd5bd8a92b2b77b235592d96bfecc61049b3c93b21f17c65b04ee8eab8aacc7097dcf17258fc16b7e7aaf51023f9d05c1673fb92dfce7e SHA512 0e182d9c68a9c21967ac1f86a88a83d185ad76740f1ae42c64f1bfde75224b9f4c1da0db7660e30c121bf6a5bf843420df2d9914e2f8999acc060378455ab9ae
 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.ebuild
index eee69808e267..3dd605bc2960 100644
--- a/sci-libs/armadillo/armadillo-10.2.0.ebuild
+++ b/sci-libs/armadillo/armadillo-10.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake toolchain-funcs multilib eutils
+inherit cmake toolchain-funcs multilib
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
diff --git a/sci-libs/armadillo/armadillo-10.3.0.ebuild b/sci-libs/armadillo/armadillo-10.3.0.ebuild
index baaa3579072c..b0df3b4fe27d 100644
--- a/sci-libs/armadillo/armadillo-10.3.0.ebuild
+++ b/sci-libs/armadillo/armadillo-10.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake toolchain-funcs multilib eutils
+inherit cmake toolchain-funcs multilib
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index cb3d14b61ea2..68f9ba678167 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.6.ebuild 572 BLAKE2B c39f39496d63f558ccd49a8100f0f0cb7406419cb98e1c28c372902c7826ab7770cc69e0ebf8e7cb1cf57e301c9099556deb80bbdb750e5b3d180eb81a7160e7 SHA512 a44ae3362c0ebb724415cab85bd438558ff84cf4cd9d51e801912c60fa594145915fc0f9d4748b20461aeadba7c5a5fb5f4c7baf9b779f8849601bfacfbb3889
+EBUILD btf-1.2.6.ebuild 629 BLAKE2B 572423f5bd4c5c9de71e81323f449f0c186be2248568214b5f927bde20d3d64e85dd8451376385912da4acd5a2f1a52e38c29f610263db46ec98845d239b8f3a SHA512 7e4d2c4c76adf78a6818004c7a8a9b153c1b5c59851b8589b55ff37cf226b53d80a005d812b90401f3ffcb45b7978ffd1dd690aebe17ceb3b864bb3327f2681a
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 66bd6a7db7b8..2398cf4d63b9 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -9,14 +9,19 @@ 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="static-libs"
 
-BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 0ccae71b74ae..91352bc67780 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,9 +1,11 @@
 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
 MISC metadata.xml 841 BLAKE2B 6e302ea58d1e915a7b8f868c9e9e5f151434a3c1f8bd4583d0a2c3d28bd7cbd2d381b4c04dc9f2a3e63b3123ea566727ee275c9d4a13ada36f5fab34502fbac1 SHA512 59ffb087b063eeeb0446f66de657b745bea260ae96953673696d2780cb0d4ed86de718e0a3eaab6503e3395044c8c7291cc11e193d0bd72e720640f5df3d962a
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..6f5345f106d5
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
@@ -0,0 +1,144 @@
+# 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 lapack pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	lapack? ( virtual/lapack )
+	cti? (
+		$(python_gen_cond_dep '
+			dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	dev-cpp/yaml-cpp
+	<sci-libs/sundials-5.3.0:0=[lapack?]
+"
+
+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}/${P}_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=(
+		AR="$(tc-getAR)"
+		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 lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
+	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.1_env.patch b/sci-libs/cantera/files/cantera-2.5.1_env.patch
new file mode 100644
index 000000000000..576e2de2d577
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-2.5.1_env.patch
@@ -0,0 +1,103 @@
+diff -Naur old/SConstruct new/SConstruct
+--- old/SConstruct	2021-03-21 01:18:43.000000000 +0300
++++ new/SConstruct	2021-03-21 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)
+ 
+@@ -239,6 +239,9 @@
+     sys.exit(1)
+ 
+ compiler_options = [
++     ('AR',
++     """The archiver to use.""",
++     env['AR']),
+     ('CXX',
+      """The C++ compiler to use.""",
+      env['CXX']),
+@@ -734,10 +734,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-03-21 01:18:43.000000000 +0300
++++ new/interfaces/cython/SConscript	2021-03-21 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/interfaces/python_minimal/SConscript new/interfaces/python_minimal/SConscript
+--- old/interfaces/python_minimal/SConscript	2021-02-13 00:57:15.000000000 +0300
++++ new/interfaces/python_minimal/SConscript	2021-04-09 23:26:28.000000000 +0300
+@@ -8,7 +8,7 @@
+ make_setup = build(localenv.SubstFile('setup.py', 'setup.py.in'))
+ 
+ # copy scripts from the full Cython module
+-for script in ['ctml_writer', 'ck2cti']:
++for script in ['ctml_writer', 'ck2cti', 'ck2yaml', 'cti2yaml', 'ctml2yaml']:
+     # The actual script
+     s = build(env.Command('cantera/{}.py'.format(script),
+                           '#interfaces/cython/cantera/{}.py'.format(script),
+@@ -38,8 +38,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/interfaces/python_minimal/cantera/__init__.py new/interfaces/python_minimal/cantera/__init__.py
+--- old/interfaces/python_minimal/cantera/__init__.py	2021-02-13 00:57:15.000000000 +0300
++++ new/interfaces/python_minimal/cantera/__init__.py	2021-04-10 00:07:38.000000000 +0300
+@@ -1,2 +1,5 @@
+ from . import ck2cti
+ from . import ctml_writer
++from . import ck2yaml
++from . import cti2yaml
++from . import ctml2yaml
+diff -Naur old/interfaces/python_minimal/setup.py.in new/interfaces/python_minimal/setup.py.in
+--- old/interfaces/python_minimal/setup.py.in	2021-02-13 00:57:15.000000000 +0300
++++ new/interfaces/python_minimal/setup.py.in	2021-04-09 23:32:09.000000000 +0300
+@@ -12,6 +12,9 @@
+         'console_scripts': [
+             'ck2cti=cantera.ck2cti:script_entry_point',
+             'ctml_writer=cantera.ctml_writer:main',
++            'ck2yaml=cantera.ck2yaml:script_entry_point',
++            'cti2yaml=cantera.cti2yaml:main',
++            'ctml2yaml=cantera.ctml2yaml:main',
+         ],
+       },
+ )
+diff -Naur old/test_problems/SConscript new/test_problems/SConscript
+--- old/test_problems/SConscript	2021-03-21 01:18:43.000000000 +0300
++++ new/test_problems/SConscript	2021-03-21 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/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 4f65f32e8f55..83b916a1bd62 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -1,4 +1,4 @@
 AUX cbflib-0.9.3.3-unbundle.patch 8308 BLAKE2B f0038332a7e9fbdd45cd2747046df1d1ec6e5bd44b7e6e3dbac0e14e2be2c0d69317a96c6ce395fd7310139b9445d73019bef7ee60a931c4a68cf2572400fcbc SHA512 21f39214e188cc8fb76326765aba7da4d15c1b70d41c193016733d5b3d14e499178e25c45c807e7c9cabaf3a7f4e3e97c5ed2a8b383472ec9f4e4cbea9b3522d
 DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
-EBUILD cbflib-0.9.3.3.ebuild 1257 BLAKE2B 45d89f6d7379564f2bb2fb25b8feb09bfe2b68585bb19ead89944e7a6432fb92a9913e3607e24c2cc364e7c4858691e936b66b81326ac1d04d5141abf0ad2df4 SHA512 595b62939f0549daf8490e7a96f6a16a2e7e4f53b25628040b5c658c2bfc675eea54e00266f1ae57e8281888b0969219112708e08a4ab974444940fabfe3b6ed
+EBUILD cbflib-0.9.3.3.ebuild 1250 BLAKE2B 5faa13aab5e256bbf11c5bc0f9c6950d130be7c6425560eabc17bc6d5a7b1510c1101e414bc8e293024a9539d2f0284e91018171465605ed3b04b3d5729041e1 SHA512 0c91b5d6a7e50ecd1db3d8d9d95529cfec0971a382818006680cf3efc42bdf26cf9101c87cbed3826549a0717fe8a60fafe7e5a2818a3a7aacba45a81857b750
 MISC metadata.xml 987 BLAKE2B cfa565415af63f3eeb4afd33c5147da2619a7d5be4f871582fcef209cb606e55b40d95bd3f9e4d6c1fa938e849afc46140e761ada76ecbc9b744d9c2a8601674 SHA512 1917afb5bc1a5dbcd9e5ec175ac355e79929fd5ece8be7ea8606bf1ef7329affffa56efa5281df7d2c2eea4e1e3ef224c8310ee8cbeb1c44a0b32b232dadf007
diff --git a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
index 1cd25e42ef7a..4d53d2881cf6 100644
--- a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake-utils eutils flag-o-matic fortran-2 toolchain-funcs
+inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
 
 MY_P1="CBFlib-${PV}"
 #MY_P2="CBFlib_${PV}"
diff --git a/sci-libs/cdd+/Manifest b/sci-libs/cdd+/Manifest
index f076220e924c..ff600fbc237b 100644
--- a/sci-libs/cdd+/Manifest
+++ b/sci-libs/cdd+/Manifest
@@ -3,5 +3,5 @@ AUX cdd+-077a-gentoo.patch 1141 BLAKE2B 6b4a63e53e7a892df25eff22a198aecbed3e9b99
 AUX cdd+-077a-headers.patch 1993 BLAKE2B e9659821dd75f7202be84ed7384a4123e96ab50f5e45ec59724c39aea7c820417022abf2b15e2b1a60931be4a31c5e92857df83758e9dbbe54d11e328a0b75ba SHA512 8b141789efea76eba1256c0f9c882dc7920169c39b80040f8c7a0238cede399b69094cf3352b26c3996d0d9ced650c654cb12d07996d0c6466a7efa1069e609f
 AUX cdd+-077a-qa-const-char.patch 1469 BLAKE2B fe9afa62b86a0d43eea6b5652599f064905c3815d2a732eb4536988751c06c5e3fc795839c2d2cbc6eb61fc8beb2aa1faf7c1bfa51118fddd2b225970762641e SHA512 fb9165442197cdbe5c1994d1759eed4c7948ce2fd89dc15b10012684be5749e9cdff548d0809f7dbf6f07141d608b71f990c10d4fbe089c73abeda8519158ab5
 DIST cdd+-077a.tar.gz 186771 BLAKE2B 1bc1ae864c83da4f2c2d421c783f484933ee9625bf16d299a65ae738cb218e670453b661e9914776d6fc0766503a44f345c4cdfaea834120c79e677bb5686b46 SHA512 cb151274adec502420e5e931d2f248d62b26d5797f7d55f6db9c947f8e9d715a864c88ad08ad2cd74ada237789de5ca3c49dc04dc55e63d4101f07cc1685ab12
-EBUILD cdd+-077a.ebuild 855 BLAKE2B a7ad63b832cbf9b997ea18216e1eaf29601be2fb3e3b8d1f301819d6ef936248972b1f3b858caddf663d5772e4561440d2295474d78e0434a21cbf2a01aa850a SHA512 03c514c3bd410826e8a5c1ff69c35e397014fc40c9bd94ade0f5e06a876860ab942bd30b82dcfa675ce5455f6e35fcbaff229f7f2658ebdea046c5bde3f2f7b7
+EBUILD cdd+-077a.ebuild 852 BLAKE2B 067bb02142b588a6cd5855c330a5b3207784903490389dbe03a3ea913d9e94abe6fab2478436c32c90a661dc00907c94e82c20d10c0e4fae143b87916c748fa3 SHA512 bdb20e049558dfde9b40c9b810a52603436bbb5b75030d378beb0fdb66c27c2a2e54aeab7d4ae8c2b3aade5eef527387fb51ce9c5e880311e39942030e2386c3
 MISC metadata.xml 661 BLAKE2B 281640e5f49b4c8512384dc9f2a48996d96a6e91f7a85bde3510ae7808698fbc09be72d8997e37f8b27065fd9f5696384aec2880b5224d060727aba9f21e727f SHA512 cefc0b38a9d11cd66ef0646a3bad907d3fc4d78aa6cf24e594efd40b8114293c94255c3fea1bb54f66f5e1beeb6a732fe1809ffb62d4528ef3f63b6f7e4a73e8
diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild
index ac7812bf9f08..b0f5d66efdd8 100644
--- a/sci-libs/cdd+/cdd+-077a.ebuild
+++ b/sci-libs/cdd+/cdd+-077a.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils multilib toolchain-funcs
+inherit epatch multilib toolchain-funcs
 
 DESCRIPTION="Another implementation of the double description method"
 HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/"
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 3b1d0e20ce38..2b78dc445a4e 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -9,5 +9,5 @@ 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 3171 BLAKE2B aa123eaf3bb93f76d8654427eabf289cade23af0a34392d1657856247cb3936758a9ca42fd689241e612a369d335d42dc095de9311258e4b357b2501bcb62f76 SHA512 45fb170eb5a323f35c8c83029af361b231f06a959e0b0f48de6b74a783ee5dafcee2d8156bc8b6c818c0fc55ee29fa320d877e715f2b7c3c634cd5771ee95388
+EBUILD cdf-3.5.0.2.ebuild 3205 BLAKE2B 7932444280df28afa7142c3f79befbe9764257410d35173d5fd604c6897de15ab365b14662630b720f79a8ea3e2c49859af4033f38672a80094d328ef03adfef SHA512 f4cef0a15d1ee771abb614d5244a69a1d6209ce6fe65a337ed59c0c621f964d89643a279192df5a07edd74666b53ddc0d7e52c5bd282439237e6e52426a655a6
 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 0742117a90c6..1bdd8d2b12b9 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs versionator
+inherit epatch java-pkg-opt-2 multilib toolchain-funcs versionator
 
 MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
 MY_P="${MY_DP}_$(get_version_component_range 3)"
@@ -31,8 +31,11 @@ IUSE="doc examples java ncurses static-libs"
 RDEPEND="
 	java? ( >=virtual/jre-1.5:= )
 	ncurses? ( sys-libs/ncurses:0= )
-	"
-DEPEND="${RDEPEND}"
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
 
 S="${WORKDIR}/${MY_P}-dist"
 
diff --git a/sci-libs/cgcode/Manifest b/sci-libs/cgcode/Manifest
index bca3a8b8b0e0..a9af77cbd02d 100644
--- a/sci-libs/cgcode/Manifest
+++ b/sci-libs/cgcode/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0-gentoo.patch 2363 BLAKE2B 80c0ea8dce38494c2b21fc79ff9f7e8121e4d529015a496d9af7acb87f0a50e39e0338af6884d7e662005d064fa9ca8e0893ed45e746cc44b3b2730f47750917 SHA512 2daaf89d275a325404ec6804389a45fe02361e4e517a146dd329b9155a2200b4151bb559f4aad87055ed5d6da4227e0a30683ba82cfa1bb5f54c6cc40a76aea7
 DIST cgcode-1.0.tar.gz 77941 BLAKE2B bb062991d4bca842225b357a4bfd24edd2293ace224de141dc5782da82b3fb357d79cc8e06d90b948a8016fd726559469ab032b87cd8a678f10188079804295c SHA512 df76a2f8a0c00924af3d6933487a363fe23ded8281b392d40f240074c8643219f99dda9b6b6d515a281827d657a27ab06416ce152e65c5fead7549bb96be9621
-EBUILD cgcode-1.0-r2.ebuild 878 BLAKE2B 4265f193d1e375a4c23d82e34a69d145a4d2fe0932d22f179414ba1ed300d49ebeee561e996e449388bd6a3c971aec2dbb0d047935a73c6cad52b51e4e201600 SHA512 31d3f9af7fb4fea53253abf72ba84b85cfbbb3cc0ab9c404d8ccf2252e846b4a5f03aabc5aafd5308b61dea7d0b5bc8486206949997dddd9ee7abd2923464dbb
+EBUILD cgcode-1.0-r2.ebuild 878 BLAKE2B 5663e71c2d081c75d57efeb7cb0c2e4692407bd44af77623f3e12ac905ac17c6ab4b7744059ffe16d2a77b7a9e668a8a11f9663e5a968787096908ce6f0e4f14 SHA512 02d27d15f596a1360086edff5dc8639da8390b8922b35f0bd47e3f9a5791d27afc895f3850c0934b3306a41a5a54279e65001cda15bd6f111b464bca6944b6db
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index 931a56954eb3..dbb7d0622da8 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils fortran-2 flag-o-matic toolchain-funcs
+inherit epatch fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Conjugate gradient Codes for large sparse linear systems"
 HOMEPAGE="http://fetk.org/codes/cgcode/index.html"
diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index 0843364823e6..46dc87df4a30 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,5 +1,5 @@
 AUX cifparse-obj-7.025-gcc5_6.patch 524 BLAKE2B 5cf4ce9f5c0615636b5701cd64613e01f0ac130ba4166fd12a8b92d7ffffc368fd5666ebdd8ac9cd983359a97ed4294e6f66e0984b3c826c56ecfa8b130cadef SHA512 f2469b15eb74192b61b78c165249e8b953c58d0f7478d38f1bebf8c2c884e95ad42ba18af23b1ea7e4915979b5d4f70c2637e083a14a2c40e20f83a09acf616e
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.105.ebuild 1123 BLAKE2B f288c503e0d8aca32b17d762c77f121ef1108417e3dde60b17e5833f2348cc953d8f0e16f5dcb04c4d93e6b6245c76d14c6ad4b4999f80fb26c6a52793069f84 SHA512 7216b6dce971619f3cd346ae7ad88ea6f56f1e5b4d241d4bb7b7ab1fa119710ebd664bbe0598d9f6d1dd7f909f33e8f870c2051551c727661f3f2f4e3fcfcef3
+EBUILD cifparse-obj-7.105.ebuild 1116 BLAKE2B 3c14c2f21ded575d460468600d335b0f0eb4e054c87c0e4a0908de9e9eea91565a81dc8c10922131f33efc9276ab5d3896d5c4f6e69e2e669b288529d784ba00 SHA512 0962d210a3aa3b61aebd725a1d739bd45ebb4ba1832add1c7d2999694b136da86abc39514e21f457ae02aa65eb749ab15022d5acb04580f1a44bfa81a6aa7cf4
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index c575c3c692e2..3f986636840b 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${PN}-v${PV}-prod-src"
 
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index a62bf1c4eb57..8991a7d893b2 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 794 BLAKE2B 5be2889e37e2732c3473b4c0efd9eba0b1038c333713f78cee61efbd47a158019e4e87f0c0b4108d893e926cd29eb2cf1ede0b8a6656115c6ea185afb084331c SHA512 ee91ecf4098b989a91572a2f1b585f4a305c34769fce8dddcd4edcf3218b5a3647ac685ee64b192f7708cc2419602fa4b5fda46853234b4ebed178cd25611c5d
+EBUILD cxsparse-3.2.0.ebuild 753 BLAKE2B 1aef0b6e6b6db2116ccfa566909299b0893add76ca93eb333e1e0482949dec774b378aa1edb5336069d909e1332334526e5603491195aabf7a5ceb36ed1277b9 SHA512 cb676f18256b067b035322b0a5f019e613f7b0824d363b25299c2ae4b3ee0a5b9fc5655faff56a3a4f8aba2c43dbc4e8c5ffade537e02b14557e1f64e4cbba80
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index c5df715062a8..fa44cb7a77cd 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -12,21 +12,20 @@ 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="static-libs"
 
+RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
-DEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-header.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-header.patch )
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+	ECONF_SOURCE="${S}" econf --disable-static
 }
 
 multilib_src_install_all() {
 	einstalldocs
 
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 44b33ed8de55..08bf8c916684 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,7 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
+AUX dealii-9.2.0-fix-boost-include-file.patch 533 BLAKE2B f8aad2b17a3083da8c1aaf5461e5cf2b4aac2e78b34c46c7a3b965495a9c263687db6d75498a404be44f09bb952e7eeea0ac005da047f98ae526edd5ee8af473 SHA512 9a05e7787b7352c59e4756729ca4080f6c2a21bcd84429f2ed22d3fcd8e6d7183cb5686a7d88b0fd5868b2bfe53130d1fb2e9c3940ca0ccb8c8119a5e7532625
 DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
-EBUILD dealii-9.2.0.ebuild 5223 BLAKE2B aa83be23d21ed3717298ba48d0ccb452c5b90e3ee29f024be57793a18e91fa1c28dd6e074fb69efdf4ffe06c01f4d8949f04e34a909ef87c789051d33dc7bcce SHA512 a268cda47adf2dbce2922babd92371dd31b3f40be975ea63ca06fe60bfdd3971ad5679236f902451c4f8df06f5e07249cb95cc4b89d61f98caf46ce0bdf40661
-EBUILD dealii-9999.ebuild 5003 BLAKE2B e437c909fc248fd9b5bdf72093f4c04583ca6123a5fabcb4c9b95d989091ae0f6993e4d39c498c28dd14c49ae148b552cc65ce3b5adffb4d71c6eebf2ac1dafe SHA512 5cc9e9a4e4599dc3cbe3d07feb276304becf235dbf8099fae8c8833f57bff194103e9960fa4cb2dbda600dfabe6dff3071c7412a688abd08f01fcf8d04cb3600
+EBUILD dealii-9.2.0.ebuild 5189 BLAKE2B 536b0a1974c989ccf822846c45f99cfd665d5ea5132b0650319d55e562b1ac5e1e80fbaa880f2b0765346bc0d39d5fef1e1af5a51f09eaa0be06ccb353318c08 SHA512 7ebd8a28a7dc806a4e235ed3e93b756e1af5b2e488e61aa3cd3bb92c6b1ca9c2c710f7d417c221b58796f1d91e77bee7e1490c8bc286d36c13bdae18b4e24e09
+EBUILD dealii-9999.ebuild 4993 BLAKE2B 4c897f1fcd5af319ce209cee9cde4634ee30f9669f2094218cc481f076c3f5d1543101c83a6e64857b7191f73ef2fba4b50e0a5fe0741072d8a7e38cfd60adbe SHA512 0ac3d5e2333d5d3cb3a20c5f0c7ed2ca6c11cc55f976e6b1b4348acaa64071268a5e3ef4b71e9a45108f9d92dd719e1d0975bfb0d40e0ae6f13a5db023f36b78
 MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
index 84251e8e9386..00d5f0fe2429 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils multilib
+inherit cmake-utils multilib
 
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="
 	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
 	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
-	+lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc
+	+lapack metis mpi muparser nanoflann opencascade p4est petsc
 	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
 "
 
@@ -56,7 +56,6 @@ RDEPEND="dev-libs/boost
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
 	nanoflann? ( sci-libs/nanoflann )
-	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade:* )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
@@ -74,6 +73,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+	"${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
 )
 
 src_configure() {
@@ -109,7 +109,6 @@ src_configure() {
 		-DDEAL_II_WITH_MPI="$(usex mpi)"
 		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
 		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
-		-DDEAL_II_WITH_NETCDF="$(usex netcdf)"
 		-DOPENCASCADE_DIR="${CASROOT}"
 		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
 		-DDEAL_II_WITH_P4EST="$(usex p4est)"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 64d3092167ea..61619c7dc3d0 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils multilib
+inherit cmake-utils multilib
 
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
@@ -62,7 +62,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( <sci-libs/sundials-4:= )
+	sundials? ( sci-libs/sundials:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	trilinos? ( sci-libs/trilinos )"
 
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
new file mode 100644
index 000000000000..9fc6365d01c7
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
@@ -0,0 +1,25 @@
+From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
+From: Luca Heltai <luca.heltai@sissa.it>
+Date: Wed, 30 Dec 2020 09:54:02 +0100
+Subject: [PATCH] Fix boost include file.
+
+---
+ source/fe/mapping.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
+index 288a9debcb..4ef3ef7714 100644
+--- a/source/fe/mapping.cc
++++ b/source/fe/mapping.cc
+@@ -20,6 +20,8 @@
+ 
+ #include <deal.II/grid/tria.h>
+ 
++#include <boost/geometry.hpp>
++
+ DEAL_II_NAMESPACE_OPEN
+ 
+ 
+-- 
+2.26.3
+
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 87386f8381ed..d3e736bab821 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -2,5 +2,5 @@ AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f3
 AUX djbfft-0.76-headers.patch 995 BLAKE2B 8611ff8c7ca92d82e349476346d05fbe797e28395b01a659a48714febd3895c7301ed78b2b1c0a162b2ef15deec6d70a23581df89a543c32c88e138903ac87a7 SHA512 651ef26ef1ae00a5e10b512cef6cd741e77035dbdc792fdc7d215026ff4c3304ac0f1fd4c0e58debeb1bca2620a1002c67c1115b3590cf8f5b2453eb7a370684
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1789 BLAKE2B 3c5f9dde143fe2d959c6543a1e0f38969f84945f035bf180b6f851e5613b391bbb96f76edef4edbe9403b27e5581e1522739737e76fa2c5563a633c7a4b83972 SHA512 b995a793cfb292fc15b941377917cc2f1f8c8a042014854e68cec91afef200fbd217d4b958f1a07896bccf67796ca6c74d0e98687efe6e02a8e4abb515eed1f1
+EBUILD djbfft-0.76-r2.ebuild 1789 BLAKE2B 7dc5f9b89e9bd2b3085ab3833b11a40584ccb34cab998ac5ea71189454e40a30cbc6621ffcb71610d4f3e349a1d6d02a272eec62e9d4d03491d197bc2226c842 SHA512 b6e92a8cfa2e5fae6931ea3ec52ed235846d244fef944d616329756a405f121d3c0e55fa17835cb30cbb0046169f791aa62258f809ec3cae22046a8b89e3e8c6
 MISC metadata.xml 840 BLAKE2B 134f5c3b883159a7ff105730fff872b30cdc091c29ea434d1f1a672b0e65c3410ac596060bc5e98a5be3d5fd41b753867e3e35e8159315390a38045aa7ee479c SHA512 988a23596f952d9f9b874cfa7582fafda0ab2df81a03498c068665b968cf49d3fa7eb7977a09a5e2410c0432bc0addc2cf3a97f4089a6b43a7a16a67d2552d6a
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
index 4bf66301628c..ea41d6b0930a 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit epatch flag-o-matic toolchain-funcs multilib multilib-minimal
 
 DESCRIPTION="Extremely fast library for floating-point convolution"
 HOMEPAGE="http://cr.yp.to/djbfft.html"
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 0e81c7b2895f..b6c4cf999ac9 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,3 +1,5 @@
 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.22.ebuild b/sci-libs/dlib/dlib-19.22.ebuild
new file mode 100644
index 000000000000..04deb083df05
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.22.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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
+}
+
+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() {
+	(
+		local BUILD_DIR="${BUILD_DIR}"/dlib/test
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" >/dev/null || die
+
+		local CMAKE_USE_DIR="${S}"/dlib/test
+		cmake_src_configure
+		cmake_build
+
+		./dtest --runall || die "Tests failed"
+	)
+
+	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 fb20e649a013..f88dbb3a7ea1 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -4,5 +4,5 @@ AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
 DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
 EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612
-EBUILD gdal-3.2.2.ebuild 7728 BLAKE2B d5580737064518bbac3ff601069a7e8def19f17d3adbb65975e5fe82cddcaa27038b035555e26bf856b4498c40b15717f9f90f89561582918c1d2f611ce590a6 SHA512 2708bfc0cea227df3ad43af2084fc82042792c3a74e6bf3035c81f9fe4fcc43eef9c2dae89f61c8cd9375b90cd6faa3a0c72152e36600a3a0edbe74804c72cea
+EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154b8e6b34e1eb9fa1a0adc3f2e5cd26e60f0333a19a456907f270baeab5b5c971d47b3be63626c55fa1122dd SHA512 502b3419bd6b3046733036cbe23d5b6aa277c32539c2a8819cb6b6b8a907cffa91eff81cdb75dfe7dfb5465871be4b49db8c7e631520689677c351933bf2b606
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/gdal-3.2.2.ebuild b/sci-libs/gdal/gdal-3.2.2.ebuild
index b0bb442841b2..b2536db351b4 100644
--- a/sci-libs/gdal/gdal-3.2.2.ebuild
+++ b/sci-libs/gdal/gdal-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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="
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 43e22acb0a1a..d293c71f3ea5 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,3 @@
 DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94eeeea SHA512 9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
-EBUILD gmsh-4.6.0.ebuild 1778 BLAKE2B e324e1273c266c32bb3ed82917070dadb255523a41965475c8c34f50688737acf33f1ed0fc6400659f4723ef17a6063ba8dadd81d389eaea8a861dff064a36d1 SHA512 8d692920559100f5f92b50d441537ef2a9e924e8ccc9a5a5ec820180bf11742aac8a61550264ec20143db5c3cb480d6eb844fd9b079a22821dea7addd91eb97c
+EBUILD gmsh-4.6.0.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
 MISC metadata.xml 737 BLAKE2B fc604a0966c3106fabcd1379cf0cecbd28bd80c9068330206127cd35e134436a5ec3f43b19dfe0793e2a7a299a4b8f335b11cf2f723b6451a3b341077d27a6c7 SHA512 03f6a246c66264a58638c5ef89ec10737cbb15bd6d443f2f866fc77d21bf052c3ff4e00ca919546aa0da5b91c31a96af8dea5609a72dbb92a20c534e6a6f639b
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index 82c4c63a69b6..df5ea5533a0a 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ RDEPEND="
 	med? ( sci-libs/med[mpi] )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
-	petsc? ( sci-mathematics/petsc )
+	petsc? ( sci-mathematics/petsc[mpi=] )
 	zlib? ( sys-libs/zlib )
 	mpi? ( virtual/mpi[cxx] )"
 
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index ae3191eb5e35..b031f6f64fb2 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 480c0a8b51002252c7d06ba5b58f6682ebe48bf894c2a82b663f7df6a87bf78e77d6b4290312b2ccf4f691811d9535ee027d0f4e1afd9215a05d8b6f289110f1 SHA512 0a7985caf5f0105c822662d3ba9067af1f824bdf4e7dbb489f6c595e7c2cdbfbc2adb3842fff3b53ab77d6b53bad41cba3e42528ee65ccb01d1c1846f8d045e8
-EBUILD gsl-2.5-r1.ebuild 1400 BLAKE2B 80778daac6694157ddb2894cecb5fe6cd708770c26eca5f468cf5c5a9082469c2f58008d15ec37bd1739f3575f219c52de6ebdf61c0b0cc65fb5c909d057d307 SHA512 92848c84f40375a55137627a59b044d741b102fafdbaef6cf22aa43c61e982b39e03c51e58bf3fe99d5e63886d59995d1b184d978f65c1ac3c9b23db46658766
+EBUILD gsl-1.16.ebuild 3067 BLAKE2B d2678122d1be3f538847315011b3bac7d5f735822a14b091f00be56bee73bb448d300ae2a0796f5a3e6e67b51ab8ec3a0ecb3a276ca907d0f08e08626b927061 SHA512 3d418828a5a6372cf18ba80cce335980e7d0568197bb0afef3a738f47958754fe4cd4c95a35f3c8d6520de8b5f61c76f48a65a8b141eafee92a5cf34ff200180
+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 dd0a369c37c3..b4ccad464d8c 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic autotools toolchain-funcs
+inherit epatch flag-o-matic autotools toolchain-funcs
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="https://www.gnu.org/software/gsl/"
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index 2a2625d5c3de..f9cbafbd975d 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
 
diff --git a/sci-libs/h5part/Manifest b/sci-libs/h5part/Manifest
index 0b15fcd2b445..b5b0d0d1fb17 100644
--- a/sci-libs/h5part/Manifest
+++ b/sci-libs/h5part/Manifest
@@ -1,4 +1,4 @@
 AUX h5part-1.6.6-mpio.patch 948 BLAKE2B fb85c4cb0457a7f65212592c26ed1aeb8e917a9ebb4dbc8904c269bef6a8bc91f87e655de4a5f3e728d888bcd2526007de0cb10fab360cd079cd97a2e58e6834 SHA512 41ae0a9b9f2ae84b29133879136b392cf58c68ab75195179c7b95600bc693b3f6d2ab74533285a3727590f5aac61db2d9f4c9c732720fba15164fea8f29e7a34
 DIST H5Part-1.6.6.tar.gz 441755 BLAKE2B bc0027a91cc5f28009dc1b716fe548c670307ca19782158314d3358e66091608cf81149dece1fddf4f279aa920b06930019a26c5f34e4e3ce58df80d003ff5e6 SHA512 0842017bfe1510746e6f9451daaaaff3d9f6eee5209e241bcc8f2d0ce96450b8929f718c41a3434f53c9457adc2547628ad57ac8a0fb1cbfb7c74862aebf996d
-EBUILD h5part-1.6.6.ebuild 622 BLAKE2B 5311cceedea65f38bd85e6aef9d514cac4877a282bbcad0da00cfc7e8bbb2ece7e095d9482af9142ec0135733e5df7f5f74ff90e69963a9ee35cef218179947a SHA512 fc7dc6445857d9bec9453e0be6e16f0581cb82edc1946a6b798d7a58f8743c7c827687d848bf9bea3ff6b2ebc49f8b85e72c5177da3c45c5aeff24388abf17e5
+EBUILD h5part-1.6.6.ebuild 624 BLAKE2B 41434dc9f7400c2a5d387d512225c15a52c93fcb4b8ac3e58c37b975ed307d2ea90e16a22e7050e4c10203c652993968f53bc37c580d216b77f3fb36bd330c3d SHA512 a73b65addc9c05989ea4589e5b7ec8a95bf9f61b4789194fc7093bb5e066bb7da68a5f1daca4cf08dece98a325a4090a302f47e1c0ab5f8bb5d0bea946f743e4
 MISC metadata.xml 367 BLAKE2B cc3fc8e9dbc98eef49a88d43c68b358b5d2f658316247637a9a3925de3784eb2e82de849e0a49217d5b49be74c280b81a66abbfdd9310fd18b77d67451a480c2 SHA512 455c79e8837ba1ed980967e3236d4a0ac0edbd1b88b056a06d715894e03e7fc802079440752e60a06c9ce4acb62fd68d4020a7847a154a14065afd995257f685
diff --git a/sci-libs/h5part/h5part-1.6.6.ebuild b/sci-libs/h5part/h5part-1.6.6.ebuild
index 3e15653d504a..abf619f99793 100644
--- a/sci-libs/h5part/h5part-1.6.6.ebuild
+++ b/sci-libs/h5part/h5part-1.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://codeforge.lbl.gov/frs/download.php/latestfile/18/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e0244ff4af4c..454418468a50 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2877 BLAKE2B 093a9bb7446c78264077e99186fe58713ef3be4a4ecda2a514f64f9caba5c12c2cdea0d8aa04a7ec53ace4e8d98a7fcd781e4b24c2a813bf55da2bfbc8ea3435 SHA512 5cf1a3620ab03e505d3a2bb662d9b7f99467dc33b2f5ef880be92ad94e4fe0366d6db5ea345801c0167d9a230312b8b847c98d2a71521f11df5773ac1fe95910
-EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
+EBUILD hdf5-1.10.5-r1.ebuild 2870 BLAKE2B 1a20bb0b9ec7690021f743ee25965ac87376213c4637dca27d9ec200b73727c5ef8c2c164aae05f17828df336e9d0fd9d2b8b81bf388e522ccad2b05e9e4633c SHA512 b6337cd9cca6ce5615a681cd2e452d7b58acf4c9c018c07ea8d754711aa83d47e5682121c895a4b9c2eb82b7e6fa888f6dd6762c33620ca369a047c774c20f2e
+EBUILD hdf5-1.10.5.ebuild 2705 BLAKE2B ea56ce9dc157e2b61fbb9f06ab23b0a249b2a7295d882a22c49c6d2da784dfaa55d7d4fbf64b150b2bf74a608b0adeecd35ba42c82fbf6655defa63d47254b51 SHA512 fb4ba35ce6f85630f5b92a499208590769a48782e8dae1be891ddeccf0cefca9209373e55c7d05e628d9157a5d142a7bdf5bb6e542686bf2c871d784c4bd93dd
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index 5fb40889ca3c..8836edf76cd1 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 FORTRAN_NEEDED="fortran"
 
-inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index 9d3676dd8897..cfadb8e89e3c 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
 
 MY_P=${PN}-${PV/_p/-patch}
 MAJOR_P=${PN}-$(ver_cut 1-2)
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 1ff7f15ff30f..a160a2d8626e 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
-EBUILD hypre-2.20.0.ebuild 2787 BLAKE2B a317027bf74f9b09ed5a1c98a4a258a46cb40ee4dcdca817a7b6c9a7e76b744c805f68e0555b7404ecf24a1c5c2245fe947421673cd1fcd8cbb644a0157262ef SHA512 031f2da16f164276bbbfdca3566e3000bdc8ac1eff22a045db18487264f5c3de5985ca17811c1c75b274af84abd0a04699c963dbaea4a9c471bd54af4437383d
+EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab
 MISC metadata.xml 615 BLAKE2B 8bd8c87a70e3203b79255f63bf25671cbaed470d177d2dca5ba77348fcf3430482f80b06d2f48beaa24eb49664aaaf2b93410d7240f402313694031362bcf899 SHA512 51002ae26a7957688265381df0619348726b6f6a39a036421e8574dc56382b21c1b642f3f0592f8eb02b1435979adcc0936fe734f1a01080093a0802af30d205
diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
index 4fec2500afed..c7a163995f57 100644
--- a/sci-libs/hypre/hypre-2.20.0.ebuild
+++ b/sci-libs/hypre/hypre-2.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 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"
diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest
index 8cf98c890b74..7d46dd624462 100644
--- a/sci-libs/inchi/Manifest
+++ b/sci-libs/inchi/Manifest
@@ -2,5 +2,5 @@ AUX inchi-1.03-shared.patch 804 BLAKE2B f76a320c3bdd88075f5717e2bcfa717a7acd2b17
 AUX inchi-1.04-static.patch 570 BLAKE2B 33ef224a8fe2304143b51fc57188b8e30b08797a9495c665d76f9cc4436ef8ee6804b50cda1bcf2b11b56acf829599a5b0d8318e75e434a90eedddcbc3e5ebb0 SHA512 0bc4aaf5ff4565517dbef481ca89069f3e91bd8d2b02f8e2591519183feca8725004a51375bec4560002d35b030483a21d9e36a1eb8202e3692186e23dcb7078
 DIST inchi-1.04-doc.zip 2128303 BLAKE2B 041ee948e8a852b66e64c8b04a52a4b4972a750ebdc0e31ce68e6bacfae4d81e49e8356cde766fc87affacc6839c015d5e578e9bacff486605ce5d6b63ed1552 SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7
 DIST inchi-1.04.zip 2701930 BLAKE2B 12e5153fdefffdd97794b3942936f93742729cd195a1be0687762263e1d8aa9b0130a79cc1c8a652d2cad67b14a175b8f5ad968c83094f9ebf250f43bcebc18c SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4
-EBUILD inchi-1.04.ebuild 1864 BLAKE2B 757974d84c13c68f45a9a0dcd95ebdd17123b0c9f37b72c6248bdd4388b3a38a23edb73a0d46ef148f40466e9c146051645f220c709c869268b9aa3ef08da15b SHA512 88f724764edcb050b0eb5f4464a3d64f3580cdc247f773bd912e0d89e854baaab72b9d575759f7f57bedb728729399b52bbf645d7db69c752d9a2ae171425327
+EBUILD inchi-1.04.ebuild 1861 BLAKE2B 63da8fc04f9e8d9c20e9a6d9f4c56ee22150eca3dc144d881df58c99c71a0d777c3941c5e55fd86aa6de68c609b4e985edc928e80d492ccdb291f9b472063a2c SHA512 f3bed4d4b5e4220ab7309c78417786f301e51ae65e9fa8bb5e7669753be556b8d3981015e7ffc4d652c8bfba2341fa2f55c9db6dd263e1d3d436ca856e5d4718
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 984b312edafc..c41a1e5ee2dc 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys"
 HOMEPAGE="http://www.iupac.org/inchi/"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 275860d92be1..49b8c91d420d 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,7 @@
 DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
 DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
+DIST indilib-1.9.0.tar.gz 2291283 BLAKE2B 1ef715cfb388a686ad2121e1fcf2589a5d88e68e5cbdb11d72797dead63032782c32e9ae16a88304e59bb0cbb53aaefb6b919125b566958884cc252607c876d5 SHA512 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e
 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
-EBUILD indilib-1.8.9.ebuild 1192 BLAKE2B 25b550018dd7ac9374e69666e69995edb133802609904ef526ece7a8d0b60645c0bd57c282a2a3cd4e48e1ff3daf164db9c9eb35cae8ec9393cd2b4e2dfa3277 SHA512 da09509560050f9f8eadcd28ee79da820cb489f2eede8f2e0343671fe7db5cbf932debbad09ee335d54432a8140f1268ed8a8d989d41154b891e7ddb4c203de8
+EBUILD indilib-1.8.9.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
+EBUILD indilib-1.9.0.ebuild 1192 BLAKE2B 25b550018dd7ac9374e69666e69995edb133802609904ef526ece7a8d0b60645c0bd57c282a2a3cd4e48e1ff3daf164db9c9eb35cae8ec9393cd2b4e2dfa3277 SHA512 da09509560050f9f8eadcd28ee79da820cb489f2eede8f2e0343671fe7db5cbf932debbad09ee335d54432a8140f1268ed8a8d989d41154b891e7ddb4c203de8
 MISC metadata.xml 460 BLAKE2B 4162b7e9639a47a1e701c92680c6eaaf1a112c4bda3a2e5313d50a788a7150cf8d6a9348cbed8fff941a75af9065959894dd0cce861a16946ed975a734e5386c SHA512 c626e10b7ce367dcdbe278ac7dcc32ece8e7de11fb3003da1c7fb6a58105d377f1ec2593ab8d1f7a06ce00dfb16e06a7fab66b9ebcc65250f1910ffc778ea6a6
diff --git a/sci-libs/indilib/indilib-1.8.9.ebuild b/sci-libs/indilib/indilib-1.8.9.ebuild
index e6ee5b9fd220..d133f7e42252 100644
--- a/sci-libs/indilib/indilib-1.8.9.ebuild
+++ b/sci-libs/indilib/indilib-1.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/indilib/indilib-1.9.0.ebuild b/sci-libs/indilib/indilib-1.9.0.ebuild
new file mode 100644
index 000000000000..e6ee5b9fd220
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg test websocket"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P/lib/}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
new file mode 100644
index 000000000000..1b6f8e3dbf1a
--- /dev/null
+++ b/sci-libs/kissfft/Manifest
@@ -0,0 +1,4 @@
+DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
+EBUILD kissfft-131.1.0.ebuild 1222 BLAKE2B 6316ea22067eeab14bc1e5d3854d9f316673db8be8245317734cb3922bd83dabbe4909d00cc6fedc72a6a911428ee192cc0cee9de4b6102fa350df8a6cb393bc SHA512 840630bfbe5d4b79ef07517c152fe4f06c02593f452885b08b1206cf5f29d318fd028ad0035ec49640b6dabe09b5449ecef56289fc7b1a2bc49cf8eddc3a857d
+EBUILD kissfft-9999.ebuild 1222 BLAKE2B 6316ea22067eeab14bc1e5d3854d9f316673db8be8245317734cb3922bd83dabbe4909d00cc6fedc72a6a911428ee192cc0cee9de4b6102fa350df8a6cb393bc SHA512 840630bfbe5d4b79ef07517c152fe4f06c02593f452885b08b1206cf5f29d318fd028ad0035ec49640b6dabe09b5449ecef56289fc7b1a2bc49cf8eddc3a857d
+MISC metadata.xml 524 BLAKE2B 077725c10a1fffdbde22e261ff45fc5acab53a0d1a1493c094aa01a5f81da622392420924c65ae6417563b79339abf734e6d1d70a8d7047e00c06901ce1c9b1e SHA512 88bc18934f588bb9fba48ace868ac40d406576ffaf87ba44d1783dd1e0039f7119369f36d96d0ae82349f6d8b2a5ea4c32e5b1ad6ed9305e9e441b00eb6d9479
diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild
new file mode 100644
index 000000000000..ad2bc1ff31a9
--- /dev/null
+++ b/sci-libs/kissfft/kissfft-131.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
+HOMEPAGE="https://github.com/mborgerding/kissfft"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/mborgerding/kissfft"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="alloca cpu_flags_x86_sse openmp test tools"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		sci-libs/fftw:3.0
+		$(python_gen_any_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKISSFFT_OPENMP=$(usex openmp)
+		-DKISSFFT_TEST=$(usex test)
+		-DKISSFFT_TOOLS=$(usex tools)
+		-DKISSFFT_USE_ALLOCA=$(usex alloca)
+		-DKISSFFT_DATATYPE=$(usex cpu_flags_x86_sse simd float)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild
new file mode 100644
index 000000000000..ad2bc1ff31a9
--- /dev/null
+++ b/sci-libs/kissfft/kissfft-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
+HOMEPAGE="https://github.com/mborgerding/kissfft"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/mborgerding/kissfft"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="alloca cpu_flags_x86_sse openmp test tools"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		sci-libs/fftw:3.0
+		$(python_gen_any_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKISSFFT_OPENMP=$(usex openmp)
+		-DKISSFFT_TEST=$(usex test)
+		-DKISSFFT_TOOLS=$(usex tools)
+		-DKISSFFT_USE_ALLOCA=$(usex alloca)
+		-DKISSFFT_DATATYPE=$(usex cpu_flags_x86_sse simd float)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml
new file mode 100644
index 000000000000..1dd34da24f4b
--- /dev/null
+++ b/sci-libs/kissfft/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="alloca">Use alloca(3) instead of malloc(3) for memory management</flag>
+		<flag name="tools">Build command line tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
index 803ce1f56b8d..354c085fd031 100644
--- a/sci-libs/libbufr/Manifest
+++ b/sci-libs/libbufr/Manifest
@@ -1,4 +1,4 @@
 AUX libbufr-000405-makefile.patch 2365 BLAKE2B 6225f70528471535d6b9466b133cd52968e00da68ad0644b05dff4621f0e239d6addab0047ce1b7ee26b312a6f2d9fc416ac53677664e144207c97d545ccc08f SHA512 1a1fb37c5de730c8158572285f5677c61d4bba28da1b9d0651223d0b37b69034f3f2a003c38dc8a0dc96018b2cc476c612379a1d9b58983c83fe8c3600df6569
 DIST bufrdc_000405.tar.gz 11873311 BLAKE2B e8282fc539b80365420c538afd911aaba698d6a60d15018eae2d4f00e0838c3f665894078b2c0969b4558841187dd6a4a9e620468cebd5b08e171a2c18c85288 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169
-EBUILD libbufr-000405.ebuild 4876 BLAKE2B f76a796a08c91d1c3471c62d65635e48735aaf00883e0911862653c464104f268191e9f8beb5a08496d836dd242381f817950fb80cc17d5f68e9fe16cb6b2a6b SHA512 7ccad66aa7f1201c1c3322f87cfd8d229846c7449264095de5342fd1e53e67562800ccfaffa5428d50df73a03a09c304b4ad560192785004d9072bfffd9a6acb
+EBUILD libbufr-000405.ebuild 4873 BLAKE2B 9c910315627e2761988ce4c74473387afa6ce3e0c526f2a9484ac04df3b587b238a8080d9e396f2fb2f37110d9c3f443030e801d335ff658a05e9379d83baa3a SHA512 7279353bb95e4b17c1f9f54405785a2bdb4ab8a525790479eba30b32a85df0db6dd2d0245cff668b0bef46f0b04e10fbe99b2adc96cb964100b260e6f50ea9e7
 MISC metadata.xml 413 BLAKE2B 557f7011fd9932889c78387be3135f93fccf077a81b6b6059bf25648b514f4e123cc548d63820ce63f22904e4fe41ed95433a0c1ecf49b46bf30a7ba90117694 SHA512 215accb7fe4f8e1ad20104ca2205c8eca34a528af360bc6e2325d4f650851b51e80d910688c2b62d6a1d20d556eed5c72bba7045390e5865f49e137c17f66b97
diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
index a97b5cb6af7d..85febe3abf26 100644
--- a/sci-libs/libbufr/libbufr-000405.ebuild
+++ b/sci-libs/libbufr/libbufr-000405.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fortran-2 toolchain-funcs
+inherit epatch fortran-2 toolchain-funcs
 
 MY_P="${PN/lib/}dc_${PV}"
 
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 59c59cbdf06d..75c8d4845b32 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 799 BLAKE2B a4202b3ca26a3128d7d69e58aba276a4bb511be56975aa69220f6fe006a6bcb23e89c5c14f5953dd3c02bf57a63716db3c0bb58352c6e0f7d4998aba98f9197c SHA512 eeb8d93543667f56c8acf66f7cc8b64fd41b49d1ac25782fb2c2196304a5caa8f370c291c07b847d25e4c011f07cfb621accb59b432d331f95989015cb549208
+EBUILD libcerf-1.5.ebuild 800 BLAKE2B 24c55a5b3fd777422f1f24fc790ac6f3fd5d3dc0c098c5e9f500a6e5d8635161118d29196a331586cc6d3850691c6f4ff6f6e0fd146e2ad09bc52d3b2a392eec SHA512 c4e8b09eda5d680d8788cd28556e23434e9938d557dbc41af3e897934002071f383a3b13ebbf05fa4587993814de37e0699734d61270a70e70a22c3c7434fbd1
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 5bebed231186..67e76bff0cb4 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index fc4289ad736a..30d08d3cd8ea 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -2,6 +2,6 @@ AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22
 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-2.6.0-r2.ebuild 1426 BLAKE2B c26877836d578b3150173e448e037a992e8004a7b70af600a1a8e809e872f0d787f180b4db07f5c9a6f21f8469878c53d9736f3feede1b332dc2fe33c9e52f2c SHA512 9aeb3443d6c29ffa8f4c2e7444d7ed1910235a6fc98f5d7e388ff3d59420526eb95071326c0bbeb6d7607f543fcaf27779c21b2289351e729674c84aba877218
-EBUILD libint-2.6.0-r4.ebuild 1534 BLAKE2B 3553b5e79439d2af424f68d2a16d656c1049cf80eff638615f6fa0efd44964b65495a15d1366f47b3b6989e8635b74cb45e33bea461ed30a48a65cbf23827074 SHA512 a1a703f45c644ac79ad24283f30d311adb7edf3d702bc14059b3c1b18bb6679630304d45f144dbaf0ae0730430b877d13d2e2e3851c2494ebcf9bc971aa8c7b5
+EBUILD libint-2.6.0-r2.ebuild 1419 BLAKE2B 97eb79e76322556df6ce310dacf96024dfcc0ced9e59bcd287510cecae07d04e4cc4137c0b95759c1ae9d4e9755ad97ffb5d3aeca5206d8fe90b4197cc89d769 SHA512 84ae51c30ec02658cdf30e609f3ab7ec5c37e8120fbf8c07f15efa6b407e653a42f3cd563f4edf1b2dfde52c2b152db5199723cbd3b73a7e79f40339444c64c9
+EBUILD libint-2.6.0-r4.ebuild 1527 BLAKE2B 6c0e8ddd9c88f4524e9647fc44a13589013b426896e5325cd7c179dcbee2c2289b9281a205c455f32f5867e9976fba4ac7e13c71e2dad94fe8cff806ca29e90c SHA512 7aa9c96bfa2166579e48bd548bba4b8d72f4c4a6f28d79942dbaf2b3d87317ef9dd33aa779611a2d9cf3758eb74993363d42a1a16758fc6ebe4ba2d5c82845c3
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0-r2.ebuild b/sci-libs/libint/libint-2.6.0-r2.ebuild
index 6646dd1f96d1..f66470ae1fb9 100644
--- a/sci-libs/libint/libint-2.6.0-r2.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fortran-2 toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
diff --git a/sci-libs/libint/libint-2.6.0-r4.ebuild b/sci-libs/libint/libint-2.6.0-r4.ebuild
index e248dec698c2..b8166abf35c6 100644
--- a/sci-libs/libint/libint-2.6.0-r4.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fortran-2 toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index 103d9ecec1e9..2b6e32b36742 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,3 +1,3 @@
 DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f
-EBUILD libnova-0.16.0.ebuild 854 BLAKE2B fae4c60646141ebfba8e0d37a2e9dc3616eb9c92e0a211fe9b84e9d86f59c57c3b699f7a70461a61f518f9288a73496e385b60a75aefba4f6b6d9013a4503ecb SHA512 51d60ce87fcef595d5df68e6bb0a37592972ef70306e994dca16698a13263d86b5aa5ba53bd1417e07627f8af4580fc632c10d4f611c50348e77325d8315a6bd
+EBUILD libnova-0.16.0.ebuild 855 BLAKE2B 7a33edb1fa58cbcf694137322f2a8db95cdc9ea6fdc998bdbdda82742010bfb218ef996e8ad59cbf53f84a487abe502f68a0e86ad4e13efe2e6d13f182faf347 SHA512 de35ca4503d022bbc7f7da7a2baaf13b15718db4ee807425eff9193739c48aa1fc451b3ad4be3f0c16ca4c7a8a0358e841db036ce9ce16e6c44e49f6a98ab429
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index 88c69ae3b516..8a1f2fcfda76 100644
--- a/sci-libs/libnova/libnova-0.16.0.ebuild
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0/0.16"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
diff --git a/sci-libs/libpdb/Manifest b/sci-libs/libpdb/Manifest
index a69dc06fef69..ad0626f149f9 100644
--- a/sci-libs/libpdb/Manifest
+++ b/sci-libs/libpdb/Manifest
@@ -1,4 +1,4 @@
 AUX libpdb-991112-dynlib+flags.patch 1142 BLAKE2B 32a7c2b11a4ace733bdf0f3bd92f8be9212a40a28c9d349fa4c04cf00ea2082bac659db4a53da4ed833b988b9cf5e82ac75c92bffd50be11896f67209424d5f3 SHA512 6d93db5444f4ecb6127afc5cb20e806c4de55c31d909540403ec73a861c09a577a6bb9e55e2f2a0dbfb35c2fe5093776724f5ed735f3519980b8dd87706c3870
 DIST libpdb-991112.shar 123895 BLAKE2B 26b1de521fa2de1003dd34d4ce280a2c402484385ba61119ac6e1f13160bc5354e4c3668c686924c686c61c3328d7a0d4fbb0fc956d1329993045b3ff6e67835 SHA512 ae356997d11068736bbbd1a57e4e3a28fa54fd396326bc8fea41485186a1c69ce39c7f81195ae65ddc59c017d85dd123614f56f910c8faffd4791fcfd1b064f4
-EBUILD libpdb-991112-r1.ebuild 811 BLAKE2B 22b985034685f2f82096c4d18e3f95627165a68f9d405bcf4135ff8b114aae8788e692d81ff515298ab21d19319d3b3c537f55c62a07545b6080f813d364b9fb SHA512 7fe2517be72699a94004a16feeab661f68d337e0b64655152aff6337d50d80d12d2ee8a3386bd5933ff742f90f8160b18ebb8bd007f86e14a67f78e8cca7cfb0
+EBUILD libpdb-991112-r1.ebuild 801 BLAKE2B 55b4d4df4e4c4679668691daedbde31d5186035da6ac99ea58e885d989f0682b21ae87c3eed17c6f7f3dbf4c669c654dde62974b1d93ff2f385bb4acabec47a1 SHA512 69c78e35e8f3f536a5781147c4dfff697c84fb7833f836b42036fbcd7fd7dade30fdf85c07cba5e463107bbee61d371001fd65442f66bcec467f1e342e1989e4
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-libs/libpdb/libpdb-991112-r1.ebuild b/sci-libs/libpdb/libpdb-991112-r1.ebuild
index d9f08556e58e..31d30652f13e 100644
--- a/sci-libs/libpdb/libpdb-991112-r1.ebuild
+++ b/sci-libs/libpdb/libpdb-991112-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="PDB Record I/O Libraries -- c version"
 HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html"
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index ff4c744d8e2d..46b5b603f245 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,6 +1,6 @@
 AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c
 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-EBUILD libsc-2.2-r100.ebuild 2298 BLAKE2B 7fe4e4c2c9a414c0fb9b9767b51eeeb7eb037829f93a0a29e4f71b8398f31ac10683a2ad478b28409da714fa59ff4e5ad93421c7977053f893b375bea0b16802 SHA512 119f54c96a01ad9798093f7fdced4299acdd11f6b420971234522f4e5a85ed7beced81ff65681cf07451ea8ec888fd599ebc1cdcaa9067cd43cc528826e92d0e
-EBUILD libsc-9999.ebuild 2308 BLAKE2B 42c7dbf970bd4d5528e5861a91234559814559d0cc1f3b9a0fd744f40fb0862f02f30859fe60c70733777d46aca74499b12359df74e2f49aa8d35f9fcb7e2edc SHA512 78b49ae6dece4e83a8482229e05c27f56af54f3e369940691c3625ba5218e9dab63cda2ae4f30a57b0f7221669e849e2924493cfd1d892747b2f6b1903bd1403
+EBUILD libsc-2.2-r100.ebuild 2291 BLAKE2B 418dc0bc9219b6f897523352c8c056c2e495fe5e89634f29aea1810fba4ad23073c544b807c42bd594eb3f2892e320918b9cb0151f5aece319d442c2a9517706 SHA512 7922b32ff3989cedb0b34fa9b6abedd8cdd8a890ede27dade44fb3e2082b353c47444f30a21f4e0d5e84c3cc78a16dd92dcfcf1dcdf8a267f9327915be723cf1
+EBUILD libsc-9999.ebuild 2301 BLAKE2B d0512fc7b8fbcf57439361287a160376a9b88fed9c8bb8d6026d95a133f50fd6f0796e81e143f55abbf5d964a9a55dbaf57a83b3a28f2dca02cae1cac553ce22 SHA512 0ffaeb80966af4463a496059605895669bde82381b3a8bfd76d899806d8cba863ac6a252ec400a38659b872126fb4dd5d69e4816334c87e430665183382ea064
 MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74
diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
index f264a95f9693..e29a4201d39b 100644
--- a/sci-libs/libsc/libsc-2.2-r100.ebuild
+++ b/sci-libs/libsc/libsc-2.2-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
 
-inherit autotools lua-single toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index c8458c5d9e89..b99e72325210 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
 
-inherit autotools lua-single toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 93f3847cbd4f..a307dd6d3383 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -3,6 +3,5 @@ AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.5.2-r1.ebuild 3908 BLAKE2B a2e0b8cc23c4a9163b1ff42767a6ead7963189303933ddcf080b412a5ecdc8491a97ca68c4d29130bd0368a804deea7a0ba02835dffbf8bb4132f0f93d82a65f SHA512 6520270af9805d35688716911e2f6efa25c882d1059cf4b61fa94d3d8ca4ae011a915e21db08f71e74fd1842bfd9517def4b4b0c432161fa887db50540eb95bb
-EBUILD libsigrok-0.5.2.ebuild 3906 BLAKE2B 6b6479940c2d0659bdfed3e10dfae089c844761c0995f1c1ef120a3a47bdb35c80d0d820ff6d48704efe88b0ccb6263e8c550947fed9ac4e211f3d7ad9385bcc SHA512 4a4a782540cc7448d25524c67cb3f54ebd9909e98765ed8964d8f09d697de3eeb75f8ae7377916d04f91a53607f18e6ffbb2d853c76b6154cda9c1ac1ef9d2df
 EBUILD libsigrok-9999.ebuild 3672 BLAKE2B 4a1bcd64fd6263dc72ad8b7910e339ea89d88961aef4155f03cbded8ab5825df07b13273de207bf79fe255a12224b57875e2631b8588a2059a7ed627d6436a91 SHA512 992c54ae4a331ea971966b68cd25451b07ead5b7a4534de2b05bc7f2774904a66f0e3fbb6cf2c81cbab50a50c2284f2cbdfda1e7c6ea49dbe66cac3ac01aa0bf
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
deleted file mode 100644
index dad18f7d9678..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7,8} )
-USE_RUBY="ruby26 ruby25"
-RUBY_OPTIONAL="yes"
-
-inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx )
-	python? ( cxx ${PYTHON_REQUIRED_USE} )
-	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
-
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND="
-	>=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
-	)
-	python? (
-		>=dev-lang/swig-3.0.6
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	ruby? ( >=dev-lang/swig-3.0.8 )
-	test? ( >=dev-libs/check-0.9.4 )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-	"${FILESDIR}/${P}-swig-4.patch"
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-	"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
-	"${FILESDIR}/${P}-check-0.15.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-	use ruby && ruby-ng_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
-}
-
-sigrok_src_prepare() {
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-each_ruby_prepare() {
-	sigrok_src_prepare
-}
-
-src_prepare() {
-	if use ruby; then
-		cp -rl "${S}" "${WORKDIR}"/all || die
-		ruby-ng_src_prepare
-	fi
-	default
-	sigrok_src_prepare
-	use python && python_copy_sources
-}
-
-sigrok_src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable static-libs static) \
-		"${@}"
-}
-
-each_ruby_configure() {
-	RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
-}
-
-each_python_configure() {
-	cd "${BUILD_DIR}"
-	sigrok_src_configure --disable-ruby --enable-python
-}
-
-src_configure() {
-	sigrok_src_configure --disable-ruby --disable-python
-	use ruby && ruby-ng_src_configure
-	use python && python_foreach_impl each_python_configure
-}
-
-each_ruby_compile() {
-	emake ruby-build
-}
-
-each_python_compile() {
-	cd "${BUILD_DIR}"
-	emake python-build
-}
-
-src_compile() {
-	default
-	use ruby && ruby-ng_src_compile
-	use python && python_foreach_impl each_python_compile
-}
-
-src_test() {
-	emake check
-}
-
-each_ruby_install() {
-	emake ruby-install DESTDIR="${D}"
-}
-
-each_python_install() {
-	cd "${BUILD_DIR}"
-	emake python-install DESTDIR="${D}"
-	python_optimize
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl each_python_install
-	use ruby && ruby-ng_src_install
-	use udev && udev_dorules contrib/*.rules
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 2a2ff1ed4002..8b54ef67ddd7 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,5 +1,5 @@
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
 EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
-EBUILD linux-gpib-modules-4.3.4.ebuild 1346 BLAKE2B 8b66209430fb62453785e8747c3ec988e20000137b034c1f28e3e85a306e0d68b2dfaffc8ff0d011f9f3c870004f10b32f25b75024063678f96b0b6ad7305380 SHA512 d57b9489fff12bbbc1838a628227e71e42d3dcc611885e02f2caf1e7b95666f29b01c7e602ef704c36fd48ce8740ed0a86b6927d1a501446092d028c641923a8
+EBUILD linux-gpib-modules-4.3.4.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
index 12044c6d1c24..a5c44ee72549 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug"
 
 COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 3e453617b30c..eca227ae6819 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -3,5 +3,5 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5d
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
 EBUILD linux-gpib-4.3.3.ebuild 4791 BLAKE2B 6cfd15ace01acb85c7e79fd8b743e2ed21ded765e12ddcb0be99ec6502d8e1203bd9b26155185ed3c4392bd4549f9ac0b547ed65f1e600785e0117fb0ac40c22 SHA512 ed878490eca99e6a248eeef1d0634e8a575995066d1f501f093ff5a9c8052517a1b99e4f378699b83d1a34c0646d80d7b023f8dd707c03d5d223dd36530e3e9e
-EBUILD linux-gpib-4.3.4.ebuild 4798 BLAKE2B 98352a097c293f77d0dd897294a45d6a5b24097aa96884b0aa4377d543ae0d5463cd0988d02a3285b3b1aa065e888be69145d34256beb176020cffc6d75f2f74 SHA512 c48021a17547e256e25fda080c03d0fa31948d746a5bc27c9d888a35b40d09285187a25cc8868a2660b72eb1011f66dd73bc9bc7010c0a1375eb6930de46c66f
+EBUILD linux-gpib-4.3.4.ebuild 4797 BLAKE2B 0016f765269875faedfac78d04a99e39860396b5fe01d78487a72f0b12d8b0cf4202ecb1ee5c08dc6be50183a3adeca78af240d3f07203268610213787fc9661 SHA512 f3e020026a4b0b63be4988492f05ad3f27251f9d87b8e56c184a815449448aa45c3806d8c9881892b72c8b1683c8130f271d84427e9f213a593d9774c61a0184
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
index 20f31d537548..76557cd82d74 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index 6f2a6772672b..d0d49ce8c44c 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,5 +1,5 @@
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
 DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e
-EBUILD lrslib-062.ebuild 1109 BLAKE2B 265335aaed9ae273357aa6aca2a594535e9525ef65e2bb916aa1d595eb1973f21b0df851429e800d0f9fc00a4ab76946a84d872d40da246910ec0dce6bc7e914 SHA512 b7ef45f744372e6e7523417a77cdd9a1b42eb24cd26b71b99a6fbc20e3f6bd14cd5c5ed2faae3a8de8a52f9c1a2e6f8afa5dc31487e61feafcf55971cb87a901
+EBUILD lrslib-062.ebuild 1102 BLAKE2B 28715334971ebcdf529cb1454259b91fe7b4f08f5adfbb6a69e7f26e77b3a75409e59c3bdad04ec3401eaccee1d058d18c7923d50f2c10ebf954b11400316266 SHA512 fbbe152ec18650aa38811ee467f04e1698baf8e5070258c7d69e2b80a543164ed24ef85f6a22b790c12f8782e56b11371e470637d12f771301c050bb9516b27f
 EBUILD lrslib-071.ebuild 1039 BLAKE2B 4a94c591406d9e4eb5f64476327e09baf8653434bd836b8c95592c6179399d8231f3ecabb0b342e6770fecf886ef20f3bb534b0fa79501fe34a4f6e5b5749727 SHA512 c904206d02dac52865e156d08871e21b4f7cd91aef7e1d21aa7b76ec1cad4d34e06798b4d2983566e1e0acc5db9e2fe0fd29f6de535e7b29af9d211efb88458b
 MISC metadata.xml 769 BLAKE2B 5660de1ef577fce0595a5d28eac737e1454bb97ec47a1993cfc9047a505ebef1d1c3984a129e4367ba5dfb2f8bc5975bcb7b7332e268528d820f1ea3231dabbc SHA512 f604771858909c1fb3f4f4c47094e9d6b16c1294575026246008c927a4d99aae6a2bdad45d66fe87c8be68b5a5a23f6fdfa72ec26a00a2a48a2ae7fe64cfb57d
diff --git a/sci-libs/lrslib/lrslib-062.ebuild b/sci-libs/lrslib/lrslib-062.ebuild
index 77ff95622589..d3ae098fd119 100644
--- a/sci-libs/lrslib/lrslib-062.ebuild
+++ b/sci-libs/lrslib/lrslib-062.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Self-contained C implementation of the reverse search algorithm"
 HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index a855de425132..ae80bfd93bdf 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,4 +1,4 @@
 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf SHA512 6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
-EBUILD mathgl-2.4.4.ebuild 3668 BLAKE2B dd56806436422a28f89a859f3f029c8b3f55888643d38ad54472cc425cab1d40bc7de1f487b0ca8aee0f06e73bbedfda1678b5eb1ffb33ffc763e478706b68e0 SHA512 4593b632c4b15dae0c74f3a736df64cee7fa93dfa22b37cf4607b0068b00775fd4ce61d6b8bce05964411974fc79d88a43e16bae7eb7dfd973e2518d829bd875
+EBUILD mathgl-2.4.4.ebuild 3670 BLAKE2B 32467472419c3a59d3367db425563762d682ed46b281da844cfa72fbc2fac6cc57520da9a404250b26feaf78f9b1febe52b51eaaecfc9b6e9d9e39dea57eb209 SHA512 43212c360268e68b84b021adb5d03afade4921348e9dae633fb11206fefa3fc33d3233491628a9e9b3fd3ff9876d0d6786e6e0724c017297423592447242a205
 MISC metadata.xml 800 BLAKE2B baa75251910016e5d059cebeebd85632d290ab0c3c50089de0485ffbcd08ee8ac59cbfe33824347a5a5c339c74ea7a56c516d4d38661e56f7498d628d748f64a SHA512 8b75db0a01ce59f22543701447630c56a82f9091b5901f85ae102de7deca281e09dbcb443b8ff2930cf18145d63504646a289fd5e77defccc4d38480596d1968
diff --git a/sci-libs/mathgl/mathgl-2.4.4.ebuild b/sci-libs/mathgl/mathgl-2.4.4.ebuild
index 4485d272e448..c3da586164f2 100644
--- a/sci-libs/mathgl/mathgl-2.4.4.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -81,11 +81,12 @@ src_prepare() {
 	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
 	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
 
-	use wxwidgets && need-wxwidgets unicode
 	cmake_src_prepare
 }
 
 src_configure() {
+	use wxwidgets && setup-wxwidgets unicode
+
 	local mycmakeargs=()
 	if use hdf; then
 		mycmakeargs+=(
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 0a8b043918db..653c9a1858f1 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
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-3.0.0.ebuild 1856 BLAKE2B 0e5f0afec36820e738bb55c29f2b4c8bde95cdcc174b3e59785fec634d67e3f20b0825e66a61523260d051d5147948a063a291fa3ec91ae67276569c64681910 SHA512 d94ef0692a8b2181765554a4bedad899b3abe292c135f2bd9b77652881cfa2389c0fe9895129b46abd4d216cc2fed9d0b4ce5b8e5cb04e1394dd9b04fd57e196
+EBUILD mpir-3.0.0.ebuild 1857 BLAKE2B 98ac00bb3413fc6896409079d5ba852e51ad144ac9c3f7aa4a1e60706e55d4c712566da46fd2cf77831dbddf47551f8e33f753b0098e09eb3514294ee4704d07 SHA512 983ced141e91d063cd15d19226c71d4321637417a499426f2c376c7d7b81a06ec2aa429662bf083a6c42502c8414f5a9d066559586b97d9894680d5919ac030e
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 28e0345af632..ccd38ea08c0d 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 11ed5c511724..4c7676dc3c30 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,3 @@
 DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
-EBUILD mumps-5.3.5.ebuild 5733 BLAKE2B b176d7fc87a590aa129a3cff471b3bbc07753263abcc31d2a7a1cc061215594cdc94199d4f8ee5a1bae76e476c416362f762a5c827d5bacd5183d94e13455859 SHA512 5ac75e3969af83cf10064763c70f8a1d02f9d62c69f7bdff4de8d7994c592c4ee1a3665622e574a1b6d5b2f48d79da1493a59e9afbdc4a9cfda8ff9b3e8f59fe
+EBUILD mumps-5.3.5.ebuild 5744 BLAKE2B eb5800c68323aa3dfd22102984072cd8b0b77c80014206796840eb94249d956df9a891fd060d2c8e6d5a7b3a9714932435b6c13c4ed6a27c05689c8ddfc016e2 SHA512 8b9b3e348cbe0324550d99f9ed1c31da9d6d91b45b4a275f7eef559fb946f8a39d3b2726ecc2c285dbff2022a55effc7b8347dba36853fcf82089ca206ded70d
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5.ebuild
index 9c2b70d7f003..23e0f15d16a2 100644
--- a/sci-libs/mumps/mumps-5.3.5.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fortran-2 flag-o-matic toolchain-funcs
+inherit fortran-2 flag-o-matic multilib toolchain-funcs
 
 MYP=MUMPS_${PV}
 
@@ -29,7 +29,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-get_version_component_count() {
+_get_version_component_count() {
 	local cnt=( $(ver_rs 1- ' ') )
 	echo ${#cnt[@]} || die
 }
@@ -53,7 +53,7 @@ static_to_shared() {
 			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
 			"$@" -o ${libdir}/${soname} || die "${soname} failed"
 
-		if [[ $(get_version_component_count) -ge 1 ]] ; then
+		if [[ $(_get_version_component_count) -ge 1 ]] ; then
 			ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) || die
 		fi
 
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 14d50b1404dc..aee2c1cf5f81 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,7 +1,7 @@
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
 DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
-EBUILD netcdf-cxx-4.2-r300.ebuild 616 BLAKE2B ba1024cdc714085a5984779fd274d4c5a9af57c44823a14cbf4cb453ce0a0588c92006baaca28416fda1b5e9e07a78c551f083a534d6882047900d989d5a0d21 SHA512 e9da1886babc4ecca8736fd5c587e2068c59bdacc5093f0b276cf0db4427af8d7d02373df7e42bc5d9c7255290974742e1d2fa6bbbcc504d1cd1314a6b005daa
-EBUILD netcdf-cxx-4.3.0.ebuild 677 BLAKE2B 0d544400e444b2e794545189fbdd1206de049bd9a6d8083be7eb4b2120b0b65a77461e7ce1dfa599240c4f1759e09f920e028490b0d86b9ddcce150613d5c030 SHA512 6cb81dde09c8206222c85ad9ffface7e6f554836f3ccf3ea7fc5fa95b571d0a9f3675d9a0a0e400d9d4d30f105945b97744d6397f7111b1a73b22abe6d2c3778
+EBUILD netcdf-cxx-4.2-r301.ebuild 601 BLAKE2B 1f34dc4d3e47669081a647df6da7474f5e1f37d3a67287ddf9470b6b2b729588b4dcb4acd753b0a1750cf69f1283b8d774a553e029c429a36576a42280b7a6bc SHA512 16973d6fab5e25df249f6b737e10834acd1424d2c197bd0c96deb56f388d015e8545f77c3f273c9c076a74137a2b6cfad3ab0cafc0f8052213a2347ce0d15805
+EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
 EBUILD netcdf-cxx-4.3.1.ebuild 707 BLAKE2B 148dc629c11968093a5eb2c031a799a6d3fa9a1280dc876a8540559fdd3e6d6837e44e24caa1f9267662e7a2641ec36e156d3197a4b5d276b89a3176a2d4e34f SHA512 99857c323634f08beec46c551d9cda5f05f2e3bf7dec56745e1cc911c21374598e179ddb16ea2b98dbd7b277499163cd5f00cfdc10b2d3051c9b784c4cadbcbf
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
index a15d37a2a1d2..89e747db64c5 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils versionator
+inherit autotools
 
 DESCRIPTION="C++ library for netCDF"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -12,15 +12,20 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz"
 LICENSE="UCAR-Unidata"
 SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
+IUSE="examples"
 
 RDEPEND=">=sci-libs/netcdf-4.2:0="
 DEPEND="${RDEPEND}"
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc -r examples
 	fi
 }
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
index e029c4ea6b3b..ba3408589ce6 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
@@ -1,32 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils ltprune
+EAPI=7
 
 MYP=${PN}4-${PV}
-
 DESCRIPTION="C++ library for netCDF"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
 SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MYP}"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
+IUSE="examples"
 
 RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
 	use examples && dodoc -r examples
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index 860f2fe1f746..aa119d72413d 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 931 BLAKE2B 0091bba50b61f0c9315ce3d3220195cc26d782d6c490c53c179d40f940b32584c1334d0fd44aa12358481393eb48a1767e249d7bc2f328794df1db5c1c935570 SHA512 ee851f193d86e017e33a64cc699bbb7128fd8ce90cd8e323362ffb647030a3de7fdc360a4a520c4e5ff678f1b9f07d5a52d7f27b6c871453fc57dca9c1fa1ca2
+EBUILD netcdf-fortran-4.4.3.ebuild 924 BLAKE2B 387ad080924a896bd3a221454a813dd144b3238fa640629afa14113aa77f22c50460097341d3631429ae1be0223832c77067d33504b52208a29e91bf71006069 SHA512 728252cce3af359ff5d668b6e195debeeb7a96750b85feb8ae74332500f89d914333368ad8d808853b26258678d7b8bf3dbafa78a74e4d6e539228271a627bdf
 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 07be294b26c9..6d87c1dd19ba 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 eutils fortran-2 flag-o-matic ltprune
+inherit autotools fortran-2 flag-o-matic ltprune
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index 76ca56723b3e..b27e64380849 100644
--- a/sci-libs/numkit/Manifest
+++ b/sci-libs/numkit/Manifest
@@ -1,3 +1,3 @@
 DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
-EBUILD numkit-1.1.2.ebuild 590 BLAKE2B b60c810a6be9d4c13695f104b4536cad3a04d815894119dae236a0628568e68f55387da441b693c83509294a7cd6c4524f5132ed25f01dca97629e4183c92fc3 SHA512 00fc9b4763a9440043d9d6e8ed2c19f13f2c52e0792451277a5411e2b7a19a8898927dcb86116d01bbad69246cf8623db9a2c5546f7187d366d3ae502472b3e7
+EBUILD numkit-1.1.2-r1.ebuild 591 BLAKE2B 98d1ec8ae01647e6329b185b60f245f1ddaaeb6d001282fb54eed076290198dcdcfc966589a978280c44d744900c2cf5dbf5fd150d4e4ad66d5abf0feeb9a79e SHA512 d2a87964d0835888bed7a8177f86c26c1fc2022246b66545771feb1f7f744b244c82011539a492770b014726215b7988779d31c076af96b27282ea904247d7e4
 MISC metadata.xml 499 BLAKE2B 83ab2423aa356c0686f49774f471f0bf32cfd00cd654c67bd0e36e3b5bac68f779df6921c3e9c6152788a2bae0e24e21c9255c483befbafdb0ac7c65649ed6b2 SHA512 7af6a40ad292056abf1e7d41b3b50c930a44070e1b64e33a26005d3dfcc452fa328e6ffe1fc47a048d600c0d4d935e05e57b6b97b6aeacbe81ef39d4a377ce8f
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2-r1.ebuild
index 57d46a51a3f2..80b313603db7 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2-r1.ebuild
@@ -19,4 +19,4 @@ BDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.9[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index 2a2b7138588c..3b73db1d64c3 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3-r2.ebuild 1760 BLAKE2B 73690120aff4616da8871bd00b97dfb34d28b9930c96537676a993072e9890c274015764b14011ad2477143467b8f74a923101d215a4302728fbb80722cf3a66 SHA512 100e2136db0a32eb63b8038515624b59ba52f62eda067893f3603ba1effeaffa7b5d1a59cf84af6f455f4cc24321c31c075b58b27e4cb2d43226213177fe3129
+EBUILD oce-0.18.3-r2.ebuild 1762 BLAKE2B b3ae7d2fc7df479c2a93d8db32d5a3bd4f2607322dd4935fb731f3a413901414ec299b18da305d9dd9baa3602095ce52e1fc1279ccbbc3320bef41c0652f3e75 SHA512 e397eda1a177948617bbf7e354fab546c0300424b02b76f71a4f836755e203b142eb6e79b3da4f22fc6264c204d38ee023ba6e005ad931aa1c6acd9ee40456a1
 MISC metadata.xml 930 BLAKE2B b8b5156a6c08c5042317fd2f840a3a9c6049065501cae670fc9bbf39d38a67236f01c32f719675f28acf83dfd302ff141825256e4eca9b53946d4304d41eed40 SHA512 c419e6f8a455c626af8635c10c94f3429e03d0440b9e487b1f0a4cb388b23d2c755abdbdba03471fef531d7205cd6eea085ff74981cc28f2523915ca59cb9772
diff --git a/sci-libs/oce/oce-0.18.3-r2.ebuild b/sci-libs/oce/oce-0.18.3-r2.ebuild
index 11a072de0d62..9a331c5771e8 100644
--- a/sci-libs/oce/oce-0.18.3-r2.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r2.ebuild
@@ -7,7 +7,7 @@ inherit cmake check-reqs java-pkg-opt-2
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="https://github.com/tpaviot/oce"
-SRC_URI="https://github.com/tpaviot/oce/archive/OCE-$PV.tar.gz"
+SRC_URI="https://github.com/tpaviot/oce/archive/OCE-${PV}.tar.gz"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 5758b2781091..ad0584916b0f 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -7,5 +7,5 @@ DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe
 DIST openblas-0.3.14.tar.gz 12460465 BLAKE2B 9505ff6e132581ecc86159fb84192c6bbce0f2974293eaf1b4aca6b96b5da85823bfc1bced65a96930674fd4781ea3e375aed09cbdc9930cef26694c9f8e1c80 SHA512 c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
 EBUILD openblas-0.3.12-r1.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
 EBUILD openblas-0.3.13.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
-EBUILD openblas-0.3.14.ebuild 5734 BLAKE2B f2d4bde48b206c4d6e97029b617f0538978144b0e3e239cf79837bf6e1525dbe398a0d3af121368299752646217e3cd3e29c4f3d1e4e549fcb9ce9c1598c5f25 SHA512 846370655b16dbc45a518374e4c1714eb135a6fab2c36059c602ee4dc236b952eba54123e536a07b484d994a68f26b94ac740ef7f645083c0ccb855492195627
+EBUILD openblas-0.3.14.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
 MISC metadata.xml 1560 BLAKE2B 1f49ef5d206bfe68783b2d7f235e5fc651ac750f84403eac6519a2c69c4eb35a31f784c67fd8e4c9f8e9ecdea46e5b325ed0725b45654528d56fe6d30460a829 SHA512 e3113c317b18c389e8055ec16e61426abf6f088f796e75939e78789884e2084d038bad754b2424a68e79fe1b83509d00b93bcfd72c2e3530185c780861b47f1d
diff --git a/sci-libs/openblas/openblas-0.3.14.ebuild b/sci-libs/openblas/openblas-0.3.14.ebuild
index 4566f928af81..4d8d73725fd1 100644
--- a/sci-libs/openblas/openblas-0.3.14.ebuild
+++ b/sci-libs/openblas/openblas-0.3.14.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 5776daa93832..a8c0b2ab730d 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,4 +1,6 @@
+AUX orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch 763 BLAKE2B 2d8c88ae2261b9f8689dc9900bb93d554656135c5507246db8b6280bce20a18e932b9ec69737adf7a00e32d384784681cbe95cc5b747b85d189be5356ab606b1 SHA512 e7cba8158efcf3b7638f344d717666070a545baf8b96e52bb9a10ed11575e062806569a3c5299c4439491709ebcc2eef1113623479b641df8ea1a45190a8938f
+AUX orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch 686 BLAKE2B ad47abd10972b668a8656be08c24fc1cca356e33177b2949aa3e9cc07022bd0d8bdfaf16daa4957cb81f84a3806f0617ee464e0c6067045520ad18e8cf85aa40 SHA512 1223b4f503d8f394a0c73c91c231e96e83b241f31afcc7dfb3ae7f7b6a96e367fa294bfa9759be4e8de419f00f18a489713fe25bf1a037dedd116da314856f1b
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.4.0.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
-EBUILD orocos_kdl-9999.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
+EBUILD orocos_kdl-1.4.0-r2.ebuild 1782 BLAKE2B a0788001c6eab7a3c5208776b47a6aa07ee00e71f530bd1d07134a696e94e5c101f00672faf8a9b50291ac033402f07e35cfb8f3c9cc9c349b48df2c9b7af7b2 SHA512 4130d847b169ca69a0a7ab3da52b5c2cc034eb155b78881e426557760800b20e60bdf5be353f72c0fb4ae229d7577389bdf2f2083645875bbdba94d0adbb2c9e
+EBUILD orocos_kdl-9999.ebuild 1707 BLAKE2B 0f42c6fe09c59e3e91c20aa24fc3f20bc4288e5ca321ff0b801d0ff269118d73b3848a65d7a1cce2d1ee348fc5ea0c07664a456423a8546acdabcf103cd1816f SHA512 bb290e4d6a1667aa98f9a80deea798ef3d7ca54ab8fb1315f57afbdbb9dd9f54f6d53a490f0562e02f880320092c19e7912cd69fa4b58e7b1a346ecf421405f4
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
new file mode 100644
index 000000000000..d3205b556284
--- /dev/null
+++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
@@ -0,0 +1,22 @@
+From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 18:39:42 +0200
+Subject: [PATCH] don't install kdl.tag file
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ doc/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index dcc81b0..cc1774e 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,4 +1,3 @@
+ 
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY)
+ ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile")
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found.
+-- 
+2.31.1
+
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
new file mode 100644
index 000000000000..fe7eb126f84b
--- /dev/null
+++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
@@ -0,0 +1,27 @@
+From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 18:46:42 +0200
+Subject: [PATCH] add LIB_SUFFIX in pkg-config file
+
+Add the LIB_SUFFIX suffix to the libdir variable
+in the kdl.pc.in file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/kdl.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kdl.pc.in b/src/kdl.pc.in
+index 49e2ab9..1650e2e 100644
+--- a/src/kdl.pc.in
++++ b/src/kdl.pc.in
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${prefix}/lib
++libdir=${prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include
+ 
+ Name: orocos-kdl
+-- 
+2.31.1
+
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..175baf488d17
--- /dev/null
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Kinematics and Dynamics Library (KDL)"
+HOMEPAGE="https://www.orocos.org/kdl"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/14"
+IUSE="doc examples models test"
+REQUIRED_USE="examples? ( models )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-cpp/eigen:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-don-t-install-kdl.tag-file.patch
+	"${FILESDIR}"/${P}-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_MODELS=$(usex models ON OFF)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_TESTS=$(usex test)
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DBUILD_MODELS_DEMO=ON
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build docs
+		rm "${BUILD_DIR}/doc/kdl.tag" || die
+	fi
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	eninja check
+	popd > /dev/null || die
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/api/html/." )
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r "${S}"/examples/.
+	fi
+
+	# Need to have package.xml in our custom gentoo path
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
deleted file mode 100644
index da34c1969851..000000000000
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0/14"
-IUSE="doc test examples models"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
-
-DOCS=( README )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index da34c1969851..d50c631a39c3 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,71 +1,79 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
+inherit cmake
 
-inherit ${SCM} cmake-utils
+DESCRIPTION="Kinematics and Dynamics Library (KDL)"
+HOMEPAGE="https://www.orocos.org/kdl"
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
 	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
 fi
 
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
-IUSE="doc test examples models"
+IUSE="doc examples models test"
+REQUIRED_USE="examples? ( models )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
 	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
+"
 
-DOCS=( README )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
+		-DBUILD_MODELS=$(usex models ON OFF)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	if use examples; then
+		mycmakeargs+=(
+			-DBUILD_MODELS_DEMO=ON
+		)
+	fi
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
+	cmake_src_compile
+	if use doc; then
+		cmake_build docs
+		rm "${BUILD_DIR}/doc/kdl.tag" || die
+	fi
 }
 
 src_test() {
-	cd "${BUILD_DIR}"
-	emake check
+	pushd "${BUILD_DIR}" > /dev/null || die
+	eninja check
+	popd > /dev/null || die
 }
 
 src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/api/html/." )
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r "${S}"/examples/.
+	fi
 
 	# Need to have package.xml in our custom gentoo path
 	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
+	doins "${S}/package.xml"
 }
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 315878dda98b..4c45348f9209 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,5 +1,5 @@
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
-EBUILD p4est-2.2-r100.ebuild 2915 BLAKE2B 6e0ee7cf6d138405fd861e1e79f826b8c99687b27ec57038453c5c94c1828a638c879c08cdf2640d881e76c3f261b3d4f8104d71bf63e537f196deb1fe463310 SHA512 2b1dcfbc8e9d44d129bc84ac10a4c7df977cb358e9f61a82a73c194ab72fe00c199a124da259776c70cacb19565653fd3f7be6c71c5cf96f66ada9024444a4fa
-EBUILD p4est-9999.ebuild 2915 BLAKE2B 2ac4c1cfb81d43042c356a94633109f3b3dd0429985b896e60c92dcc945b4a68469a604cdf94900209aff4e38f26f99b5121c369dcca8c075503890284b570e1 SHA512 e7e16243bcbc9eb850509a64ddf9b40782e5403ecf41506fa4353e48263eef5edcd6839038f44b9dd4781f1053f6776b7996cd90253b175a09a2cdb853de0924
+EBUILD p4est-2.2-r100.ebuild 2908 BLAKE2B 768a3e492a9b2dc00dba2443111e6a39cc701b113a696398f93a2b9947ca6ca8fc7fe1203c8e650e3dc122161ca55b85f91f2bded64b13bd0a60d3618d8529f8 SHA512 9ec1e876334f5cd13e148b68a30a661ce03e91cdd0f4dcd6126b044c0fd645ee4494e1e6aa03edb8f787ad10a1136f47cc636f8a44e38aafdc482a85d17a3461
+EBUILD p4est-9999.ebuild 2908 BLAKE2B 25d8be9880948ec1d3f30c3e10049b89f1d05880e366b74f60e814847baa7b63f5582013f28ba41af3ab3055912c823b580f2021f55d6e91fcd79da3d811f1d5 SHA512 27dd306e9a793bdcb08c4eaab32d39facfaae784e80f2c50e0f137c9a9121d5e5304a0b432003c55c695df8bacd0e5a83265bfd8629833baad4b5af2d60c831d
 MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
index 3c69c63e2ed0..ee878cbfc3ee 100644
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ b/sci-libs/p4est/p4est-2.2-r100.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1..2} )
 # The build system currently fails with everything newer than 1.11.
 WANT_AUTOMAKE=1.11
 
-inherit autotools lua-single toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 5837f982d5f6..bb4b3a864ed0 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1..3} )
 # The build system currently fails with everything newer than 1.11.
 WANT_AUTOMAKE=1.11
 
-inherit autotools lua-single toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index d280d6749593..c7e1312a542f 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4454 BLAKE2B df2e8e95be83c99e010ba1174334731943f5686bc7d4fd066b8a564a0d363690a7e1d09d2e18e55d9a1067d43fc3d7f3cf0cfb2d49a68779e62e73b6e75b247f SHA512 b64553222a0af73f20f36ecfb9254c8fbf57c0031299f0607c768577a244ee0e7d740da4ff8768241f5209241241dfc819aa3ec3e6920e68229a6c725bbc8c51
+EBUILD pgplot-5.2.2-r7.ebuild 4447 BLAKE2B 81224219591f53a25bf1a7dce605f52c0832c6f6b336cd0d0a182a07f48b9c20723244d7c66f584baeaddbb52bd9fbdd127236c01d2bf869a83e8e7fb47ecd83 SHA512 32d8064966ddfc0464f86b7a0661cc05f5eade21586913cff053613449716f9dc59c6dbc1f787808ba54f457dbe0f6199ba2c94d44d329ae370ca3bcfb6ee8e8
 MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index b1c5b83d6d54..a48c4db5bb54 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils fortran-2 flag-o-matic toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 MY_P="${PN}${PV//.}"
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 7af9f529f57c..feb00ba5a979 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r100.ebuild 7402 BLAKE2B fd9b5db1e3c87ef4ec0695262c19173285922f15a9b76620f458457e788a7334fec088a8d6fceb2a41d8f573317344b321dee3e6d0e97b8d429d10444d6b6035 SHA512 c06d0f15302fac5cd36b32bcd194774651f6a806765cadf06437063c31d22754fef9fb0502f23b93b880af8774b03584a62b175de5d2a5d2a86b3dda394f24d6
+EBUILD plplot-5.15.0-r101.ebuild 7365 BLAKE2B 861295cc021c38f2f0dc5f0b8e3defd09598aac5471153541aae2c512d5032560ec028164c7c8eecc7ad65d73529900fb6d2661ce831c67180947062bb55e130 SHA512 04c0ee802ae4cbd40dfec62ec178fdb31cdb3fd9808f40a4a36589a28013f930ca27a68a7b9063412dcada8cbf13735b45203dc59c3d002ddab52b42cb0e6d81
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r100.ebuild b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
index ae2654d31d8c..a8ca91a4eed2 100644
--- a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r101.ebuild
@@ -45,7 +45,6 @@ RDEPEND="
 	ocaml? (
 		dev-lang/ocaml
 		dev-ml/camlidl
-		cairo? ( dev-ml/cairo-ocaml[gtk] )
 	)
 	octave? ( sci-mathematics/octave:0= )
 	pdf? ( media-libs/libharu:0= )
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index bc1c1dadd9d6..07dcccfa6a11 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/pyshp-2.1.3.ebuild b/sci-libs/pyshp/pyshp-2.1.3.ebuild
new file mode 100644
index 000000000000..0b4603541d4d
--- /dev/null
+++ b/sci-libs/pyshp/pyshp-2.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 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/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 8a5f790829fd..df4217b8b2eb 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
 AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B b8fcc8d906a957da8c5ad11cef3a22b8d0d8794f2ca92e757cf2a37805967e3bcf2cafaa138a0af825aadcd402039808900d53bcb6ee8741a7734e25723b9b74 SHA512 02406718772f29e69727e7b92472d831297554506b70fc8676d8f2758aee9b2968ad621b9a6043c67900fc263107b60a8595ce9b7d83d6591312ebcc21e859c0
+EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B 99ad2f1d5945c746ddf252c5e12983dad2eef6a99e9f1aecd1e0c3c80e8cf08924a84ddf78ef64851d6737ed4688cca7f11a920b465e3e1f5698a11221c744aa SHA512 6246e05702a13967279242bac9235840a000ab06ef3e02672c97fd1ebf5da7f75e127e3634b82ef14fd1f8d166ecb09e7057e1efb0f82b92f7fd1e57df8dd813
 MISC metadata.xml 331 BLAKE2B 7cb0302f290048b91c8777184229fa2f0af2647f5cd1d4f9f88f7afc0168b4c51a4ab01b08cfb695be567838f1a6025cf47e2e43df67d434cf676c47c537cc3e SHA512 59818fe84d5fc4b73f29b45e14152e52d7d4afeaef9200e862e2414213b8c05bd63119befabc3a68b67b0aced7e60ab0fe3f7e657966a58a44d751571c4828df
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
index 556683f3f338..efcc931e3385 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils fortran-2 flag-o-matic multilib versionator toolchain-funcs
+inherit epatch fortran-2 flag-o-matic multilib versionator toolchain-funcs
 
 DESCRIPTION="Library for updating of QR and Cholesky decompositions"
 HOMEPAGE="https://sourceforge.net/projects/qrupdate"
diff --git a/sci-libs/rosetta-db/Manifest b/sci-libs/rosetta-db/Manifest
index 35140fdc215d..d8a5c52247e7 100644
--- a/sci-libs/rosetta-db/Manifest
+++ b/sci-libs/rosetta-db/Manifest
@@ -1,3 +1,3 @@
 DIST rosetta3.4_database.tgz 212443671 BLAKE2B 92aeb833bab050f8122dc9fdbff153cb27c4993bea4e55dddfd5a2628c7e5fd55ac5da3d8b132a2e3fe83e1a9b6b417ad361eef2afffa3792b2d15de31ddd051 SHA512 c057cabcc95e6ff2278517e04d0fe8c7968a5c29d17ceb7bc75ac6e655b0a798d4ca819b313616c69b6cc18252c12b9af083d9cab9d4e30dac4c32db2f058b81
-EBUILD rosetta-db-3.4.ebuild 722 BLAKE2B a1c6b85502e59ade28d742831281862253c5afe65babbe72a68419fd4aacae28030cc341b6e6336d238d0dd31bd729a9b86b1c086a919fc52de28c7395cfbf0a SHA512 2c4bb4708175ecf24aa55cdc344a888c8025679bdd0b2a4c6c648e774489009a5275d48b7f0b803cb092dbd5d9756ae543186a1078e7623f7db40104bc102917
+EBUILD rosetta-db-3.4.ebuild 715 BLAKE2B 7b6dcaa28a75b0b7b5699c220df8bbea913bcdb2da18134ffea4c4a31096cd72c0b3da3ccfa9f5a05254f7618d70583fa338ab9eef18f3818a5afc9ff631c974 SHA512 f844419f0de061d9d0afde22572be337e1a2746c551f130da5e6a5b28416054f951aa99696162bdac7bbe3d9108a9983379627c312ca2092c9b7fc9011eca6d9
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild b/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
index 0264e523005e..bc043d1e1ae7 100644
--- a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
+++ b/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 MY_PN="${PN%-db}"
 MY_P="${MY_PN}${PV}_database"
diff --git a/sci-libs/rosetta-fragments/Manifest b/sci-libs/rosetta-fragments/Manifest
index 68aaa2202857..30499e229715 100644
--- a/sci-libs/rosetta-fragments/Manifest
+++ b/sci-libs/rosetta-fragments/Manifest
@@ -1,5 +1,5 @@
 AUX rosetta-fragments-3.1-chemshift.patch 1721 BLAKE2B fe06e82eb2888767a0f16a8e045c78ccdcbb142b48d9da334bc1465acd5cf5850e3511552b224272c30908e24cfbfcc0d0ba88f0ebc094b9438a30174ac1ca4b SHA512 3475a4fd7a433d4d380ccd5ab11cf32f326fafc828d1bead0dbb0e03f5e53c613bf57c7950e090d8a2eb34c4ba93ecf25b25afcc9f251ff5f943e6b7e3112bb1
 AUX rosetta-fragments-3.1-nnmake.patch 7030 BLAKE2B a3ca2811e9831d4fd49e981374783448060b09aab2749c366b438b66a3c5114c4cdf86cdcd2d9277ff52b3cfb004fa5d6510292b730af4eb3e15f9b70e83a70e SHA512 de6d41f68911a5beddc8a15c9ce33013b03462642229aaf3b09ae4123c281260fa725bbd55593eea305b05d2ed21e1d17394686ee4e42bda20825d71d9367501
 DIST rosetta3.1_fragments.tgz 221931894 BLAKE2B 0fb5764f24f3386cdbce9afce7da3f81cce91a6a0a57a265e5dbe0bf06146e4ab057c02961ed0dd8074f86309257bcf5b42ca0d1c6adf92c9f8ebf36b3f25f5d SHA512 a2b2646c916ea1b98e2c7267c1eadb1fd6cb76d015c24bd4e8318ce127cb5d96ca56bfdd76821e1dd884e03d59631f544e221b9f541ad4063a99e96dbb029da1
-EBUILD rosetta-fragments-3.1-r1.ebuild 1143 BLAKE2B 698f3f529fc24af77f2096d329db67c8ab20632f97290f77fc53109f39be04d2762d08e1cb7c641a50565fcaf714d59d0e836d5868abce27e511c1d3ec23564d SHA512 3ac1a356e52c8b785737bd3aac93737b7d742be778e485cd5997b143cd4f1eec7b8cc95e7cdb4022da5174be45dfcc7a8d0a8e9e207b921394110a5805604987
+EBUILD rosetta-fragments-3.1-r1.ebuild 1136 BLAKE2B cfc7638e87da56b1af8ae0b5859dfe4701d836c50961df5a09d2fe949da3716c4ec2c2eafe75e8c7bc5fff9564905dce35f3839ef5b02fd06ca392f80add1a64 SHA512 c9f25d1f5017aaae5d9043f6ce6b22d77f1d7109fc2dd54073eb24197dcb725ef69846ef0a6643c80c61aab036be0d8e0aad638c7950dcb0b3a4f5bb3e84cf92
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild b/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
index 2e5c7afd21c5..bc262a212a42 100644
--- a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
+++ b/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic prefix toolchain-funcs vcs-clean
+inherit flag-o-matic prefix toolchain-funcs vcs-clean
 
 DESCRIPTION="Fragment library for rosetta"
 HOMEPAGE="http://www.rosettacommons.org"
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 6d029a62eb35..a675d66b56d2 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,5 @@
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
-EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B 3baaddc8fac4e76c1bd525533e52f5a34f952768c6fa2fe44e30d36e7d401aa87254357894dc99bf0b7992b7df4b335d2f03573e5a779dfe8005522921c218de SHA512 23e09c7c275b38dab64665b959e1002857068536bf41f50a4743474b2ac2f8dcc5473fecf7ced3a1ec8f9a44b1a14cae99f0a8628aa3b6c18326c1743de96391
+EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B d280f08077dd93265b86458d7b9585451c1388344e96f410df601993550b79494d494d433e0ef9e46638108495b5903c3a2b646cc6d7f34ad26c4c3fbbad0226 SHA512 64c12a7fb1d4b6493e416e9a4d860a9135001541896068a718e8df3461fb5c226daa78f187e39d8e48cead80688390080051814fa546d35414b2211e3aa4b30e
 MISC metadata.xml 1274 BLAKE2B e140dd2a836530be2e4f61dd42200172d1b5c54608fd77d743ab349546ae1d9cb06d3be48c847fc646b31be3df78928d08168a53e90fe6a103cceb799a4429dd SHA512 7a0f3fdfdc71568a0a0ce2972ba93f2b17dce7725f0eeb56f046fa94dfc62747ffa0a33186e91265d6f46ab35c201ae49481db1077dac6c4866df818fb2b7136
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 09ea23318f8d..8af0ccfe611a 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
+inherit epatch toolchain-funcs versionator flag-o-matic multilib
 
 # use esmumps version to allow linking with mumps
 MYP="${PN}_${PV}_esmumps"
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 9ce8f95dfc26..8b2ee2f09a79 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -3,5 +3,5 @@ AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632
 AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
-EBUILD silo-4.10.2-r1.ebuild 1204 BLAKE2B 93651449b6d7958d95ea14fcb6e3dc5cb13e9661e667fdf3357fdf011193c7f966645f5088bc0deea7ab20d4412260951a46a95694f45c75aaf79fcf9e05633e SHA512 9b7b838d03ca4e6eebcfa5c26655295e5b30e1aa3b2cc216749c7d5ceab4f7c3632778bb1b0863304b29c51b0dad54715f3195acdf2910964d7b24df8a328d39
+EBUILD silo-4.10.2-r1.ebuild 1204 BLAKE2B cd8fff90a101fc3888af7918ded496abc0c205c9e2e4434fec166b03713ccc9ffc598641377979be7ed42cc80058e17616193ad18646c462dc204e9200e14c1c SHA512 02d1c29c400ed9624a6d7714ac2cc53e503f43516f61f25380dfd3de604fe6398402ee1c0f94c5dd18f75e85ee1d5528f9a321f81fb6ff4f0d35c6b7436a8ee5
 MISC metadata.xml 673 BLAKE2B 639f90056f17af577124146182274dd3ca2b5daa1bccb323f24f299d7a2ab1960507d38d11b9f46f4af3031910d3760580cc529abd55f329ef1b8510d1f7ae69 SHA512 ff637cc90c5e7704f5290ad89909c65a9c6c2c1d8e21dae3e8118ea0e226f31df1d925d006ef751599aaca346c3f9841c7db23f00ea6cc14aefe3915d5bfd4cb
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
index 278b972ca253..65c67760377f 100644
--- a/sci-libs/silo/silo-4.10.2-r1.ebuild
+++ b/sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fortran-2
+inherit epatch fortran-2
 
 DESCRIPTION="A mesh and field I/O library and scientific database"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index ddbf24376d15..dd1d4373af30 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,7 +1,10 @@
 AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
 AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b
+AUX sundials-5.7.0-fix-license-install-path.patch 529 BLAKE2B 71aaf0c6362e77379f0f6f7dcfcf77b6746e61d8f015ce78a13f73d4e890e8aea3693ca8d37a0cf0b43fa1fa524dbef7e468f511fe34b65cb93fb911d22f4c72 SHA512 0290df4ec9394f56487d03b6d5a320f252ab60193c1003bcdfc1ead8118beae2fe90c153f8c0c31df9052e4148d27681f557f3c96ff7e43f1946d380cbeae6e5
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
+DIST sundials-5.7.0.tar.gz 22612286 BLAKE2B a21db0d07b8f2056ba244ca52f13bde51a2f745535c7381a4eecf9d8037df3d50f010c8fecd8e37d71150f101c8177b2e3f0ffbed8139702993e01b8ad52e707 SHA512 5e2b6145fdaa72e7d13f43e75e5bc08b9d7eb5b9e048207d5772ddab767e198af5be24b73a942a564a49d56ca0b47fe6493bd2de34a8a93948ccd1c13e5dd170
 EBUILD sundials-3.2.1.ebuild 2122 BLAKE2B 14b9cb8eaef1bb2a8dd749a5be242f7a026a040d316828aee9f6aab481df29fb5102862bacfbe7fd83c4ba74b10f633b3e76a754dcb2eccf7ae7d634d1886ff6 SHA512 e076b7de37302cd96f6c4b01931e02d4627b69514c69b1a8275373ac11196a6b19602a96f56c1be527ee1ed501dd4fd0df2517bda45d9721f15a6ba05e3fe606
 EBUILD sundials-5.2.0.ebuild 2181 BLAKE2B 105f2ddbd0d5ac00d4bce9a7b797eb8ea6cb9ee34f53db9a5e311cb2a8e1c6ce07f1c148f709db7dc08fdca506be63603dc81f84e28f879d5f4f764fa05d86f4 SHA512 a55f211ab31db02a3a43e3a2d0b8c6ed05a9a3f8fc91039c2b3f531d1ea87a9d80342d9a06819dec430db43f7bc240d9b53a61d63eb39c9c26ea1b00ee2b0e10
+EBUILD sundials-5.7.0.ebuild 2181 BLAKE2B ea0d04faa0d8d7ab2628e484c4fbe4951d1a88d886984672448d5ce3c4f81261de3a57184c41712344da7297bb4a6d8781e8d46382a8a685361a4258f71cc192 SHA512 ee874ca5bd81b49411eab3aa4c412f0aa1ee647fb76f5c7235986aecdff615dc6b8383bb6eb151b2b71d3e4a478ce9c1cb923b07240f54cea7bda0c6c7ee40a8
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..88fb964f8995
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40a650e..2133476 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,10 +231,10 @@ endif()
+ 
+ # install license and notice files
+ install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION share/doc/sundials-5.7.0
+ )
+ install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION share/doc/sundials-5.7.0
+ )
+ 
+ # create package version file
diff --git a/sci-libs/sundials/sundials-5.7.0.ebuild b/sci-libs/sundials/sundials-5.7.0.ebuild
new file mode 100644
index 000000000000..de4ffc5ebcaf
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.7.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_prepare() {
+	# bug #707240
+	append-cflags -fcommon
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-DLAPACK_ENABLE="$(usex lapack)"
+		-DMPI_ENABLE="$(usex mpi)"
+		-DOPENMP_ENABLE="$(usex openmp)"
+		-DPTHREAD_ENABLE="$(usex threads)"
+		-DSUPERLUMT_ENABLE="$(usex superlumt)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DEXAMPLES_ENABLE="$(usex examples)"
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DUSE_GENERIC_MATH=ON
+	)
+	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 4388ed82ca35..48e11e67d6e0 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,8 +1,8 @@
-AUX superlu-4.3-autotools.patch 18676 BLAKE2B c6312a4db288aed46f696b57291268cfe435f531b5cade47f146fce74bdc8e9e7efb6b200448c06b6aa0cd57188d87fe2e20557678e98f83dab07526bcc42d91 SHA512 62f868126af7acc3658bdff6eda8839d06dd14b5195d23a2b7bbbe1008e9258875ac3c9bc4ed40f4ac58443ac4aeef786499b02ff45f2adb304160f3b25b0bf3
-AUX superlu-4.3-format-security.patch 312 BLAKE2B 2ab1eaa7072a06abf80373a86e73d3cd131a5dfb1fee370fac330c7932d0b20dc94f2711be077d3739af0f1d6b9779080f0ccf75a65b50156aab35cfd451b7d4 SHA512 86072c671b946a73e8857fcf60499c589c0de8ca2433c2310701a2249eb32968e7ab83e638be1fcee3358d3b1432cba988cf11644962dbf09045b4907b9ebf6a
-AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c
+AUX superlu-4.3-autotools.patch 17799 BLAKE2B 0676f8a5ca9019aaf047503fc9be675a8de5ac8d68c182c50b23b75b46b793e04ee3560cfbdce2e9b3febc725520177d1e9571f2c75455e7e5ae65b7b8079e74 SHA512 c1f8bc4b0e5314266be9c11f0d536495e7414d62f0df996d5c9192796aa3604e363e1c07b5b6de5755006184cdd2efe04b938598b7936482f9ea091ea3c4dfec
+AUX superlu-4.3-format-security.patch 178 BLAKE2B 3e4982f52d99c79054449822caf2edf37b325e7eb2a49312f4ead42cc733877325c01b63502c1ebf45006ba5b0875109e4d38f919e7ad9f1f99d502daf619deb SHA512 661211470c6e0cefed1c403592c308354331fa9bf8332b86da36284036ba4f98d904b0d510c27232f7b3d84306d182e172a9a2acdd4f4618fec893ca74d27455
+AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26e614b935cc6a067cdd80cc29a4456d419ac20a2b7454f64c27c6dcafaba5eaa1fac1f957d2f78749e4209e73647346e2f62a9 SHA512 c0f5d203c7f764f3cc9e61a4d703cbbe66d0bb982412046af617be8935143026e8cc07d2fee2911d7e9cb7488bcdd32a26850b15eab4776f62a26f139066bb3c
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
-EBUILD superlu-4.3-r2.ebuild 1583 BLAKE2B f1eeb354d7a41826a980aee35707f1d3d6c15753cce38615f8f360b8feb1ab2efda9cc65b1d30e6e0513eba136adbff4113a0a6a4ca06139f19da8e45bddcbff SHA512 89562c3f9521cac172068a6185b6b2a8970c9f04f298587734cd360b41cba4d2072577bdc2afe68c2203fc6c8ce157448aa3a870bb6c63f12bad8bb35374c9e4
+EBUILD superlu-4.3-r2.ebuild 1626 BLAKE2B 96ecd71fb11f356a11326173139b5927d629704a7a751d775f6b11bfe3f0f0ccd5c5959c12400fa689d49edf59cf09fc528b73861ed60d933fbdaad3657992bd SHA512 64bc5dba99ab70e37f088da00b45b8a78e69a23a54e0f35b7688db37c531070f3b8c02c4b7500527dc7105af2bef51bb53695da6d85f64920c7fd3f77e542d4d
 EBUILD superlu-5.2.2.ebuild 1170 BLAKE2B 2c65c4428e1564385032efb8c6d40cceca3c0b64f5c56d4f44f11e5f92f4eb241dd15e4510eff40546557eb211dbd04d5b2c1235db997850f65d394705587d3b SHA512 1480bbac2e9beb3333cd4c4c569da6e3089b9e8ae823e8f770ad464994a741497e65f39068eae439c29e6ef5a3d466ad06695ddb0b29058de2f342ade16f6ce6
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/files/superlu-4.3-autotools.patch b/sci-libs/superlu/files/superlu-4.3-autotools.patch
index c5aae0159344..5deeba83cf3f 100644
--- a/sci-libs/superlu/files/superlu-4.3-autotools.patch
+++ b/sci-libs/superlu/files/superlu-4.3-autotools.patch
@@ -1,14 +1,3 @@
- EXAMPLE/Makefile |   68 +++++++++---------
- FORTRAN/Makefile |   14 ++--
- Makefile.am      |    4 +
- SRC/Makefile.am  |  110 +++++++++++++++++++++++++++++
- ax_blas.m4       |  201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac     |   16 ++++
- superlu.pc.in    |   13 ++++
- 7 files changed, 385 insertions(+), 41 deletions(-)
-
-diff --git a/EXAMPLE/Makefile b/EXAMPLE/Makefile
-index c286ded..37950dc 100644
 --- a/EXAMPLE/Makefile
 +++ b/EXAMPLE/Makefile
 @@ -1,4 +1,3 @@
@@ -21,8 +10,8 @@ index c286ded..37950dc 100644
  #######################################################################
  
 -HEADER   = ../SRC
-+HEADER = $(shell pkg-config --cflags superlu)
-+LIBS   = $(shell pkg-config --libs superlu)
++HEADER = $(shell ${PKG_CONFIG} --cflags superlu)
++LIBS   = $(shell ${PKG_CONFIG} --libs superlu)
 +CDEFS  = -DAdd_
  
  SLINEXM		= slinsol.o
@@ -164,8 +153,6 @@ index c286ded..37950dc 100644
  
  clean:	
  	rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
-diff --git a/FORTRAN/Makefile b/FORTRAN/Makefile
-index 23671a7..54da751 100644
 --- a/FORTRAN/Makefile
 +++ b/FORTRAN/Makefile
 @@ -1,12 +1,12 @@
@@ -179,8 +166,8 @@ index 23671a7..54da751 100644
  
 -HEADER   = ../SRC
 -LIBS	= $(SUPERLULIB) $(BLASLIB) -lm
-+HEADER   = $(shell pkg-config --cflags superlu)
-+LIBS	= $(shell pkg-config --libs superlu)
++HEADER   = $(shell ${PKG_CONFIG} --cflags superlu)
++LIBS	= $(shell ${PKG_CONFIG} --libs superlu)
  
  # double real
  F77EXM	= f77_main.o hbcode1.o c_fortran_dgssv.o
@@ -208,8 +195,6 @@ index 23671a7..54da751 100644
  
  clean:	
  	rm -f *.o f77exm zf77exm
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
 index 0000000..7e51046
 --- /dev/null
 +++ b/Makefile.am
@@ -218,8 +203,6 @@ index 0000000..7e51046
 +
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = superlu.pc
-diff --git a/SRC/Makefile.am b/SRC/Makefile.am
-new file mode 100644
 index 0000000..748e5e9
 --- /dev/null
 +++ b/SRC/Makefile.am
@@ -334,9 +317,6 @@ index 0000000..748e5e9
 +libsuperlu_la_CFLAGS = $(CFLAGS_SAV)
 +libsuperlu_la_LIBADD = $(BLAS_LIBS) libnoopt.la
 +libsuperlu_la_LDFLAGS = -no-undefined -version-info 4:2:0
-diff --git a/ax_blas.m4 b/ax_blas.m4
-new file mode 100644
-index 0000000..e4f96cb
 --- /dev/null
 +++ b/ax_blas.m4
 @@ -0,0 +1,201 @@
@@ -541,9 +521,6 @@ index 0000000..e4f96cb
 +        $2
 +fi
 +])dnl AX_BLAS
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..f6707be
 --- /dev/null
 +++ b/configure.ac
 @@ -0,0 +1,16 @@
@@ -563,9 +540,6 @@ index 0000000..f6707be
 +AC_CHECK_LIB([m], [floor])
 +AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc])
 +AC_OUTPUT
-diff --git a/superlu.pc.in b/superlu.pc.in
-new file mode 100644
-index 0000000..7bf9942
 --- /dev/null
 +++ b/superlu.pc.in
 @@ -0,0 +1,13 @@
diff --git a/sci-libs/superlu/files/superlu-4.3-format-security.patch b/sci-libs/superlu/files/superlu-4.3-format-security.patch
index 809408a166ab..a2fee7e7c20c 100644
--- a/sci-libs/superlu/files/superlu-4.3-format-security.patch
+++ b/sci-libs/superlu/files/superlu-4.3-format-security.patch
@@ -1,8 +1,3 @@
- SRC/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SRC/util.c b/SRC/util.c
-index 858fbbc..c038ccf 100644
 --- a/SRC/util.c
 +++ b/SRC/util.c
 @@ -29,7 +29,7 @@
diff --git a/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
index e48a7c86fa31..cbfc013141b5 100644
--- a/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
+++ b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 08027ce..8884585 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -121,13 +121,7 @@ if(BLAS_FOUND)
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 7ff9a6d2020e..14c89813db21 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -46,7 +46,9 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 	)
 
-	econf
+	tc-export PKG_CONFIG
+
+	econf "${myeconfargs[@]}"
 
 	rm EXAMPLE/*itersol1 || die
 }
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index 92c6c53f192d..74f863ed03f8 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,4 +1,4 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1.ebuild 2606 BLAKE2B 73858ec51cab82a6c344dd577cd61cbcca4ea1e2b4788c104430b9dea62ae5535a37e3e9a9b231079e82fa7177bae8cec426cb0e0e737e6998a00d77fdafe4e7 SHA512 7ec150f01e4ed6267d50c9155a3f8d98316b13773c5853802a0798022712b659a65373f198cf97baf7b59748d853b02663bb0122825820a5fcae3ad0e737dbb2
+EBUILD superlu_mt-3.1.ebuild 2599 BLAKE2B 4eff4966f84ca878bb35a520cecc489d9ce35e3c42b32e144f7755a9ff967b2c8de729a5132a1a2ef2b200524a7c7ae50e7ed5c78f2babdf74793d69ac6c6509 SHA512 ce01e3cb4363856ef16473ab6a46fd8df956d2145958bb858928fbbee6a0224079ba047bfd76b5ede06f2e0dc69df1304898d7290572989817c97fecc9c838c8
 MISC metadata.xml 1471 BLAKE2B a51fd3dd9c2e49e44b3178e6ff5a268ea5be4786aad0f78a6e44156aa2df30adf265ed64d80904350c7f57bcdd7c15f7b563d35d06a51a34974437c09cb482b2 SHA512 1f4ab676f807e3211c894cd5ae692987c419937a0f0aa2bae46b72d029ad843f3d4415ee9ce3876b6d19e8446e3d6c5085b1671f0b7b73329696d9c231540e76
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
index d7ff2878b1c3..54397230e5cb 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs versionator
+inherit toolchain-funcs versionator
 
 MYPN=SuperLU_MT
 SOVERSION=$(get_major_version)
diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest
index cbf0a692db33..3be3adaf3bc0 100644
--- a/sci-libs/symmetrica/Manifest
+++ b/sci-libs/symmetrica/Manifest
@@ -1,3 +1,3 @@
 DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271
-EBUILD symmetrica-3.0.1.ebuild 542 BLAKE2B deb6794659c185512d1a03601790665e81c0fd306be97e629bca9e500ed861b5e576a74e616397f646b24b04f325ce6e384c4a58b37991b705c3d7e4efb3321d SHA512 a851339856d5a65700d3abe03923d26eeb3792a6da2bd9198b9be2e112b0999d8a581ce914b7171941557c3d19d6a4c366bcf9d3a2b431aed0d74d91fb12fddc
+EBUILD symmetrica-3.0.1.ebuild 530 BLAKE2B b9a3cd7f3edacb76e66acceae8385a7c86bdb353cc460c22b7ea3a955c24e3f45dc4dda3ef571b6b11975917d598f9419c89f30601bc20eb6c9de807e3dbdd49 SHA512 7915db0df900b3cd85c0633beaa280fefd9556a59c3a9917120edf4301dc480da1887c9242a2f015a576e3582e5de08539aada45ed54cda60550e15201c40649
 MISC metadata.xml 788 BLAKE2B e66494f9b10e4ef416925df39e7250eeb685ca735f46fd27be89de25f7431713d715f3f99861e687a2dc1d0284e5f6eee241b777219eee8390a8207f2b8bdde3 SHA512 2d77d02c8f7b262c770a3a744a981d12c8454f31901438fe7116c28192c20bce17d58fe5161185b2fa5eb9d850277a7334aac3f6c6dd57526992bad2463e2e88
diff --git a/sci-libs/symmetrica/symmetrica-3.0.1.ebuild b/sci-libs/symmetrica/symmetrica-3.0.1.ebuild
index f616c5710f80..ca5e8384135a 100644
--- a/sci-libs/symmetrica/symmetrica-3.0.1.ebuild
+++ b/sci-libs/symmetrica/symmetrica-3.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="C library for representation theory, combinatorics, and more"
 HOMEPAGE="https://gitlab.com/sagemath/symmetrica"
-SRC_URI="https://gitlab.com/sagemath/symmetrica/uploads/b3d8e1ad5ab2449c30bbc3147e7a5e53/symmetrica-3.0.1.tar.xz"
+SRC_URI="https://gitlab.com/sagemath/symmetrica/uploads/b3d8e1ad5ab2449c30bbc3147e7a5e53/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/2"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 149ec073f206..1b142fef68df 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -29,5 +29,5 @@ DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-2.4.0.tar.gz 53257138 BLAKE2B 21973f67a7a4cb91baccbd3a4d9c8bce4c7f488ed44e834122b0fa0fc47b22d48276ecd9b580fa839c32a3dacac73bc010f91a27e5568df4dd9986b14b7eeb4f SHA512 4860c148fd931c4dc7c558128e545e2b6384e590a3fbc266a5bfe842a8307f23f1f7e0103bda3a383e7c77edad2bb76dec02da8be400a40956072df19c5d4dbd
 DIST tensorflow-patches-2.4.0.tar.bz2 1842 BLAKE2B ac35a02e3494b0cb6cfcc9212557d5b5480aea41b09d74b918471e688b489bafd2dbc609320abde609a461db1c8d0043fce4053ad9a223bc93fb883176417199 SHA512 39b3ebe710eb3bb5c4575dbbad66ae1bd2a81b803fb9007709154320eaf31cbac213ea5dc6c2e674e685db1cea5ff524f723f3893dfe5f31af32be7756882b28
-EBUILD tensorflow-2.4.0.ebuild 14618 BLAKE2B 366523038c6ff14fd17eead4c29630c018412bf7deac572527297064ea746dc9e74a391487561123613d3d86613f740df6838eb024bc0c422bb2aef7e0ea0a96 SHA512 cad63ec298ce4de9ae67e2043d45421e8a81a210272d2ef8175ec309dd23770b8cbe95330e7fc0fb63bc850b555099c048fafdb2335f2599f999587506356304
+EBUILD tensorflow-2.4.0.ebuild 14636 BLAKE2B 2939992fc26c56929af4499e107c813077288eec4f3156843ecd531640bda9413e349a8892dcb141d5b1ef6f1599a7c9f68bd4a0e295a5dfab59c3c6bf3a96cc SHA512 a5e4f9e86f7cae95b1975091c84b74b7cb6732ecc552a59970af9d0fe5c225c8bb8a71b25313ea8de91d60f0413defb16d0f096ae0a7dee0e9d8fe07ffc88325
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.4.0.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
index 54194fd4e24d..752cc4915648 100644
--- a/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -303,7 +303,7 @@ src_configure() {
 		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
 		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
 
-		for cflag in $(pkg-config jsoncpp --cflags)
+		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
 		do
 			echo "build --copt=\"$cflag\"" >> .bazelrc || die
 			echo "build --host_copt=\"$cflag\"" >> .bazelrc || die
@@ -385,7 +385,7 @@ src_install() {
 	doins -r bazel-bin/tensorflow/include/*
 
 	einfo "Installing libs"
-	# Generate pkg-config file
+	# Generate $(tc-getPKG_CONFIG) file
 	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${PN}.pc ${PN}_cc.pc
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 4844f0cee4b4..6a9578279fd4 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,12 +1,8 @@
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
-DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
-DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-2021.tar.gz 114974 BLAKE2B 9f707a901b83f0d8a6c7e5c9b43b135c7539cf4f1fa44a4ed1a5c8f2f7066e1241515fc025ea436f2e52e6bf4aefb7c9a15575e8a588845dda7fbb6717f50b7e SHA512 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
-EBUILD votca-tools-1.5.1.ebuild 1094 BLAKE2B cc03fda70f27211323b8b0c2d33020dcd4aedb972316d2a1ee6a04a29b414fd44f935ac31fcfd014b4de77e6f0b29136caeaca061ebdbbd3144080b01f723680 SHA512 fee06ff16f050880612fa4aa981dd56b85c437eaf4204f39489a2c19bc8dbb555fed94f2a39732083ac487923db391fccbccb4d3954ee33c822b9cfb5efd1db8
-EBUILD votca-tools-1.6.2.ebuild 779 BLAKE2B 41bed9d7eec490310d705c56a0cbd4b6d05f782ccd7fd8d5c445bd0a0c31061e4adb5d306043878d33f5892ae5b9430cce07e56a0050a29cf3faf5b49e9c9a54 SHA512 57ec416136cf2e081d5f25563b95069c8a5f49230696570a3d7ef94c36b5230cc3fc2b2c63d2c34f76ead351b64de042bfd6bb92bb92729b3f294480eb9bd676
-EBUILD votca-tools-1.6.4.ebuild 751 BLAKE2B 93b51e936ac594d3cc8a0c8f5d4051ca6d5c573ea4250cfc0d74a5cf92d5177d0e498c2d4719ce5ef2dab324a2325a7eb710ae093387abab38acf7a28c22f78d SHA512 7f2cc20a627410d51c9e5a48b3690b87de4a64deb044c21fd8b9bf27498b4f2d695af57d810f8025feb09e6787a737087ec05d3f3cd46b846659538237d610ff
-EBUILD votca-tools-1.6.ebuild 791 BLAKE2B 230efde0d632b6eb4d92bcac6211903fe659fb5fc1bb7e36a44c708cfde6d0b06992b17574ab80ab8a32f46637550277e42856c565f9382ece2c479d0db7a238 SHA512 8df3be66989c8cee86badd3e3b67ef80b11748c92a46cef11b9eb8a34a569ac9a33b3cf643bb4cbcf67b4b39f1875caa7cc2858a27e7541dac6e179e96b55a53
+EBUILD votca-tools-1.5.1.ebuild 1087 BLAKE2B 00c2358c8c4e36c34dcf359cbfb8cf9962ca5cdf413fa78b7c86fafc6333a4c4ed01892e18a91a2d0bb8b0bb7f3b1c527510eb207cb7ddd87e557b8489b13f0d SHA512 b3ca29f58b0c65642985506cf3f32c6850483ba7e8e0763cc9194957523931e9a6f51c3a441ffcd550f154bb6ac6f234a244c16bb431ab29feb93c242bb0cc53
+EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68
 EBUILD votca-tools-2021.ebuild 792 BLAKE2B f185fed01b8cac544c15627419534edb811e9a2d3f8d418d4487396db7c566f4f171f2fdfe41ee650a0ede653ac0b2bb43f7a17e79d404ec6d15d07314b433b0 SHA512 cdd7bd917b6d5dfe476d46e22d4d821b709513116b73c41a71f5f9c1a5e2b0dace7f381788f3f0baf22c3dd945904203ef433ea67d32a23eea98ce408355bb97
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 0a40f725c05500548af930c546def4b08594533c6bcb2500ec011c075544017898cad004705673a156d8b88e0e6feed0bc7903d00548c7eb2025d1312ed315ba SHA512 d327536f0b9c4a047d26e9ad63f44750c11459b34709d7bdd24aee6f3908ffb87a6f43a6410518427bf168134695bc6f11b11b2723eaa2d29cfa039970411e90
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
index 3eeaa6f0da47..7c07b1f80ccd 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit cmake-utils eutils multilib
+inherit cmake-utils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
deleted file mode 100644
index 251300265923..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
index 21ffc1d3bbaf..37b977cdd6b1 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 fi
 
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
deleted file mode 100644
index dde9b50444e6..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake-utils_src_configure
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)