gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-libs
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
83 files changed, 373 insertions, 575 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7824b27e8c05..d6547e35b24e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index f084c1546374..bc2cfebe21ad 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,6 +1,9 @@
+AUX cantera-2.5.0_env.patch 2218 BLAKE2B b4fa7e25081ba5818163a16b970c8fde8a7faec64495a566b805d593151a48cd67722052e73ce1df70c751852d5e5e58e70d5ff110f0c8e4ef46262ddd951a1d SHA512 7045812de7d8cbcefaa8a22f2caf831bb0811d0c8b73a9f0550462fd2f8778f7f61aeaa8d1f6381a303063fbf7364a7cf22bcd40127bf0e1bc08418b8b10399c
 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.0.tar.gz 2479888 BLAKE2B be3dd9ae1b0d9b555b9ddd6ad78a2a6a675844903e4c10ef5e4a09c66d5ca01f81f49f35ee195597d71140dcc4da9750e82f71c6553b5f0ef8a122bf63b86cc1 SHA512 4f1763a74a4a938c6d4512ab574bcbbb84ea6e8c9814c612e6ff6cba0bec1209252ef7c21004e0df98a84279cf66bd137220233dad0ebbcfc89e9a273d753478
 EBUILD cantera-2.4.0-r5.ebuild 3069 BLAKE2B 39717e82093e45822879a61834b49b64bab571b850d3e2efccc09e8f2667d9729edea788afb15fc056030d1239ff25bff7e6868ebd62000acd7efc72c3c55e4f SHA512 df6942fc36890820efc815873423b63aea4448b180b201c6ce4e85c4ae9cd67e54f21935de4a9351581f8913ae732c7c85bdb6348ed8dfe0da43cc503e1c1537
-MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
+EBUILD cantera-2.5.0.ebuild 3181 BLAKE2B ec3cecba3ad0e08452d05ea6fb4d9177ecd28cd7a659c9eeabd6581610337f420a3901f53aebca3e5f02281e56180ee718faeed838554bf9914578641db78efd SHA512 99cc3da4810d27094a1f3a996caebfaed47033945d03d0e10ceade5654690d49989d7b082112873ef1ebefe597f4c5cd7c7f74577aae83e2d3d3769f15e2cd4a
+MISC metadata.xml 803 BLAKE2B c0444a2aa286283ff4f6e391482b338b64bf369691113a140c3bd5b391498a343c57987be260f4a4f72c9ed3013b2b7ee461f2e5771dc8a7fdfb88e4e64771c5 SHA512 2601b121f8e7ee11f1228c0b2fdbe90657a1cd944a2a6e385a1b73448d4d1f4da3f4d17c6afbb078feab1a26c2dbf4fd7d1901916e32e02fb0c397abf6852653
diff --git a/sci-libs/cantera/cantera-2.5.0.ebuild b/sci-libs/cantera/cantera-2.5.0.ebuild
new file mode 100644
index 000000000000..5f3b8c1280bd
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.5.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	dev-cpp/yaml-cpp
+	<sci-libs/sundials-5.3.0:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/h5py[${PYTHON_MULTI_USEDEP}]
+				dev-python/pandas[${PYTHON_MULTI_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${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=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${FCFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch=$(usex pch)
+		## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		system_yamlcpp="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
+	if ! use cti ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}/$(python_get_sitedir)/${PN}"
+	fi
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/cantera/files/cantera-2.5.0_env.patch b/sci-libs/cantera/files/cantera-2.5.0_env.patch
new file mode 100644
index 000000000000..9551d4b4ca1c
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-2.5.0_env.patch
@@ -0,0 +1,49 @@
+diff -Naur old/SConstruct new/SConstruct
+--- old/SConstruct	2021-02-13 01:18:43.000000000 +0300
++++ new/SConstruct	2021-02-13 01:27:06.000000000 +0300
+@@ -193,7 +193,7 @@
+     toolchain = ['default']
+ 
+ env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix', 'gch'],
+-                  ENV={'PATH': os.environ['PATH']},
++                  ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')},
+                   toolchain=toolchain,
+                   **extraEnvArgs)
+ 
+@@ -724,10 +724,7 @@
+ env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0)
+ env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)
+ 
+-try:
+-    env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD')
+-except Exception:
+-    env['git_commit'] = 'unknown'
++env['git_commit'] = 'unknown'
+ 
+ # Print values of all build options:
+ print("Configuration variables read from 'cantera.conf' and command line:")
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript	2021-02-13 01:18:43.000000000 +0300
++++ new/interfaces/cython/SConscript	2021-02-13 01:59:29.000000000 +0300
+@@ -108,8 +108,7 @@
+     elif localenv['libdirname'] != 'lib':
+         # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
+         extra = localenv.subst(
+-            ' --prefix=${{python_prefix}}'
+-            ' --install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version))
++            ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}')
+     else:
+         extra = '--user'
+         localenv.AppendENVPath(
+diff -Naur old/test_problems/SConscript new/test_problems/SConscript
+--- old/test_problems/SConscript	2021-02-13 01:18:43.000000000 +0300
++++ new/test_problems/SConscript	2021-02-13 01:42:19.000000000 +0300
+@@ -222,7 +222,7 @@
+ CompileAndTest('VPsilane_test')
+ 
+ CompileAndTest('clib', 'clib_test', 'clib_test',
+-               extensions=['^clib_test.c'], libs=['cantera_shared'])
++               extensions=['^clib_test.c'])
+ 
+ # C++ Samples
+ Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 47bc86a96301..5ee7890c1369 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -14,7 +14,7 @@
     for problems involving chemical kinetics, thermodynamics, and/or transport processes.
   </longdescription>
   <use>
-    <flag name="cti">Install CTI tools (ck2cti, ctml_writer) for conversion of Chemkin files to Cantera format</flag>
+    <flag name="cti">Install CTI tools (ck2cti, ck2yaml, ctml_writer) for conversion of Chemkin files to Cantera format</flag>
   </use>
   <upstream>
     <remote-id type="github">cantera</remote-id>
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index d50bb7e6f511..bcb8834657b9 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -2,5 +2,5 @@ AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e
 DIST CCfits-2.4.tar.gz 1792643 BLAKE2B 5304789d01278884faa9765be3f22e03e7a37370f0f3996045a663d5793a1686ce4c2d379227bae57bee5643ac398242223cb0300337f4ad67b662679019e92e SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 EBUILD ccfits-2.4-r1.ebuild 918 BLAKE2B 2f817e91add7ee23a1575355b4978ff241be1bba2fed999f59b24a1bd04248d0d48856ee4390cb874542aec83f1c0724cba27d0ffb39f976eced8b5c81728303 SHA512 bc7f26b5dbad51c16f35fc3f5892523eba313cfefdfd9687f408d5fea1961cd69a1badffc416469dfae30b927da5d5dd01f241747fd7ccad8e05af2f1351866e
-EBUILD ccfits-2.5.ebuild 938 BLAKE2B 3db3cd33cc08edec8eafa6abfa009ac8cb0df931be067df01c625cea00101d4bdfd87428b0061e8d572739a9e0ddbecdc646aab1666ec988e8610a2a1e5c4c27 SHA512 c3486bc0a2107a56374c297c379fd1255ea81201743bfcd24fe32523b5df4948f56bc87658af7da022e75333a029e2c775aa75afa79c631f5b0a6699a4a636b7
+EBUILD ccfits-2.5.ebuild 859 BLAKE2B 2b00b9e3fc988db20fbe2023c614d089b426d1bb0ad0727e9fbaec89eb61c88940a91b202034b83d2c2e091ee79c06d3db29796764c050b89edb22680b62a080 SHA512 35adc47118a47e76b324f352496f5d047763b1a7c02f2a46f908f1e14647b55dff7b45a142704c29b943a2246472bde508d6e204120356e13fa4e364bb1e393e
 MISC metadata.xml 639 BLAKE2B 6cccb8d66f9dcde2f82383b919dcf67122a8d27f24641b262899831bc60b19b4cf433df5e1d05fcd2a140b20bfbb5a1add4bee162ba7574834a50c455f983a85 SHA512 163801f94ad9076cf5306b4f06682fc7186e724704b4ad1e5dfca871fc770ed0b06827caa2aa83eeebc7bb65b5bbc27f254431d6472735abb30f0872eeccf721
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index d02029f57d00..c2dbe59e5bce 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune
+inherit autotools
 
 MYPN=CCfits
 MYP=${MYPN}-${PV}
@@ -15,17 +15,15 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}"
 
-DOCS=( CHANGES README.INSTALL )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-makefile.patch # avoid building cookbook by default and no rpath
-)
+# avoid building cookbook by default and no rpath
+PATCHES=( "${FILESDIR}"/${PN}-2.2-makefile.patch )
 
 src_prepare() {
 	default
@@ -34,7 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
@@ -43,5 +41,6 @@ src_install() {
 		HTML_DOCS=( html/. )
 	fi
 	default
-	use static-libs || prune_libtool_files --all
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 64fb02573af4..04af77d253da 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,8 +1,5 @@
-AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
-DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
-EBUILD cholmod-2.1.2.ebuild 1749 BLAKE2B ad72937ed0107ff533c0fc9c996c22ce299f989dc040b2162b3c119c851f6b5b23e6de5cef58f4c91ea2cfcfc790ab1c3c3477d0b4854ba40519a69c95cdf4f1 SHA512 eddb839768b745f9deff81454a8f6eade1d25ad2d891f498b8f3c4cca88614e72ac0df6535946929ce96b74f2ff52bca51fdd0b6d90f2e480cdac49d95340f10
 EBUILD cholmod-3.0.13.ebuild 1660 BLAKE2B 6f53739a8ea19773b34526ece750fe0e8c2d3ffa221058b4e201bbe6180c55535c9edf902b4a8c576343e5e22cbd3cbb03dd4594a6455d438cacd81450f1f0c0 SHA512 bbd5b01ef11bddcb0d10bea1917ce1b25c6d64321ecae25c63f5070d392f71c62e687847bbae1cc41fccf36db3295dffdf284f47d17de8979f550830037bebd8
 EBUILD cholmod-3.0.14.ebuild 1638 BLAKE2B 968001fa093308f7eb371f2fb950df835b15993f6bffbe5e16c84f2dd10aa6580c718a7135f1fef79222a738c4f7adf693a29aa066742492fdcaa07c54e74241 SHA512 9e65c66adece13aebef04a6ba4c746f149e0c61c5c20ce2875a3b58a1a7321eb6b3078416fb138325e61a115901bfa9ba5ad32e05e9cf3702ee7ecd49e2758da
-MISC metadata.xml 920 BLAKE2B d78c2990bf35b95155adefe8a7b6d3213cd7187d031abbe91f1e12cb2ab438fce1ec34743a21a20b649255c691b87b6033f8bf8eec30b670456c105ad80f2c9a SHA512 64083142e54e0d9df8fb93c8a9ef810c4a6c85546ed8d96413acbadcbe3120d528e15895786e303094874448eeb4b411ce457147f452f781c6184aea985f5e9a
+MISC metadata.xml 807 BLAKE2B e5a0fd3e5c5466397e9972ece2046b051f3b8fba8141e9e3a91b8ea474007b8a38998c16b3462e362d3713748620e41d2e35196d53d815c0865df7a494b3c104 SHA512 84f642bfb6676da3f9c66dddd635661c259e6182bf12c567655961c902189183570889630988f582c6913ddfa621944f0db4c22c7e9b8a715d1da8fb2fdd64f4
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
deleted file mode 100644
index 4bc6ca5590c7..000000000000
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib toolchain-funcs
-
-DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc lapack metis minimal static-libs"
-
-RDEPEND="
-	>=sci-libs/amd-2.3
-	>=sci-libs/colamd-2.8
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	lapack? ( virtual/lapack )
-	metis? (
-		>=sci-libs/camd-2.3
-		>=sci-libs/ccolamd-2.8
-		|| ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_prepare() {
-	# bug #399483 does not build with parmetis-3.2
-	has_version "=sci-libs/parmetis-3.2*" && \
-		epatch "${FILESDIR}"/${PN}-1.7.4-parmetis32.patch
-}
-
-src_configure() {
-	local lapack_libs=no
-	local blas_libs=no
-	if use lapack; then
-		blas_libs=$($(tc-getPKG_CONFIG) --libs blas)
-		lapack_libs=$($(tc-getPKG_CONFIG) --libs lapack)
-	fi
-	local myeconfargs=(
-		--with-blas="${blas_libs}"
-		--with-lapack="${lapack_libs}"
-		$(use_with doc)
-		$(use_with !minimal modify)
-		$(use_with !minimal matrixops)
-		$(use_with !minimal partition)
-		$(use_with metis camd)
-		$(use_with metis partition)
-		$(use_with lapack supernodal)
-	)
-	if use cuda; then
-		myeconfargs+=(
-			--with-cuda
-			--with-cublas-libs="-L${EPREFIX}/opt/cuda/$(get_libdir) -lcublas"
-			--with-cublas-cflags="-I${EPREFIX}/opt/cuda/include"
-		)
-	fi
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch b/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
deleted file mode 100644
index 6b50ae8bcea7..000000000000
--- a/sci-libs/cholmod/files/cholmod-1.7.4-parmetis32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur CHOLMOD.orig/Partition/cholmod_metis.c CHOLMOD/Partition/cholmod_metis.c
---- CHOLMOD.orig/Partition/cholmod_metis.c	2012-03-13 03:57:37.000000000 +0000
-+++ CHOLMOD/Partition/cholmod_metis.c	2012-03-13 04:02:22.000000000 +0000
-@@ -216,6 +216,7 @@
-     int Opt [8], nn, csp ;
-     size_t n1 ;
-     DEBUG (Int nsep) ;
-+    float ubfactor = 1.05;
- 
-     /* ---------------------------------------------------------------------- */
-     /* check inputs */
-@@ -370,7 +371,7 @@
- #endif
- 
-     nn = n ;
--    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, Opt, &csp, Mpart) ;
-+    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, &ubfactor, Opt, &csp, Mpart) ;
-     n = nn ;
-     csep = csp ;
- 
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index 8bb99b368235..655cf27be61d 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -11,9 +11,6 @@
       Support basic sparse and dense matrix operations (add, multiply,
       scale, et cetera)
     </flag>
-    <flag name="metis">
-      Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg>
-    </flag>
     <flag name="modify">
       Enable Cholesky-modification routines like update, downdate,
       row-add, and row-delete
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 7767593105ae..44b33ed8de55 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,6 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 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 5236 BLAKE2B 4b5c4e35542818ea2cffd3f93c769540c1e59ebfb01475f56981b1b85146370557036d88abd55cc7be0c05bc487e92a9c575c1334aa1dab0b3f2b1ac6422a7f7 SHA512 815402db6879d98116f56c6ab819b1c10cac5510c8123d19157023919825fdac578bfc5259cffc2876b2126fb14d3f70b3f5b7816c8a55dae82dcae22519810f
-EBUILD dealii-9999.ebuild 5016 BLAKE2B 0b6b046276f67c5a74830d923bab1b47920ce23f897e583525e1d1e5ed5f7d58f687697d9c045af0951d57e8d71400403d69ffa747f2c4a4d441506668b4b087 SHA512 ea5f868b952b686360c7fc7c987a6e41f9c80781e8519ceba1fba59565ccbdea95d6852ca3694f4671fc2aee9ecfc2f4ed7016d687d005c7de71e08a25bfb3fb
+EBUILD dealii-9.2.0.ebuild 5223 BLAKE2B aa83be23d21ed3717298ba48d0ccb452c5b90e3ee29f024be57793a18e91fa1c28dd6e074fb69efdf4ffe06c01f4d8949f04e34a909ef87c789051d33dc7bcce SHA512 a268cda47adf2dbce2922babd92371dd31b3f40be975ea63ca06fe60bfdd3971ad5679236f902451c4f8df06f5e07249cb95cc4b89d61f98caf46ce0bdf40661
+EBUILD dealii-9999.ebuild 5003 BLAKE2B e437c909fc248fd9b5bdf72093f4c04583ca6123a5fabcb4c9b95d989091ae0f6993e4d39c498c28dd14c49ae148b552cc65ce3b5adffb4d71c6eebf2ac1dafe SHA512 5cc9e9a4e4599dc3cbe3d07feb276304becf235dbf8099fae8c8833f57bff194103e9960fa4cb2dbda600dfabe6dff3071c7412a688abd08f01fcf8d04cb3600
 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 e93536af9ef5..84251e8e9386 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
 		doc? (
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 961516337a8c..64d3092167ea 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
 		doc? (
diff --git a/sci-libs/dmlc-core/Manifest b/sci-libs/dmlc-core/Manifest
index f4601fccb37c..f539176f55cc 100644
--- a/sci-libs/dmlc-core/Manifest
+++ b/sci-libs/dmlc-core/Manifest
@@ -1,4 +1,4 @@
 AUX dmlc-core-install-dirs.patch 1206 BLAKE2B df1f1520f3e6b21ef7dc30d6f2d73f888c639bdbbfe824ed89a5a7a9fa7b9dabb94704d6ba1ee9a95274b66b5160c560538cdb252804cfdeb304f7b8727cddb5 SHA512 ceee3e6f6f02e4a96167f12ffb50cbbc3bfbf07d025acb002139072ac73cf02adcd9c8f7a7b371055a68a61a104bf16ad95d7a3769edc3ad2dc63be36ff45ff5
 DIST dmlc-core-0_p20170719.tar.gz 160242 BLAKE2B 2752968c831b5468cb926fbd2783098d1d66f5dd7f06b1abf138e165c637a3c16d477b04b709a05826528ee8e35ed61b563bdaae958fb91c78591dd57761a5f4 SHA512 2e2d79800839652772f07deb5ea3aa470cc5a18d2d0e480b8f4a1598aca72443546a438f3309708268cc49cf2d65684c3366cfc6c33c085baf1b804b4c04f02e
-EBUILD dmlc-core-0_p20170719.ebuild 2296 BLAKE2B d01901f91a4d068c25733ed9740b4498f5826ac0ea636fa2ebb0aa53eb95c27877946c74c1f1891059ca29253b566bd00f9f4e2232c66fa624e2099f99c8ece1 SHA512 fbd464fd08eae23b780c5d9118cc4a8095898b3428385cf1bccb8f81dbb53085a727a34c460438815b913de5adf0348537aebab295e0e8fb86c2d4fd9fcb1c1b
+EBUILD dmlc-core-0_p20170719.ebuild 2283 BLAKE2B 41f19e4687f737d6c9fc5fe1377ca424ec0ebddd03f8e0967c54195f7b844a7526679be064843a14017f7134bd53b6199f8b408935fe7941621aa9d68b14b0c1 SHA512 f2c981b9ef597f68afd11277ce9c1c34dded67b76b7462a585f639e21bafbc59d555e6bef0c0f41a8a476e2604d7b1f901e5b6b72a23d8e3979fc3d99415671a
 MISC metadata.xml 702 BLAKE2B 085ca9f33a3772884d2b401b8339c2f0862a834ccfbe28ecd141c97b26b50f00f499ff7ea917db0eb0fd0b5c3618efadc82300f3bb6c4475c7cf10dc58657bf8 SHA512 ab1359ef913665692ab9fd32c0a18ad6ac9315cb3dbb6299cc4ea642ec7d649f31a79814017e8ad29062fc0c10c8ca27201dbad157a662432bc2b04f4105fe83
diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
index a9dbcf038e5c..1d661c8dbc15 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/dmlc/dmlc-core"
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/dmlc/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	EGIT_COMMIT="54db57d5d1b2a7b93319053011802888b827a539"
 	inherit vcs-snapshot
diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index 95910f6b2a65..02bed027e3eb 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,6 +1,6 @@
 DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794
 DIST fcl-0.6.1.tar.gz 6208928 BLAKE2B 174176b3844b18ada60884f641c49475357b1c25cb58cdfc1c4545d595add58713020ffaf148676dae14eca87397495cc971423f06fd19af5cffac1bde584603 SHA512 9d5382c1f2701f2cc6988b3e3969f44c401ea0eb4fdfc5ae69c27dd5bb59a0f17de82ef49e7dce0e1fd91a133db6f10aef9581ca2e32b919046f72921593ebf4
-EBUILD fcl-0.5.0.ebuild 856 BLAKE2B 752403368628d3d33ebaec23ed5be6a78bcce1ce172b757b063667621e5ca77f39bdace4968ec0c09f4b52d34f101d2af8fb02180b72484ae86cd93125066e2d SHA512 8e0b0f27862a5a1f621fdae61597bb900defb0e3031004692297393ed18d9654409eb0ef5ca4c4d5d51911eee371dce7f58a18d1a84be282662bd07f31d4dc7f
+EBUILD fcl-0.5.0.ebuild 840 BLAKE2B 3735277fc0cc86952fc23034c83e1270da1cc3d0ccd6d5042289dba5487ca4b1f4c85e06a03f5280fe85185946c7cd77405f12c3b072bd41aaa717421586e088 SHA512 01ccb8abd6d61abc3d1bd785fb514072ceccf44955cb156a08349d6db58cc7d93c2330b884fc894568d62955a3202684100601b8844015ed384a0bc08bbe14ba
 EBUILD fcl-0.6.1.ebuild 1870 BLAKE2B 357a6f0c345eddedf3430993d830ded7bda6d27383a961db1f06a65dce11b2f2aa68f37ccf0f25fb2ac9b8deec781d47da2c03671e34dbd87bb2276daafa8c45 SHA512 6e2082a7ab5603f0f81d314b056da249b0835a030478e5f8ad39c6bd8a4e3cbab514c0c9f52360a5d1cea3883914971fe6f4e3eecf7a5fe35855e0b891becdf4
 EBUILD fcl-9999.ebuild 1519 BLAKE2B e94b02c6836e8fa55c3131401359079f832e1b12ec388e338b18ddb0b78a2d4ea5a9aca624894b544a7f2ed4256a597c86aba740ee522b31299e1bd115c528d2 SHA512 90d94cc60a95af83c71c68ed2fd544c27499f2dd7fb4a20a91686b54ffa73a20c4f61a7e04520591287c2b8c6c210a5fa5c0ee9a7379095f5d473e494c55a19e
 MISC metadata.xml 769 BLAKE2B 7c7ffe7a13124d5300e220f1fe060f20764221505d2bc07040f5e1e9caef99ba57f46386cae2d5062d8978654052e00981513f8f0f08d5fa5470fe44a5bb155b SHA512 a01195a169fbd286c3f6d6789681d3134676c4e8b7de6332f35a89751167e0132117b6588404803e8f09fd2b61578705357ea389f969a7aae227c887871b8342
diff --git a/sci-libs/fcl/fcl-0.5.0.ebuild b/sci-libs/fcl/fcl-0.5.0.ebuild
index 95a962bfbcf9..746c037a13ce 100644
--- a/sci-libs/fcl/fcl-0.5.0.ebuild
+++ b/sci-libs/fcl/fcl-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 68d6ce49f1b1..1b7bcb93e453 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,6 +9,6 @@ DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
 EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb
 EBUILD fftw-3.3.8-r1.ebuild 4631 BLAKE2B eb2025e5b4a8a8c2d0aa26fbdc2f2475fcf877b2f6d19533016d5bef0108f4afdef8161b296a2b0b25bd4a28a60285e664b614f61bd0278fcdc8831a9df5edcf SHA512 bfaa6b2d5c30153378e13fa1910baa514b4243bdd441a3165e74ead0e5035e928c9952494933c488f25cf6df23fc681f9ca26aa0316b0dedba44741e1aa9564f
-EBUILD fftw-3.3.9.ebuild 4058 BLAKE2B bca276edab24c3271775b1781d1361b71e9aba6148b3e07296d0950a4d7382bddc6de060e44aee20d191273364d3296de0bdfcf8807cb79d8524b519e9890e7c SHA512 3ebb2367dd9bf52e75759906d5efdeaca134f1c9421eacc55ebc9adc9a56df973409148568862b29a6527ced4b62ef62e269073b73264db272ca0124707a650f
+EBUILD fftw-3.3.9.ebuild 4056 BLAKE2B 4f9b66a6e0bc43d429e285b3d091d3b686bfb02b3526d82d6f96c8928dd51083b777f18234c215b23a85c4be67a2deea2a6fa862ecd9baaa5e47d2b4b68f26f8 SHA512 764d54e5c6542e85224da496627ab7f421a32cc1a8cc40126623cb85617b62101d0889e9ec89b59e112b0b4723d2f48383fe05d4a11779171a2895a8b9660898
 EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 5b57691cc1b9..7b33de00082e 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index ead962631ef7..795ee701b2cc 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -8,5 +8,5 @@ DIST gdal-3.2.0.tar.gz 18928960 BLAKE2B b6cd2f2700cc26c8dd585667cd7b2e3bd9b78d29
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
 EBUILD gdal-3.0.4-r1.ebuild 7347 BLAKE2B 240cd24cb20f44e7802d3f6e46586d3f2a2fdb7371288abb2a05c39cc3f91a5a333a513d1bea2d9438732ef6f69890fbef48abaa76665df82a72ba67074ba610 SHA512 510216239bcb4002353734ee7b30a90a92c0e74dba61d9d6f0d6e93cc85590769588c30c25df4dca9a284a099c18be1636542de65e9b90a2619a953ec379be88
 EBUILD gdal-3.2.0-r1.ebuild 7200 BLAKE2B 264c323a56333986ce1f4d6b949e07da2ddcb40e4b7593231d8ac16af2cc7f5a7c94c0769af8940fe6efaaac4c03524d011f266f51aa7498da2f8a7f8d511e3a SHA512 9b9d61185fafa97b0805ba358ed331edc755e8fbce5a6672e10b76161ab9677c065cdabe55bf9dd2bd9a21cf7cd8167b69bf1ed5b8740c2bd73a8c8513ac3284
-EBUILD gdal-3.2.1-r1.ebuild 7224 BLAKE2B 7ab57964653cb9a48ef8e838af70f77109253c7075ae778ed4697572a44f47a2048aa31e5f3dfcf5a242c3b3ce28d4467f1313f02b46ae9f4c5138323698d233 SHA512 d6ca3f05fb0122309a2426eb546297eab45ba4897201c06d74e7b4a60f2c2bf428b530dcd991425a8df7bfa96fae0b705cd314e729193d40916b0c5d19fde0e7
+EBUILD gdal-3.2.1-r1.ebuild 7221 BLAKE2B 5d0322c1869f37dbdd0e39884acc0c17c939f442fa3dd1a0ad98cd735cb02b034fa6c33bcffb7f204c5e6081f5b785578757e800d46c9c3225008e4380a7a9a0 SHA512 855ccb9d188a6c5c91a2da2074f78425c908615cc488dcedb631aa4784f69b8a144f77369b01401f59d5cd83a7bae96237c45b12f3075091d56e9a7ef9a66525
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
index 5c58b175affc..5eb32d7fbfb8 100644
--- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.2.1-r1.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 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/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index ae0645747121..fe4baf6e7a46 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,5 +1,5 @@
 AUX ginkgo-1.1.1-set_soname.patch 673 BLAKE2B 740cebca34c0eb3472bb5c5b1cd3908701df0acd5b3683d87ed67722912860a3ce298bef181e7bd26defa162ae9374e87cccb0ca5d0df7b1ed296e6bc61b7122 SHA512 294b6855239ffb9bc311cdfbdf49956dba10ec47b6e0d3a48bf3a8e002720bb58d9a03ae5ce68c85552e789818f26913ca3a9d3307c5e68dc86db3a5f1d703d5
 DIST ginkgo-1.1.1.tar.gz 11787690 BLAKE2B 75c2c9b2d1e9ba00e3b0a20859af621cdf4aefe7c6e5ec9c7fc34a5368e5bee70d7d2b86ed9b2d9075ab7cc1a3334434fe20329d780f693be45fd7707cdbe27f SHA512 ab8f2d36453f4e60a4e0a13eddc4a137006c1cc6c9c0db00997dd721dfc06f4401109c5a22ba23a838206cff576d5041d06edaed8823006e69f11e360d1dadce
-EBUILD ginkgo-1.1.1-r1.ebuild 1255 BLAKE2B 435703ad17ca61850b8a7bad01ef0ef763ed09eea57b99349f5af2098527a33a53ff8c4ce1e434c231e487cb31cd2581de002304a01a3783da5a8e22a2a44825 SHA512 c6f1343d676f70b0eec0e137c94273de1ffade68533e7c4022ffba4bfeb0522f8cd02eba8f38edac6b4453190a86f0adccd51239d71d2b18f6e3f54b30acdc76
-EBUILD ginkgo-9999.ebuild 1255 BLAKE2B 435703ad17ca61850b8a7bad01ef0ef763ed09eea57b99349f5af2098527a33a53ff8c4ce1e434c231e487cb31cd2581de002304a01a3783da5a8e22a2a44825 SHA512 c6f1343d676f70b0eec0e137c94273de1ffade68533e7c4022ffba4bfeb0522f8cd02eba8f38edac6b4453190a86f0adccd51239d71d2b18f6e3f54b30acdc76
+EBUILD ginkgo-1.1.1-r1.ebuild 1242 BLAKE2B 332b436207566c71de18d1163d63b79aeba8b4569d0a599edc337cfe86b7d83fa08abd7911b2877a1f7144ed1d78b4af59f17c15148fc0473e0b23b47cdd62ad SHA512 b63ee20c448e38059382e395702519e72384740a77dcafbb7a85611401edb142622c5aced2e901fa6d856c60611591efe9f834b50b24d6f80bfc7177be631ede
+EBUILD ginkgo-9999.ebuild 1242 BLAKE2B 332b436207566c71de18d1163d63b79aeba8b4569d0a599edc337cfe86b7d83fa08abd7911b2877a1f7144ed1d78b4af59f17c15148fc0473e0b23b47cdd62ad SHA512 b63ee20c448e38059382e395702519e72384740a77dcafbb7a85611401edb142622c5aced2e901fa6d856c60611591efe9f834b50b24d6f80bfc7177be631ede
 MISC metadata.xml 809 BLAKE2B 03a441e0dab912e0e44360d81aaae8a290cdf8b3545850e796df22c211ed433a74cccc535c0ed655dafe741aedc4b272d40617104d4df92c14c8fdab6e63d3ce SHA512 8d21f84fa4e7a4d94056cd09324e223f510ce2100f4b5ab2874280a0012b1b74cf891faf1802bd780c6fb3bd86751fda6598787fa328f5d1fcde0e853889f4f5
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
index 5348b9a51be6..6d9b7f42768c 100644
--- a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="https://ginkgo-project.github.io/"
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
 	SRC_URI=""
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sci-libs/ginkgo/ginkgo-9999.ebuild b/sci-libs/ginkgo/ginkgo-9999.ebuild
index 5348b9a51be6..6d9b7f42768c 100644
--- a/sci-libs/ginkgo/ginkgo-9999.ebuild
+++ b/sci-libs/ginkgo/ginkgo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="https://ginkgo-project.github.io/"
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
 	SRC_URI=""
-	KEYWORDS=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sci-libs/idlcoyote/Manifest b/sci-libs/idlcoyote/Manifest
index 1bc5887b3b92..2218ffb4c7f1 100644
--- a/sci-libs/idlcoyote/Manifest
+++ b/sci-libs/idlcoyote/Manifest
@@ -1,4 +1,4 @@
 DIST idlcoyote-20161220.zip 1437560 BLAKE2B f335667a39e9ed4b9590a6e625cfdafe48bfbcda430e8ef791757a9c0f16ce5442de96433260e9b7217176c8b98a8b31a06a68af2ee04e8300a4911b2a4857cd SHA512 2c175cf3a42a0f2915eb8d02884f06892245ee023e6f3f2702b00ced0311dcde504d014fb8936aef7148fe6d91e258e3f6ffeec7d5c0bb22f65962b8ebe3bd8b
-EBUILD idlcoyote-20161220.ebuild 716 BLAKE2B 605e9d5ac92764a4eed896ef5975698d04be438b10cbc4a74ca16832d4735e4dbca5939fab61f6a0c83302d753685338dffb9001ff3ca7074b8b0a83931fd2f9 SHA512 ab15c9d275ff96b99814952ec5a1f6cc5ce079e338908688e97625ebf519d8da474df7188bd8932e1587b92565d965bb77b4c4c7f75983c530ebcd1b23f56979
-EBUILD idlcoyote-99999999.ebuild 716 BLAKE2B 605e9d5ac92764a4eed896ef5975698d04be438b10cbc4a74ca16832d4735e4dbca5939fab61f6a0c83302d753685338dffb9001ff3ca7074b8b0a83931fd2f9 SHA512 ab15c9d275ff96b99814952ec5a1f6cc5ce079e338908688e97625ebf519d8da474df7188bd8932e1587b92565d965bb77b4c4c7f75983c530ebcd1b23f56979
+EBUILD idlcoyote-20161220.ebuild 700 BLAKE2B 9e4e1f29f02ca985f0ce56eaefe9ba7c53c842e17d856449a90ab42f5aa11839df92137b12c1c2fd2528946bc814a30bdfa7af4ad1ffb0af26de6ac5c87a97c9 SHA512 6b930b113db804636f94898ad8326ff84286d98987d619676536f0593265b883becbf63b9d1251459986585e474fa1b6b7316f1c5694fd2e6b87d1c39ab0e6b0
+EBUILD idlcoyote-99999999.ebuild 700 BLAKE2B 9e4e1f29f02ca985f0ce56eaefe9ba7c53c842e17d856449a90ab42f5aa11839df92137b12c1c2fd2528946bc814a30bdfa7af4ad1ffb0af26de6ac5c87a97c9 SHA512 6b930b113db804636f94898ad8326ff84286d98987d619676536f0593265b883becbf63b9d1251459986585e474fa1b6b7316f1c5694fd2e6b87d1c39ab0e6b0
 MISC metadata.xml 606 BLAKE2B d8eb35f26b8ad04473e545f62ec6d1ff53b462016afa3c52e18b11e12a83c202b6c292c545214d164d24cd4649fa1bb75137f172540d910624ba0b768f4344f9 SHA512 06b29c96c7e57cf99f22333ba9df18a23fac6659d1ae57fbe9273c0f548cec1f0a18a5500222e4c000cfb3307bdc8c450da7c57e6e4be7143490c3ca282c76cb
diff --git a/sci-libs/idlcoyote/idlcoyote-20161220.ebuild b/sci-libs/idlcoyote/idlcoyote-20161220.ebuild
index 20857bb5a31f..f779b30ce0ed 100644
--- a/sci-libs/idlcoyote/idlcoyote-20161220.ebuild
+++ b/sci-libs/idlcoyote/idlcoyote-20161220.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
@@ -12,7 +12,6 @@ else
 	inherit git-r3
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/idl-coyote/coyote.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="GDL library from D. Fannings IDL courses"
diff --git a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
index 20857bb5a31f..f779b30ce0ed 100644
--- a/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
+++ b/sci-libs/idlcoyote/idlcoyote-99999999.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
@@ -12,7 +12,6 @@ else
 	inherit git-r3
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/idl-coyote/coyote.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="GDL library from D. Fannings IDL courses"
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index 9f0778058125..7d279477f7aa 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,3 +1,5 @@
 DIST libecpint-1.0.4.tar.gz 1313698 BLAKE2B 63f7ce2001ae9bdc975af083735f82fd03e133e880061d3c8659bf18d8236d09a7337049977cea6867a4e0e586d4112ccef6a8ee098903869111551364f614fb SHA512 ff38b598351e4499cd2d270a15e8c2dedcb0a6bc6aafcfc7a88ed8053199356e209bdb630713370aacbc3bba2a169050520405f7003feea7b064140d6d5337b6
+DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
 EBUILD libecpint-1.0.4.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
+EBUILD libecpint-1.0.5.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.5.ebuild b/sci-libs/libecpint/libecpint-1.0.5.ebuild
new file mode 100644
index 000000000000..47004ee7019c
--- /dev/null
+++ b/sci-libs/libecpint/libecpint-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
+HOMEPAGE="https://github.com/robashaw/libecpint"
+SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/pugixml"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBECPINT_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 60d7af01eb41..ad707598ac68 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,7 +1,7 @@
 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 2311 BLAKE2B 8d0b691c72bef42dde074f7ad5b020b7b5afd0f6ffe0240f087652934df743054390ec7593f11b10c577a26d436101594d015542947b7703e009f4fd8f08e025 SHA512 48a7eb9ef3125b454509d0911100e72059d49f1a44d5187f1f1aebb5b1d810b2ca86e535cf88ca87a4dabf34f76f1bfd07ff20c6b2ced090617e72eb1c91ed18
-EBUILD libsc-2.2.ebuild 2103 BLAKE2B 4471ed0611a957d6cef11a6ce24fdafafc8ea3660d5c293885c8bc1027f9b604c5e2790495b067048cb16f47cb7dca6fe8a385f148087ef6a88cd124bbe0bfd4 SHA512 7d8c63b652a8eb7efbd7cb94039d2b2df87357670d8140a1f767d229144aac1b8a56ecbed302a1d7f68379fd1b6b90447db10e2be20d1d1cacd52a9db4b57a2f
-EBUILD libsc-9999.ebuild 2321 BLAKE2B f0e3a41dd5d5aca28ef444e8291272e9b15eb5f69e6af3e77b99c8b3ce4efc113606c66002e1e7932980ee80ad5b7ba60d388c9f64a861ea3f5ff693fab46100 SHA512 9fb34025294f64d13097d4c66fd8bec2aaa388401c7cda320c6fd66bc7b37b3c42496b43b6790288ac5249cfb16280c95bd0d45e1eae86af6db7931f55d5d678
+EBUILD libsc-2.2-r100.ebuild 2298 BLAKE2B 7fe4e4c2c9a414c0fb9b9767b51eeeb7eb037829f93a0a29e4f71b8398f31ac10683a2ad478b28409da714fa59ff4e5ad93421c7977053f893b375bea0b16802 SHA512 119f54c96a01ad9798093f7fdced4299acdd11f6b420971234522f4e5a85ed7beced81ff65681cf07451ea8ec888fd599ebc1cdcaa9067cd43cc528826e92d0e
+EBUILD libsc-2.2.ebuild 2090 BLAKE2B 77c5bea45fba7f23d7f390e3f09f118b8fa0eea85b426e51d630ac625e8c78a74f460c6256fead68b3e38751d263ff4631e55cd77326726823623d17d21d4a3f SHA512 d7abc00a430d61cb59b74e32931ac7d736ce2371390e7c64e1e3270f401bb0b92a6202c1522533a1c2bfe82b4675ef1d2fa7a1c2ed5bd77ef2f849aa957d884d
+EBUILD libsc-9999.ebuild 2308 BLAKE2B 42c7dbf970bd4d5528e5861a91234559814559d0cc1f3b9a0fd744f40fb0862f02f30859fe60c70733777d46aca74499b12359df74e2f49aa8d35f9fcb7e2edc SHA512 78b49ae6dece4e83a8482229e05c27f56af54f3e369940691c3625ba5218e9dab63cda2ae4f30a57b0f7221669e849e2924493cfd1d892747b2f6b1903bd1403
 MISC metadata.xml 712 BLAKE2B c1586f49aaa6c7d9a7bb45d1bbfc823efbc80e1032db8d6e4fc53bde10fe6a4d43b6f8e448f33683c6f47897a9ea575272678a50e63308f74b8e60ceb8e9bea2 SHA512 b00a3c5abc40f77724fa766c7b4cc386eec78a81396f6014eab6fb66618c9d11f08687b6f8d73bc24cc3b2deed8e88f44d69b4f7afe31ebbbad9308a99c586c2
diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
index 0f53a1eb30b7..f264a95f9693 100644
--- a/sci-libs/libsc/libsc-2.2-r100.ebuild
+++ b/sci-libs/libsc/libsc-2.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/libsc/libsc-2.2.ebuild b/sci-libs/libsc/libsc-2.2.ebuild
index 9d7d12e95188..8499c7762d61 100644
--- a/sci-libs/libsc/libsc-2.2.ebuild
+++ b/sci-libs/libsc/libsc-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index 4c588fc838b4..c8458c5d9e89 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 50fcc9c43adc..f976d28e9645 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,7 @@
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
-DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
+DIST libxc-5.1.1.tar.gz 43264474 BLAKE2B 887dc11a6385559edc5e2e62f3e00b16ff5695e1c384196bc3efe5aceff0a223d5f69fafaa08290bdf72f95390cb82d43e541ffaf6c4569e850eed3cb63aa5f6 SHA512 467ff09c39df30ccd50447dda5bbfe9e5f3e8f2876e069b6c16d49b3cfcc8b45316640f5b16c56ff7645355be9ec4dc571c794a17accb7731cd22bcce53f8b99
 EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
-EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
-EBUILD libxc-5.1.0.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
+EBUILD libxc-5.1.0.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
+EBUILD libxc-5.1.1.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-3.0.0.ebuild b/sci-libs/libxc/libxc-3.0.0.ebuild
deleted file mode 100644
index a54c26ddfc3a..000000000000
--- a/sci-libs/libxc/libxc-3.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic fortran-2 multilib
-
-MY_P=${P//_/-}
-
-DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="https://octopus-code.org/wiki/Libxc"
-SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="fortran static-libs -test"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "s:${PN}.f90:${PN}.F90:g" \
-		-i src/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_enable fortran) )
-	autotools-utils_src_configure
-}
-
-## Upstream recommends not running the test suite because it requires
-## human expert interpretation to determine whether output is an error or
-## expected under certain circumstances. Nevertheless, experts might want the option.
-# The autotools src_test function modified not to die. Runs emake check in build directory.
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	make check || ewarn "Make check failed. See above for details."
-	einfo "emake check done"
-	popd > /dev/null || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-}
diff --git a/sci-libs/libxc/libxc-5.1.0.ebuild b/sci-libs/libxc/libxc-5.1.0.ebuild
index bade5f34f401..884100437a30 100644
--- a/sci-libs/libxc/libxc-5.1.0.ebuild
+++ b/sci-libs/libxc/libxc-5.1.0.ebuild
@@ -33,6 +33,7 @@ src_configure() {
 
 src_install() {
 	default
+	dodoc ChangeLog.md
 
 	# no static archives
 	find "${ED}" -name '*.la' -type f -delete || die
diff --git a/sci-libs/libxc/libxc-5.1.1.ebuild b/sci-libs/libxc/libxc-5.1.1.ebuild
new file mode 100644
index 000000000000..bade5f34f401
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index b5b7cb018d1e..8fc46cfd531f 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -1,11 +1,7 @@
-AUX metis-4.0.1-autotools.patch 2561 BLAKE2B b7de3a41b69cba384f9763724e56186067fdf59a667c9379624c4603ad63778e7b5c73f1e5124fed7c21e91b2798b56d6fbeac032df779d7cf92135cf964f19e SHA512 7e3a5137105e2d6343de864e4f21fb1716d03124842b547c8b4b7e33d096db60b47f33a7a040baa2ddeb0d9de03a0bbb249a2af054cc2beeb4e0a8e12531892b
 AUX metis-5.1.0-datatype.patch 388 BLAKE2B 038a62dd53d383c9c8f62067bf2f93a13f269f386ec898f2831df34a493379ce2c982d5bb97cad9f9571eab2e1d49d5cc58fa1f608ce6def9125c098913ec8c1 SHA512 0b7b10b0d0c958573668f847c2765435a1d9da22fe063430f75fb6ea005ce687d1eaa06879f3c494ea96b6877c1a94df5aa9e538bf02832af3a765cd7687a843
 AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a04dbdbcb8c3acb62016d8c41b4e68301ab3053fa1fb0fcb2a6bf3b48818175fdbf4b4fe2a23c0b4cb814d512f092 SHA512 5aa179b6de17ac24eb25ddc9377b5adea7b794405ba332de23096daac9231ab5c603268a24ad9219b3a9c598b9cdad33082f31a2cdc957b784d09d92e50f4941
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
-DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e015b77c5523ed60343f5b7cc737c79b2f9420c42d7a60819c23322ad34770d1dcb93f0f1dea461bca3e7c831 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-4.0.3-r1.ebuild 843 BLAKE2B d20fe57aeaecc542db25429495efff913b9c33719d08626686bdaddeac1e54d84cd0cabe2ebb2837b283a823bd54e7f0c513e7863a208199afdd918723db422a SHA512 b61f5b756ac0c31e509c825cb52464ea43e71764cb4431c36aed09a180ee36523c5b00e78cedd532459231674d7456947999f97f0d7433cf01bb61ba4c959dc0
-EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
 EBUILD metis-5.1.0-r4.ebuild 1478 BLAKE2B de2c08a22218ddaca73624764bf9ee1d13598588ecf27e46a59afce16df57b5f5a1836e98d820702c6dc24412ce459dcda8cc65ae72ac73e12176ea988f9d204 SHA512 bd41163f6c7d425125d3a2901eab1a3425d0f476d0268d03d91098d949533a865dbb11729ddb722e47b638ff92416d0cd7bc71219dd44e5804f93660aef08e9a
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/files/metis-4.0.1-autotools.patch b/sci-libs/metis/files/metis-4.0.1-autotools.patch
deleted file mode 100644
index f5d3050a2998..000000000000
--- a/sci-libs/metis/files/metis-4.0.1-autotools.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -0,0 +1,15 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(metis, 4.0.1, karypis@cs.umn.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CONFIG_FILES([
-+	Makefile
-+	metis.pc
-+	Lib/Makefile
-+	Programs/Makefile\
-+	Test/Makefile])
-+AC_OUTPUT
---- a/metis.pc.in
-+++ b/metis.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: METIS
-+Description: Software for partioning unstructured graphes and meshes
-+Version: @VERSION@
-+Libs: -L${libdir} -lmetis
-+Cflags: -I${includedir}/metis
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -0,0 +1,5 @@
-+SUBDIRS = Lib Programs Test
-+EXTRA_DIST = CHANGES VERSION metis.pc.in
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = metis.pc
---- a/Lib/Makefile.am
-+++ b/Lib/Makefile.am
-@@ -0,0 +1,15 @@
-+pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h struct.h
-+pkgincludedir = $(includedir)/metis
-+lib_LTLIBRARIES = libmetis.la
-+libmetis_la_SOURCES = \
-+	coarsen.c fm.c initpart.c match.c ccgraph.c memory.c \
-+	pmetis.c pqueue.c refine.c util.c timing.c debug.c \
-+	bucketsort.c graph.c stat.c kmetis.c kwayrefine.c \
-+	kwayfm.c balance.c ometis.c srefine.c sfm.c separator.c \
-+	mincover.c mmd.c mesh.c meshpart.c frename.c fortran.c \
-+	myqsort.c compress.c parmetis.c estmem.c \
-+	mpmetis.c mcoarsen.c mmatch.c minitpart.c mbalance.c \
-+	mrefine.c mutil.c mfm.c mkmetis.c mkwayrefine.c mkwayfmh.c \
-+	mrefine2.c minitpart2.c mbalance2.c mfm2.c \
-+	kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c
-+libmetis_la_LDFLAGS = -no-undefined -version-info 4:0:0
---- a/Programs/Makefile.am
-+++ b/Programs/Makefile.am
-@@ -0,0 +1,15 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Lib
-+LDADD = $(top_builddir)/Lib/libmetis.la -lm
-+
-+bin_PROGRAMS = pmetis kmetis oemetis onmetis mesh2dual mesh2nodal \
-+	partdmesh partnmesh graphchk
-+
-+pmetis_SOURCES = pmetis.c io.c
-+kmetis_SOURCES = kmetis.c io.c
-+oemetis_SOURCES = oemetis.c io.c smbfactor.c
-+onmetis_SOURCES = onmetis.c io.c smbfactor.c
-+mesh2dual_SOURCES = mesh2dual.c io.c 
-+mesh2nodal_SOURCES = mesh2nodal.c io.c 
-+partdmesh_SOURCES = partdmesh.c io.c 
-+partnmesh_SOURCES = partnmesh.c io.c 
-+graphchk_SOURCES = graphchk.c io.c 
---- a/Test/Makefile.am
-+++ b/Test/Makefile.am
-@@ -0,0 +1,7 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Lib
-+LDADD = $(top_builddir)/Lib/libmetis.la -lm
-+check_PROGRAMS = mtest
-+mtest_SOURCES = mtest.c ../Programs/io.c
-+
-+check-local: $(check_PROGRAMS)
-+	- ./mtest ../Graphs/4elt.graph
diff --git a/sci-libs/metis/metis-4.0.3-r1.ebuild b/sci-libs/metis/metis-4.0.3-r1.ebuild
deleted file mode 100644
index 649d419b4124..000000000000
--- a/sci-libs/metis/metis-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-RESTRICT="mirror bindist"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sci-libs/parmetis"
-
-src_prepare() {
-	epatch -p1 "${FILESDIR}"/${PN}-4.0.1-autotools.patch
-	sed -i -e "s/4.0.1/${PV}/" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc Doc/manual.ps
-}
diff --git a/sci-libs/metis/metis-4.0.3-r2.ebuild b/sci-libs/metis/metis-4.0.3-r2.ebuild
deleted file mode 100644
index ca26fa871dcb..000000000000
--- a/sci-libs/metis/metis-4.0.3-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fortran-2
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-RESTRICT="mirror bindist"
-
-RDEPEND="!sci-libs/parmetis"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.1-autotools.patch )
-
-src_prepare() {
-	default
-	sed -i -e "s/4.0.1/${PV}/" configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	use doc && dodoc Doc/manual.ps
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 96353ee8431d..b118e414a117 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -2,8 +2,10 @@ AUX netcdf-cxx-4.2-config.patch 829 BLAKE2B cd4285ce14647bc1822ac474b3a632fcacfb
 DIST netcdf-cxx-4.2.1.tar.gz 456547 BLAKE2B e973f064ad40c0d0cb76766f3b1639d16ed7eaae73d8e55db011645fc0d4e6f8949a60aeb9d47a4f8e88b3c5b2d486d42442e417908a2194b8b9a5e720ba2ff5 SHA512 d51ab1cbda74db5f7b074799d2407d0214d1c920af780ae3bb7a47b3708e45f721be7eec61902e035968a9df5019a7b2b5a10f236f6bab4cb47a26e4e7867adb
 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 609 BLAKE2B 9e47eb431106ee5e8dd5401bc367b9208785f0588bd3e5fb7ba674a18b806cf212875ab10a5fd6d91971d73a9147ef113894e58cc9d6015e9bf5e509b0ef5de7 SHA512 0d3e37ec51bceb183f0efd2e7922e36922fb7a6c1a07f915efeb9fd967c57b4061ac7801c59ad5eac0a445125b7ac119a6e1977c469d66421d0f41b438e3b202
 EBUILD netcdf-cxx-4.2.1-r1.ebuild 730 BLAKE2B 777504e25979d68ef5e0acaaf1416fd7b336d86511c84cb0f23bfafa5eee1f72711428ee72a27318684446ccd8a388a024c5069615fd20aeb7bdd8e2d992e020 SHA512 03c7b49c8cdc252a2f76a5019cbd2323eed57b1d184bc29c4d2095533d7e4bf82a40484fe16e299bcd54cafcf4dd934433fe51028c792c270f1f07b4eac4415a
 EBUILD netcdf-cxx-4.2.1.ebuild 754 BLAKE2B a8defcffabafa13894b9ae70e3fb8d64a4e5eedec56336f9df961872b1b3bf0fea8dae7254adde67204905b547d8973ce978f7bd03b4152eab8f281ebc998b81 SHA512 cd2bade6d82df307186bb3a0bf5cdaee00798d222e843eb3e71943b3f67839543dccb309df7fec5feab37d32b83ba3186d771cf2aa9952a528962bc671c5b910
 EBUILD netcdf-cxx-4.3.0.ebuild 679 BLAKE2B d414cf3febdf7faca2999c2ff5fc4a9957f3b9d206097e8ebd690597839707820245e2d844d4ff6d127cbce3bce243bb998a4b3db3428f0df1aadf8913ef48da SHA512 a7f23db13baf8222812948a976404e956027c0aa23be49eeb40a018df6ac8f744e3afa130fb0a6dec7ffcaf0e5ad46f72d66a72bd3af6f813c683bb2a0695145
+EBUILD netcdf-cxx-4.3.1.ebuild 700 BLAKE2B 754efa5707393af0aa7063aa679d2902b1b4a4e075cb04eb0a1bc95098bc531a058651d0dfa37ddaec2e1b79ceb6e71d4530037953620bc100c62dc2d958c5d3 SHA512 228ea6396dc0c677b908f6acae8bab342af442cc464d6b1da97a72fda9fcf7fe7281a3b88cb1192f7ec8661c8a0d8f3a05a1d31db52eff887663d6e9176610d2
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
new file mode 100644
index 000000000000..7e359955fe34
--- /dev/null
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+# 6 out of 9 fail, reported upstream
+RESTRICT="test"
+
+RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index 4f857c586bbf..257a0faa1687 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 770 BLAKE2B 9cbdb12d3c41970809f965ac1f9947dee50503df271d2886d2d54d5aa877be89afa0bb3ba4508f1f7ff7f1473b0b123cbe9885ca89de45b36c3c0725c151a9be SHA512 cb7d64a3f506732c734b727e40d53299318bf8f3fb05f981a413aaeadc1d36376ef8c7c450901e84cf3442ff1f41b81f32e38ededc3f1967337696a51e625183
+EBUILD numkit-1.1.2.ebuild 757 BLAKE2B d438941e1f1545ebd13cd433e3ebbe06949778af3d4b7c98a1302dcdd5fa66ff202d4796762cc8611eb49fca8405b7d3874b5f6f0c368050a377ffa34657b489 SHA512 8451084ca7e04af6c7b2cf2533b6f66cb1ebddcc13aea1ab3c98225ec240d8ee0e3f0e4dc76d753acf7a66a19cb0e5645e87a876db84b0c31f1c503219169b53
 MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
index de754215c611..54e7b6e882bf 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,6 @@ if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	scm_eclass=vcs-snapshot
 	SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 6577db37ff0d..4f47a1c68f0f 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,5 +1,5 @@
 AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
 DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
 EBUILD octomap-1.9.5.ebuild 1689 BLAKE2B 169c1a5e542e61cf5a3c9dc0774cac2afd4dab5052d49058da0c6c8bc70be0a5a4d0165a2dc74d798b71d4eec60288cf884cb4df8e0585a973f335297e246d4f SHA512 9c6ed3429728027d951c4298aba8f6762a35efeba50575ab4dff6c5c49e752842f84ec71f66d1febbd506531c1f4ec96abe74bc17c58dad7f4066ea61b8f68e0
-EBUILD octomap-9999.ebuild 1975 BLAKE2B 63b34fd1c61e447e16c9e4b988e5b564d421cea9f15fad3a5e8579222c0f7f174e6c84167d7960c1e6e7d660aaa645ce88d92eba0ceb33c5254db3ef6bea7793 SHA512 018a25e757235bb8509c2e502bd87b286d484037aa4738e06014051675da58a24562580fc284276f18cbe2492779fa4214dd361aed49dbfa8170df6e81ea9f8d
+EBUILD octomap-9999.ebuild 1959 BLAKE2B 4011f9870ad688b0d2d9f055fc612a3a2d8f344dd0cd460dc92cc4863c32e6a47da5cbec65d1b3229ba25065cd9c08846374ae89f49626a1891567b6028727ae SHA512 ab10778e2187536b615267407e8b9acc59c96c785504ac2a4ab5f4cbb885456589eb1fc58dbc4d88fa2fbb1dab06f9365e30fab5a8da6a4146a718e50ba1f902
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index f5c2b0c615ac..c53f4e28eafc 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index 301707007fbd..351b79acb097 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,6 +1,3 @@
-AUX openlibm-0.7.2-make_inc.patch 1593 BLAKE2B 192e3c50401fe9c6a063c3cd80f8a13c9d4c1adc01d6ae4e6175787e1facf79e53d8d576cf7739690b737bfc7e6ede9e73deb60dc448c3d86d7dbf9e8c27c1c8 SHA512 f9529ab9439cf1010b8ec417476a1267a1317b7334271ac83bbaee3895a4ac577851de2a84c2778d9128b0d9d48c5867836f7a4f205da98af6b131fe78210fd4
-DIST openlibm-0.7.3.tar.gz 366268 BLAKE2B 31cb50e64a3211770b1b91550382a2d4844af020a3e71dd2a7268f8faf3b3b4b54feedf4de19f27b7b74efa05961999d2b76416b1b615a554dc794cac782306f SHA512 433ec9ed5c0364b58fe1eff8760b64ad4203c7711fef02ed12d0070a34442b10c806fe6bccd81eadaa7758af2dd116c76bb769480c56e3320d548aff29d249a7
 DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
-EBUILD openlibm-0.7.3.ebuild 874 BLAKE2B f608bd9a7f4c3731803815f20d3aaddb13b7512f0c0da4ae2b3c8475c1001e554bfb7d99d3ff77912ae57a2bd1ba949901a86d1cb41e58f1b33c54fae6af99bb SHA512 1772b4af73f9e8b8cfeff2dcaac07418267604948ddb050352fd76fea7255c89c7f341d8eadf25efd664c9d0bbc1a52b3103465dd118df9634c2608617b8c1df
 EBUILD openlibm-0.7.4.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch b/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch
deleted file mode 100644
index dc42a98c68d5..000000000000
--- a/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index adeb33d..36520f0 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -10,41 +10,41 @@ VERSION = 0.7.0
- SOMAJOR = 3
- SOMINOR = 0
- DESTDIR =
--prefix = /usr/local
--bindir = $(prefix)/bin
--libdir = $(prefix)/lib
--includedir = $(prefix)/include
-+prefix ?= /usr/local
-+bindir ?= $(prefix)/bin
-+libdir ?= $(prefix)/lib
-+includedir ?= $(prefix)/include
- 
- ifeq ($(OS), FreeBSD)
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir ?= $(prefix)/libdata/pkgconfig
- else
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir ?= $(libdir)/pkgconfig
- endif
- 
--USEGCC = 1
--USECLANG = 0
-+USEGCC ?= 1
-+USECLANG ?= 0
- 
- ifneq (,$(findstring $(OS),Darwin FreeBSD OpenBSD))
--USEGCC = 0
--USECLANG = 1
-+USEGCC ?= 0
-+USECLANG ?= 1
- endif
- 
- AR = $(TOOLPREFIX)ar
- 
- ifeq ($(ARCH),wasm32)
--CC = clang-8
--USEGCC = 0
-+CC ?= clang-8
-+USEGCC ?= 0
- CFLAGS_add += -fno-builtin -fno-strict-aliasing
- endif
- 
- ifeq ($(USECLANG),1)
--USEGCC = 0
--CC = clang
-+USEGCC ?= 0
-+CC ?= clang
- CFLAGS_add += -fno-builtin -fno-strict-aliasing
- endif
- 
- ifeq ($(USEGCC),1)
--CC = $(TOOLPREFIX)gcc
-+CC ?= $(TOOLPREFIX)gcc
- CFLAGS_add += -fno-gnu89-inline -fno-builtin
- endif
- 
-@@ -84,9 +84,6 @@ override ARCH := mips
- endif
- 
- # If CFLAGS does not contain a -O optimization flag, default to -O3
--ifeq ($(findstring -O,$(CFLAGS)),)
--CFLAGS_add += -O3
--endif
- 
- ifneq (,$(findstring MINGW,$(OS)))
- override OS=WINNT
-@@ -111,9 +111,6 @@ shlibdir = $(libdir)
- endif
- 
- # Add `-march` to our CFLAGS if it's defined
--ifneq ($(MARCH),)
--CFLAGS_arch += -march=$(MARCH)
--endif
- 
- ifeq ($(ARCH),i387)
- CFLAGS_arch  += -m32
diff --git a/sci-libs/openlibm/openlibm-0.7.3.ebuild b/sci-libs/openlibm/openlibm-0.7.3.ebuild
deleted file mode 100644
index baa2bdfd1729..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-make_inc.patch )
-
-src_prepare() {
-	default
-	sed -e "/^OLM_LIBS :=/s/^/#/" \
-		-e "/install: /s/install-static//" \
-	-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 31b24fbce97b..5776daa93832 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.4.0.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
-EBUILD orocos_kdl-9999.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
+EBUILD orocos_kdl-1.4.0.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
+EBUILD orocos_kdl-9999.ebuild 1636 BLAKE2B 34cf739206371c11710773f620f3f6b3dbacb8610322280e3cc3f5821cbd11ce5f534e83bbd658f99959be9ed11183e19c62e69fa053e01e0ce8e4f3b1a652be SHA512 68ea5df624f63c3e418ec924023a383a377165ba229de61bf28e9ee5980ff1fecf4f0e3ecad8659d26cb48c446072573ece4816f83e73e0a4fed525a4505095d
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
index 80637a8fa224..da34c1969851 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.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=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index 80637a8fa224..da34c1969851 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 2767573d5fbe..cd216ad42be5 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,6 +1,6 @@
 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 2928 BLAKE2B f895c1e2642760a1faa207519453f84e0ee763673162ccef3da9fb83542de68b66f74faff67e76be559a845b988f805d47225e7adf02946507630cca6761f86b SHA512 d9e7026c87372449a4b5499021eeb340a1a7d3f45b4b29f799f749d25ac753b52fbd94e89463a0a06995827a28c3e4d72763451ba8f9136edc0c0bb87cc9aae2
-EBUILD p4est-2.2.ebuild 2853 BLAKE2B a1bf41e6371e1445bd53292b9b804cfdee21241508959c95eeecbc0c002b8f3122e54499fde49c0bfd089d478fc13f6d4f05ae2e0893032e22a6d3cea1b7f8a7 SHA512 7047a4f5cb50d17e0189366f9f25c67664ba5d043ca7626ab3b96617a73b375f442150a2acaef665b6070f5e4bd537178470e425979b8f12f5ae389b10464529
-EBUILD p4est-9999.ebuild 2928 BLAKE2B 8b275b896e9ec3b2913660ea92cbf1573c5ede82ccd18bbc51b2d550f278566edaef69d07142531611ed527a0e0661fb03cc0ef919be33b5a2c683ccc520e796 SHA512 888bc5d6b2242207431072d4d4736f1676649e4140acc47b6511f430567a850103c7e482588eadc39b3d799dc7e06474169b6354761ff990182ce5ad9a283a10
+EBUILD p4est-2.2-r100.ebuild 2915 BLAKE2B 6e0ee7cf6d138405fd861e1e79f826b8c99687b27ec57038453c5c94c1828a638c879c08cdf2640d881e76c3f261b3d4f8104d71bf63e537f196deb1fe463310 SHA512 2b1dcfbc8e9d44d129bc84ac10a4c7df977cb358e9f61a82a73c194ab72fe00c199a124da259776c70cacb19565653fd3f7be6c71c5cf96f66ada9024444a4fa
+EBUILD p4est-2.2.ebuild 2840 BLAKE2B db998099af9ee8abce0db818860c1053bcaa29dbff49b41d1012ec1dbb346d0f55661476b9a79281042e653d65c47e3dd692cabdcd40bd2d13ffe380de3b638c SHA512 91b5ca7fac23bc37e0a88ee93988d056aa6b7b48d735ab97e7b8c254d03d3d7cd77e05fe1ad9c4063492162cbec07119480d40d69103ea9f9ae66278064dd558
+EBUILD p4est-9999.ebuild 2915 BLAKE2B 2ac4c1cfb81d43042c356a94633109f3b3dd0429985b896e60c92dcc945b4a68469a604cdf94900209aff4e38f26f99b5121c369dcca8c075503890284b570e1 SHA512 e7e16243bcbc9eb850509a64ddf9b40782e5403ecf41506fa4353e48263eef5edcd6839038f44b9dd4781f1053f6776b7996cd90253b175a09a2cdb853de0924
 MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
index cde320a2e5c6..3c69c63e2ed0 100644
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ b/sci-libs/p4est/p4est-2.2-r100.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
@@ -18,7 +18,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="
 		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
index aea8ebca895b..ea4cbc69d918 100644
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="
 		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index cf8dea879cea..5837f982d5f6 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="
 		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index df568aed37e2..3590fca0c382 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,4 @@
 DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2
-EBUILD pcl-1.11.1.ebuild 2176 BLAKE2B 79157497c851103fb450aece2b4fa035da039b49af7b62ade76167e3b9ad381320f41cad6fe0180bc7bf01aeb7680bac3e380bc5e25ce73a25fb1fbaf2bc9c4f SHA512 d4cba0dd1cf25beb2ff96caf4d3b82378437bf490ef3c7a388ac94c81a6a8fc7dd501b776737b086464b0f5e44ccdc25fe4c4b10405aeaeebe0cff82c2a771e6
-EBUILD pcl-9999.ebuild 2176 BLAKE2B 79157497c851103fb450aece2b4fa035da039b49af7b62ade76167e3b9ad381320f41cad6fe0180bc7bf01aeb7680bac3e380bc5e25ce73a25fb1fbaf2bc9c4f SHA512 d4cba0dd1cf25beb2ff96caf4d3b82378437bf490ef3c7a388ac94c81a6a8fc7dd501b776737b086464b0f5e44ccdc25fe4c4b10405aeaeebe0cff82c2a771e6
+EBUILD pcl-1.11.1.ebuild 2163 BLAKE2B 0acb48d90bf5077f9ca76dc94fcccf1d56eecfafeb02dfcd263e03ed73341ca4abcd0b90b618fb2cedd9adfbe221b0f290c5dd55141c672b9b32fa4fc7237b2f SHA512 64e7c9d1075a3479d85f625843b92cf8ee2e3ce953f4cbf62c1b72a9952b879d91ee88ede3324740511d5cb4c7d2cc7a984a8d11200de1944ea224ab353c84fa
+EBUILD pcl-9999.ebuild 2163 BLAKE2B 0acb48d90bf5077f9ca76dc94fcccf1d56eecfafeb02dfcd263e03ed73341ca4abcd0b90b618fb2cedd9adfbe221b0f290c5dd55141c672b9b32fa4fc7237b2f SHA512 64e7c9d1075a3479d85f625843b92cf8ee2e3ce953f4cbf62c1b72a9952b879d91ee88ede3324740511d5cb4c7d2cc7a984a8d11200de1944ea224ab353c84fa
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.11.1.ebuild b/sci-libs/pcl/pcl-1.11.1.ebuild
index 4d7299fc43e6..b11de25206cb 100644
--- a/sci-libs/pcl/pcl-1.11.1.ebuild
+++ b/sci-libs/pcl/pcl-1.11.1.ebuild
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils multilib
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 4d7299fc43e6..b11de25206cb 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils multilib
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 74ee1574b6cd..d6ca2eaf358d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -7,5 +7,5 @@ AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee393
 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-r1.ebuild 7251 BLAKE2B 466a30c45f93c2824ce782c41184ad6667d6944be5ef0eca19b9d6d7d71b3d1de68cfe1c0ea06baffd4ed9bceeb700b40586c116e82b6b17835095cbbcef64bd SHA512 35cd4cab3ecf0cf8a35848110b3e54750692eda9b27937951f6781aeca32e59a45048d67abc47741e71a0004220e43c37516dcd0f040339ed382d8cbcdbac215
-EBUILD plplot-5.15.0-r100.ebuild 7409 BLAKE2B d910cdbedb2ad29ad422f75d635f8f274c18a90c44238a9830ab1e131f09a1104c1a9212023c7dda4a18b1483689c3c1bfc7f5998bdf69b5df2112e4e8ec20f4 SHA512 8a9bb1791bbd37b8bf9eb07684aa8189b0d1d75a45e42cac23b24159da92278704195edea7199f69ae269d2d24fc0d229db131b18dcef4939a4e3e103a9d89d8
+EBUILD plplot-5.15.0-r100.ebuild 7402 BLAKE2B fd9b5db1e3c87ef4ec0695262c19173285922f15a9b76620f458457e788a7334fec088a8d6fceb2a41d8f573317344b321dee3e6d0e97b8d429d10444d6b6035 SHA512 c06d0f15302fac5cd36b32bcd194774651f6a806765cadf06437063c31d22754fef9fb0502f23b93b880af8774b03584a62b175de5d2a5d2a86b3dda394f24d6
 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-r100.ebuild
index 18d022329b67..ae2654d31d8c 100644
--- a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r100.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
@@ -122,7 +122,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
+	use wxwidgets && setup-wxwidgets
 	cmake_src_prepare
 
 	# avoid installing license
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 4337464fd7df..825a280982e1 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -5,5 +5,5 @@ DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.0.1.ebuild 1208 BLAKE2B 9512e12fc93cbd4e17be6c8e3f222e7e1a62f5b73d7e1233bc7701c429f9d5877837a6eba03587a4e8bea26eaa921a4dd4686adf0412200e932de14b90878364 SHA512 9e6b0a2343b2cce7b0cb00063380f0df9012b746c56d9a7cf12b3c0f1d23bd53e0e3071c0e0b01b21d6a816de54ad52afb391a31ac2a1e83d02445c674d17bf8
 EBUILD proj-7.1.1.ebuild 1213 BLAKE2B 96a64b1e5f39515d4caa5c7cbc46c01297b0220b6f85aa5dee6f52f4a69505fd3495d9a01aadb97f661a6d51709df523709dde99c1d12ecaed27abc8c91a06d8 SHA512 861d267b0f82d55223b569b1655af44c65d687d5f8a9c86e519f4bcbce17f6c9c7dab35a3ab9b51a7cb7b3690df1d001b9ec3dec4768301d44a6231540978cc9
-EBUILD proj-7.2.1.ebuild 1211 BLAKE2B 8d6fd5802176f926864bf84087072b5d2e92ffe8337a88304b5a887a7d1fa1460ae0e567b40225a48ecfcaae121e3dd94bbcfed17cb75c7db76a79ddbdaa6415 SHA512 e794abf73b0902713527219ae809862fae7c351e8ecc44f543f4793870ac3d2c746c2956e5c6499998f51f608db7ecd4b868b21491fcdb77909a106879d54d50
+EBUILD proj-7.2.1.ebuild 1209 BLAKE2B ac70d263aab2b700dcfc7f8564b81607a31c3387ed6f39770fb7583c063428680a8ef5d0dcba6e786fbce847d2791bb8285b983f662a161b171a6755b2e72a16 SHA512 ce8e0b02dad6ce6de1620328fd6e65c478eafcc81dd55b3551a4452425840d4226fa43c02f7310a3ed9779ddf1d14e00f83a35a459869dcb18eae45c29cffa94
 MISC metadata.xml 374 BLAKE2B d6d3066273af3324fb5ebf6b0d3b0f49c4e78a88c7cbd7689e9d9ec6841033a03bb5f219c62be88320b2fee6c712079e54a5368125d7a33b301ae1263aec98e9 SHA512 34124c295beb66129e72963474508d26f1482919447bde9ed3af89f2123dffcf98037760aab2b589cc0a5dad23183fa0c28ecc3c4322a1ddfb926fb4ba52c8ad
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
index 0bd4b366cae3..6bfd83430fca 100644
--- a/sci-libs/proj/proj-7.2.1.ebuild
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 1e7d482f8f16..338a5d4c5f60 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,5 +1,5 @@
 AUX pcl.patch 1093 BLAKE2B 16faab539f13f54db1518babe02d208b438d984fd462098ac4c1babc9b6f509e14b307c58f59e66a177e66bdaadd8ccc3e509aac9da4c207104f0a967e790843 SHA512 5a5b97f9c028adff316ad50cf4e002b54d8603f3394d631330109c986b7184aaae6cba08e2bbcc1c21f9b97f77fbabe2fab344fa1119b47a1c24a774ed637bd6
 DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7
-EBUILD rtabmap-0.20.3.ebuild 1475 BLAKE2B 285587eaefbd1fb7f90cb4b91c5c52d883467f659247427722048ec098974ebdf1cb2ce70ad25a4ca652a1e785336c8425fb9fe6f65cdaf650785092e9ae0a32 SHA512 369371740d24305e9466381bda18f7c7f65325cf0a01050c42fcd43e02b78ca326824db45120181d10ca0fb143353a0d98d22c56fc4e8eca729cd85e64d5c3d8
-EBUILD rtabmap-9999.ebuild 1439 BLAKE2B 9f889c2cceffd44463e20627ad414dc1b6d2b4b7d3fc1776cc9e7fdb8d6020aea63fcd6735778218973a12c7e0bbe130b0e9f7aefc0c9e86954d5aca205fbb3f SHA512 e7a0d3cda93b7df313beb6027d8e3daec01e54fe97344d5ae1f282d7e4760467634b345c8f7f09be586411692d51b342cc3de248b232d574fa78594b6d31ea88
+EBUILD rtabmap-0.20.3.ebuild 1462 BLAKE2B c01fe814a8d4c300705bbf4116633d5e9670274cfcadda21ef38139111e35a0d37fb147800dabe36ab48bcfb1796f1ea35fad285661e4a53745c961f7dc9cb2e SHA512 aa238a9379b985357223cd9356d6effb5344a4f5c627d747207e2bca0e2cb8127a35ad5a63852cabd5b52a7461fcc41279f6416b4b03ca762968f0e1408bae38
+EBUILD rtabmap-9999.ebuild 1426 BLAKE2B 8f75d91b8b718f4aa724b9e3b3b2abd38e84760606818eb4d1d1f26958aadd7f907e0b43cad24a0f3e132e83d19efcce15960d8f9b8235d4c08976ebb0496973 SHA512 291b0a6427444d18a36aa883e83c4a42696080caea646b8e44f2236a1f74c9ec361cf5022e346c11fa621185b672c6fbfc76de5022da1908b8ef95757267feb6
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
index 1fd30dc27ec8..38dc4acd24e8 100644
--- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils multilib
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 5519717519d9..d05ebf85b047 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake-utils multilib
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index fd3d6c750a66..d192bec64b46 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,8 +1,6 @@
 AUX udunits-2.1.15-autotools.patch 1850 BLAKE2B dc1e48bff93de3764f488bd276b46fe7061399468c621ffb249d50218bceefb52d6e3d59284544173d9b4e340fa2d0d13c2fb04a850ad2bb8faf8f51df622f99 SHA512 bd4371d0ac9c54d2d4e8a3a0e908b38350bcb729c364de6da93da2fa580abd0f7e48cb3b902a67a9ab84fcff043dad554529cbfb5b26f48eb1f8ba87c43236db
 DIST udunits-2.1.24.tar.gz 1059344 BLAKE2B a28f13e886d4db875078ffee7577f4e17712987b0d87df586e037c1f9a0986ad206ea8bf648920269890d458a6b65250c896f4ea9ec2e8e7bfbe6e1692967530 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e
-DIST udunits-2.2.20.tar.gz 1002380 BLAKE2B 63bc2756b32aa620f390fa2b033192e8a519b4834d83ca93315ef94ec926814e01906476d7aa1dc8553505ca1a787e71ed358bccefd3c55f6141aa27247682a7 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
 EBUILD udunits-2.1.24-r1.ebuild 982 BLAKE2B 5a66df0b348ed6fa1710ea9e0bcdbf86c417823069bc43c69c5770fdc9ec1eb2bac633e6b745f8a8e191ef5e1ed6acf9ca533ce8fc66610a693a50803b8255a7 SHA512 f010b9473546525158f03e4c01be1cee97cb975efd61e6c062e6bc637ded915ebe02e99c1c1d647b84102b52ee9e27188b976d74e64ad22a444a18c428335d79
-EBUILD udunits-2.2.20.ebuild 763 BLAKE2B 9d4e7a2b95eff615a11f95dcf4bf7634a7246b77c6ba210aab444d1ddee3e53369d4cdfb3af30383d2e7369362567aa1fddf6b4bf1502e77ec71290b0334f803 SHA512 0c5936d30b028be8f4f7e19b6c06000447e90df7f0e3e72c48c61e2c80bb5c49b74e2c8e4a85738ed4c6f3798d86a30ffe3aaf4b02fef9b2f0bd271d6eec800d
-EBUILD udunits-2.2.28.ebuild 610 BLAKE2B 67524600752caf186cfffb5189ef2c13002bba75ccad23f11fadef9a0ecf348a69b410dc6902d4296039ca29fb8491a76725656746dd8b1bc6d481666826bc0e SHA512 b01453a31fdd2cfe4dbfb9d4bb9354e5237ee1e64d314cf0a4270b326eee4a4d8373d0241f62835da669b0ef29e20dbabb27b47000bfb82c42e8cacf41e51b1f
+EBUILD udunits-2.2.28.ebuild 762 BLAKE2B 2a61a82a852129dd67f777c4472737011081cc647313b9113155ea0adc888b348e4b53393e44499e4c19aeeb9fadd5f6675f9828a6575209156d3b2f93e742c3 SHA512 8ecab523a21dcc8dec7da6fa7d872b7d3d07d1bbfb24ef60cdb53759ca0f38dbdc9a760254af7421716a1d31a10316793ffa87b8460cd401676c9eecc0a7601e
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/udunits-2.2.20.ebuild b/sci-libs/udunits/udunits-2.2.20.ebuild
deleted file mode 100644
index dc56fc673720..000000000000
--- a/sci-libs/udunits/udunits-2.2.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fortran-2
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-BSD"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	doinfo udunits2.info prog/udunits2prog.info
-	dodoc CHANGE_LOG ANNOUNCEMENT
-	dodoc udunits2.pdf prog/udunits2prog.pdf
-	docinto html
-	dodoc udunits2.html prog/udunits2prog.html
-}
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index 43ae140b3454..9db08c0372bf 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -23,6 +23,11 @@ src_configure() {
 src_install() {
 	default
 
+	local i
+	for i in udunits2 udunits2-{accepted,base,common,derived,prefixes}; do
+		dosym ../../udunits/"${i}".xml usr/share/doc/${PF}/"${i}".xml
+	done
+
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 3b1a789f808d..61d38c558b4a 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -9,15 +9,15 @@ DIST votca-tools-1.6.3.tar.gz 109937 BLAKE2B 4cc6a0f061c3455ff326eada36c5b66e31a
 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-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
-EBUILD votca-tools-1.4.1.ebuild 1197 BLAKE2B 70156b894020cf325d33b71ba81f01ca2bcbbf60a37559eb062d12dd936d05302f409f4952181af2d430f78a5aed689d8b8a6e086cdbcbe8e12c6fd8a2bf3d0c SHA512 e00738cea3d711414788605c111ecbf2bbeaeaedd2be785f5b560b9261095166986e1f9ffaf13c85f98c9e93db1b48099d873fba02b68450e90fd9df283d0033
-EBUILD votca-tools-1.4.ebuild 1168 BLAKE2B 2e0df9a069eeefca65036b00a72eece6d3a11be329ce7446a73c9a4b8dc688f949f2ade3d0e27899c653ecea07041df1526a626c107f462a815e0877a6fb4d39 SHA512 e5d3b7e9ef9d4069b246caeffd871375a714230b380a6532ef6512ae80453a8e9e17fb0b58ce14e1e73632226c33b40568b76cc39cf945a401df7d1fe131356c
-EBUILD votca-tools-1.5.1.ebuild 1113 BLAKE2B cf3fa39e10fba3e12e5198172a2aa270a92820df9cb4e4d20033c5aa797cbce59956276e4565082fde9580753f8533fc72cdf73eff2ec6807300dc948c409586 SHA512 981b203f0a130ec03c2ccbc02e547f33c0db7795e9f768b5b741436eaac29c8a14eec6aab01f5573fc088fe5d006040d90e580ef090d229e9dce449b3e3df223
-EBUILD votca-tools-1.5.ebuild 1111 BLAKE2B 7d7a5ffeaf4e422a0470849899f539dd525762b68074c4a2886879e451a5464f53599af1546905a0866d78752bf7286df13d1ed863b6cfbd7c9a6bce784113e0 SHA512 b1b4e1c1646973fb300792809198006ce0b574a13f511594b4710eeb84dc3d8a43b5e8d00ccd4dd6d9c76e7e7ace772aa86fe0a4579a322ddca6da51464a39a1
-EBUILD votca-tools-1.6.1.ebuild 817 BLAKE2B 886d69847684d81e7911f164f64d5f211f076ead9346ecb8d9246fd14c2258164b450c23e8f7ccc65ad81e050213fab954e7abf1f98eae515da66fc79eb6e2df SHA512 a6cd383d0c5daf4fcece67e19daf5af8887bc95651fd3e81c57435102bd6ee169c36c91e0eb15c5a8229f889ee647f7204c839afab9ae0ffef14d10bbc82950e
-EBUILD votca-tools-1.6.2.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
-EBUILD votca-tools-1.6.3.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
-EBUILD votca-tools-1.6.4.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
-EBUILD votca-tools-1.6.ebuild 813 BLAKE2B ba3aff5691b6f18973e90a3e82b514025270d7f36b4923fb7a9a03f179865be5fcd9d8eb8527072d7610933812376fc74826160245ac19d9200d2e5d907a6e43 SHA512 09980284f2408c9f356ad5ba84ccfa1a89c9199bc01f90b028de1f426acd14f0085493b21ef3eccd9eb74f3bf678501cbf4d681f2da08a5b5be42d427ab6b129
-EBUILD votca-tools-1.6_rc1.ebuild 843 BLAKE2B 4976b22179417bb91f1017914ca0ca15c67622e2f312106ef18c8cf14670e271a18f01e73387906d4ae6cfdcc7247080ecbb4a0ac785c0c137c77d0254f40f83 SHA512 7ebf2cc13b9773d32baf4dd09562ead1a82aa0772c2cf666e54d9dfc135da10d2e2a328d8b94740ff04c86753f8927c64407dccaecd0a3c38d9751631950e018
-EBUILD votca-tools-9999.ebuild 794 BLAKE2B c8529cd9bdddbe568af6591be7b4f93329c66ca1ab425b93c5be0caa3edc2125463f6d92e0a495383f463c0e94921a7e72f17676a42638e57b002681664be47d SHA512 85f80d3fc81b36b5f77af3ffc0128312cce62791f6edeb717a62ad09109948e2ee990ce13461c453f800c89e42bb7e367cbbcaa3cf7a94fa937502bc4bfffd42
+EBUILD votca-tools-1.4.1.ebuild 1173 BLAKE2B 452b971cfbdf9d9dbb92588582a8a7d459d450f2a97c9b6fc6d7a17995d3c753bc994a3c5bf69253e3957ad1921c3633a4ba1559bb1374f26dec03506ebfb0b6 SHA512 f2b9da544fb94e9d070d446fd51a7c82f6a600863c4f95b7e188c05aa32c6b2318c7bff5d5c515a6db635014cbd6285f560a5e8f59ee74c3f8a3cbe56a4a958d
+EBUILD votca-tools-1.4.ebuild 1146 BLAKE2B d79c8ac1f7d87cb0bebb695ea8203d10d9b31149106d0e662756e5418efb2fb10039576b2336897278602723d75c30d3fc1c701544777f08df08493929396f53 SHA512 cf2b14e11099541a0caf293def4b85140db624e1c42d1059fef0aad0f1ef4b8507a982df723820ea5f2a97bd461cbc3a21e03e69e179383e7e995159358a89ae
+EBUILD votca-tools-1.5.1.ebuild 1094 BLAKE2B cc03fda70f27211323b8b0c2d33020dcd4aedb972316d2a1ee6a04a29b414fd44f935ac31fcfd014b4de77e6f0b29136caeaca061ebdbbd3144080b01f723680 SHA512 fee06ff16f050880612fa4aa981dd56b85c437eaf4204f39489a2c19bc8dbb555fed94f2a39732083ac487923db391fccbccb4d3954ee33c822b9cfb5efd1db8
+EBUILD votca-tools-1.5.ebuild 1093 BLAKE2B 660f6d829bcd4dfb2452aa14d2b6c0e83a8040c521c384da7fee212b81c302c1e4fe0501055c35258ec472d4ab471a188122511bdaef74bbdd2953a98135f7e8 SHA512 5bb2f35360e2cf95eee2d459b4d63209c6f717ea5b1bed43840588cef9224df54d3b08d09bdf844c47e5f47f6e7d11551cc73d153c50ba1481c4e8d2505e8ed1
+EBUILD votca-tools-1.6.1.ebuild 793 BLAKE2B 02619b72e9e90ee754d3d9bf555eccd03c2368ef8310da9e4af7d9696b06c31cd78dbe60135896ff6deddc3764105f928e3fa317e2c37df92a430d8c9bea5629 SHA512 79eaa407e2ad83084996614c012ad36c22a6724a7c290512a754190a4ea03951794cc9a4f021f7159bf81030b29aa47fa4032278ee69b7d5a05fab2eec23b8e0
+EBUILD votca-tools-1.6.2.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
+EBUILD votca-tools-1.6.3.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
+EBUILD votca-tools-1.6.4.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
+EBUILD votca-tools-1.6.ebuild 791 BLAKE2B 230efde0d632b6eb4d92bcac6211903fe659fb5fc1bb7e36a44c708cfde6d0b06992b17574ab80ab8a32f46637550277e42856c565f9382ece2c479d0db7a238 SHA512 8df3be66989c8cee86badd3e3b67ef80b11748c92a46cef11b9eb8a34a569ac9a33b3cf643bb4cbcf67b4b39f1875caa7cc2858a27e7541dac6e179e96b55a53
+EBUILD votca-tools-1.6_rc1.ebuild 830 BLAKE2B 25b8879a63f19110b30bf48f53a1726c6a27e1f09f53b58d3f2892e5d4dbab787497f0141f62041fd7aa35b78b9955ed94d438623e937015952b284be5725f39 SHA512 f27a45391cd9001c9325182bb680cd09e15058393d3759f51643fa4fa030dbb4bbbaf346ac37436aa7fb74025b0dbebf649df6fdb344869994fbbc4472948c3f
+EBUILD votca-tools-9999.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
index 9a65a2be36b0..087be457b5c6 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
@@ -9,12 +9,11 @@ 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-}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.4.ebuild b/sci-libs/votca-tools/votca-tools-1.4.ebuild
index 99c2d85be25c..eedb6ccd9dec 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Votca tools library"
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 f8cf6211bda7..3eeaa6f0da47 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.5.ebuild b/sci-libs/votca-tools/votca-tools-1.5.ebuild
index b6739abf4f05..4701fe391d39 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
index 96df685f451f..bc03e7abcd6a 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
index a636260d8800..ba77bc97616b 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
index a636260d8800..ba77bc97616b 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
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 a636260d8800..ba77bc97616b 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index 701fb516d9bf..dde9b50444e6 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
index cb4447833be8..eee887d01e48 100644
--- a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index a636260d8800..ba77bc97616b 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -14,7 +14,6 @@ if [ "${PV}" != "9999" ]; then
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-libs
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)