gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /sci-libs
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
63 files changed, 441 insertions, 200 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7f85d66655f6..d9ab1fab5e1e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 4bf2c1a60e63..fc97d5f4475b 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,7 +1,5 @@
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
-DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
 DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2
-EBUILD ViSP-3.2.0-r2.ebuild 2881 BLAKE2B 2706c612162b35e58f66c1e00cd343c1fb528be29b196cc9a0477462294a5447bc8ae512f5776bd438b237057beda14bcdc244a2f14fefb54b268dc5724cf04a SHA512 c192fafa044c0910a1f338422acf8fa0cd1c8433c4899085503118621e617a014e206f57f01125e82ade34b95b7133e22c554de76b2cbcc9dfa621d242bacb2d
-EBUILD ViSP-3.3.0.ebuild 2876 BLAKE2B 6b9fc1ae7a19ca7f8b656f983b0e32eb05511d467c896243caac1fb8360ed0b78c1f3d24b679e4e7a64fc9e8d7061eeb2c32d4c7c71ed19ba9f5933d68f18b98 SHA512 b69177ce259c6bab5ffd1e3433347f25d7eef866e77627a357e33e08cf9b20c0043947fe022e11e2166468934353f2eb58b6365d101a2be2ad416dfbf9f030a8
+EBUILD ViSP-3.3.0.ebuild 2893 BLAKE2B 3cf9f8d816e203500378b19a6236e9146ea34168ddbb11ab2991b7ffa9c54d17081759fa7531da3c70dfefd2ea425dfad741a367c90079968ce5309fdabc7e2c SHA512 77512224d4baeea9199f5fe3d4414b9069e3e51247a5104dfef57c25331c3958cf542edaf1e8b6ed0694994c04e1c1c695599d7b0157c4a4f8253683f011bad5
 MISC metadata.xml 1383 BLAKE2B 0bc8f34d0babc7ca62c664babe0422443b0819e9c63bc850705c1de9d81b428b650ae19ddc0ae50bae28344f23058ff08247c1a0504e73c3bc419d972d3dcb27 SHA512 f562e0b6d262bd5de4f6e6f3eb5496ad9e8b4b4089a209e3614c5f0c3c531b4076d7a2af7b1317fa4fe9473a8241db1b44d343e2ca051e798c6948a86036562a
diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
deleted file mode 100644
index 005b645b21cd..000000000000
--- a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3.2"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
-	opencv png test tutorials usb v4l X xml +zbar zlib
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	coin? ( >=media-libs/coin-4 virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:=[contribdnn(+)] )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="motif? ( coin )"
-
-S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN3D=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_JPEG=$(usex jpeg ON OFF)"
-		"-DUSE_PNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ogre ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=OFF"
-		"-DUSE_SOXT=$(usex motif ON OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
-		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
-		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake visp_doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild
index 35b2a248ef5d..7b2cda09c8a4 100644
--- a/sci-libs/ViSP/ViSP-3.3.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+HOMEPAGE="https://visp.inria.fr/"
 SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,16 +17,23 @@ IUSE="
 	opencv pcl png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
+REQUIRED_USE="motif? ( coin )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	coin? ( >=media-libs/coin-4 virtual/opengl )
+COMMON_DEPEND="
+	coin? (
+		>=media-libs/coin-4
+		virtual/opengl
+	)
 	dmtx? ( media-libs/libdmtx )
 	gsl? ( sci-libs/gsl )
 	ieee1394? ( media-libs/libdc1394 )
 	jpeg? ( virtual/jpeg:0 )
 	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	ogre? (
+		dev-games/ogre[ois(+)]
+		dev-libs/boost:=[threads]
+	)
 	opencv? ( media-libs/opencv:=[contribdnn(+)] )
 	pcl? ( sci-libs/pcl:= )
 	png? ( media-libs/libpng:0= )
@@ -35,23 +42,30 @@ RDEPEND="
 	X? ( x11-libs/libX11 )
 	xml? ( dev-libs/libxml2 )
 	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
+	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
 	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	demos? ( sci-misc/ViSP-images )"
 BDEPEND="
 	virtual/pkgconfig
 	test? ( sci-misc/ViSP-images )
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )"
-REQUIRED_USE="motif? ( coin )"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+	)"
 
 S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.0-ocv.patch"
+	"${FILESDIR}/${PN}-3.0.1-opencv.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
+		"-DBUILD_JAVA=OFF"
 		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
 		"-DBUILD_DEMOS=$(usex demos ON OFF)"
@@ -79,20 +93,19 @@ src_configure() {
 		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
 		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile visp_doc
+	cmake_src_compile
+	use doc && cmake_src_compile visp_doc
 }
 
 src_install() {
-	cmake-utils_src_install
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
 	if use tutorials ; then
 		dodoc -r tutorial
 		docompress -x /usr/share/doc/${PF}/tutorial
 	fi
-	cd "${BUILD_DIR}"
-	use doc && dodoc -r doc/html
 }
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 4aacbf0e4876..0c2bb022cec8 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,5 @@
 DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
 EBUILD amd-2.3.1.ebuild 739 BLAKE2B f92ddd0fc74c0e1940975e1536f3a56364125a40f0ded5660c9c9dafa04235628b6e10c0aacb03abbc6faad134a2e91b88990475f9222ff9bc6fa1361ca224a7 SHA512 96e2ffe647415968e1824faab20011008db57a3d810d562dd1e45107881512dbe14cf106ea05022f8e22b0a6ca12c5bff0e5c461efaa338b09dca2e2d30534da
-EBUILD amd-2.4.6.ebuild 722 BLAKE2B 30b3940156a86ae07f36dcbdbfb5d547a079afd4e85939b1f51599cb4fadff074d2a99f93a908f9e42caad25b2f0976006e6ab007106fb3aaade3699740d2c2e SHA512 c6968c4152243dc5032247dfb07d54dc2357c2bbe2bb47fa9a8a82825f303fca18ed31de90ed6ac5d0f26361a1ec01cd026ad35ccee94b11367f691c693e87cf
+EBUILD amd-2.4.6.ebuild 718 BLAKE2B 932f6b127a62562c0d86e2e472246f0b9dcaca68d4eb1eaf440eed72e071018fadc3c5c42c290d146a38847aa38a2d3feb9bed7f38a99aea777057130f5c1d9d SHA512 593178c8259d83a56d2fdf80149aa6b631e9feecabb5944e702f06b2499104c9d08dc8482ee24a3f9211494256f6b748b8606f29ebb6a1a0f5a0348c446746c5
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 14e702a4e129..ccfc70342cb8 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index f3d01a84db48..bede102de565 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,5 +1,5 @@
 DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
 EBUILD btf-1.2.0.ebuild 542 BLAKE2B 0c68190981b2db131e18e5c1084e0d5e6fa1db4aaa33ce417078f88b028452ca9bbc4f50b68c14879cc12e0255a1c79178621c5c025251b6f1acba71cf014a4c SHA512 740f280706e53eb3f3803dd1c6c8a9cfbc8044c4125191a68d5134c851946852553bdd0011ad38b45e2725d33b57c5a705c35f769dd61a2f990c532e0daa0b5c
-EBUILD btf-1.2.6.ebuild 583 BLAKE2B c16851dd487b6d30936c4dc242bf6832477bf3e770c19e8da3a195c8fcfbdd77b45f9dbf0c040147b5ea01912dbe6e385aafd64ff6691ebc7b333c9ed4987bdd SHA512 7131c4cd6d69b6dfb13acf854475cd943a63bcc7d3898c187f2b04a1a25ce4acd4c1f0871ae11423133a6545cdcd4d2b765bbfae1b3deb6f58cbaafd1d406905
+EBUILD btf-1.2.6.ebuild 579 BLAKE2B 30e1dade2df19f6d517e4b89623e44303ad091aefef04aa2991adb29bd8fcb59ae2d3bab2c05fc727d48d4c26037fdd8083f4011cf61c05e5b8769a454eea763 SHA512 df647131b4c1dd30e89c25335076694142abd12f9b4f0594c733067331e46f007ab6a62f7e408578453132c6cd437c0c4e2bea8b0158c32ac0fbc47a16122f0e
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 6d1b0659d374..bf262a549295 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index eddb12f9c0f1..708282c2d72d 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,5 @@
 DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
 EBUILD camd-2.3.1.ebuild 700 BLAKE2B 8426dc0e2c549807b159e0822b7574a9a12ae9ff5a52a1ce45985a6c3446b25ec45011404f1e02262b2c54f1d0c117e8002b8bdd24c44bfebb7403d00cd026da SHA512 eecedd765217b255f7301302ffc6115f0925f76244b433d3765a5feca8f1f5e96af80adc9d6f1f25fd7d2a8f6d254d6e8db301fe6c3ddedeed99a1713018510c
-EBUILD camd-2.4.6.ebuild 671 BLAKE2B 8c8e1b9f31bc1f853da950dce52aa53d6c41418d8bf0e9a71542452e9e70d1700f95cb2e405d4302b765cb0a917f87b907ad809f990926ea1abc8e289a41981e SHA512 d892372d172d61ca64391ac620ab885edbb78ea961b31d5c13a1762e87bc4dc5573f30f9fc3dd3e0bb5a85b9593e5edd1fe74d3b7974aade7d7f62b83e107fcf
+EBUILD camd-2.4.6.ebuild 667 BLAKE2B 33ee7075498fd4c7c84ad09388a973b9ed02d4555d3d5dac7a38de9bb6a5a72a9739aba7a981c42ca689cf89d7c3bc9131a782ce7b41efbcebd48f58795bdd3e SHA512 852291d6bd31990419a8a13a3d1b331312fc8e1a711d074a0e69e6e3ba9a6ce3060fe9b3d457fc78dae4a0c4218a65795c997d9bcc703299e3cd34a6508d367c
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 3bdd531cc108..88bf2cf3cb77 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index e6eda8c4fca6..fa210259d394 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,5 +1,5 @@
 DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
 EBUILD ccolamd-2.8.0.ebuild 576 BLAKE2B e594eab1a608c513c2cf32270f4e4011520562610a3064460dfd771b09266ceaa15c95bb727eeef5a9e12577c74c5a2f900a4a92e2cab000f84f6b6a1c79ac23 SHA512 3f0e57a9837be8c4e44e3a07ed507a176a9672e3eca944b14573ad0cd9698b55cb05ba7e2ebdc981f6a9fdf5c5fa93ef667b0de12a743323bbc590d958ff95ed
-EBUILD ccolamd-2.9.6.ebuild 607 BLAKE2B 2d561523a9ed079156c16a5575df88f80bee8e852305774aa0c4a61efa4adfea9754038d2710cee88a2edaddd49a0c636a9af6ab37cfab0b8a4315276d0eb857 SHA512 fd888fe42d7a601117089697c8767f0e30a2e43e4867a76bf71422e60484e03f7faff5b4929abd0f1e3b98a8464a3257aeb3c1c6a0321eb4eed7579fbe9c2165
+EBUILD ccolamd-2.9.6.ebuild 603 BLAKE2B 9cc4344db9c02f4497fd573cf8d0ba94096d5a6b53365612b1ebc2e2375d6b9173a25de02feb7cc713bcde0386e4b978ae49120bf1f3d14ba009b7567332ff4a SHA512 ef4dcba98465e40ffb28e52ea55a4b3882da1c53ec5af724211c4a2d5bbcbe58b5baf9488241385310431290bfd9b83da96d8a1fd66ad09290f76b3345447a56
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index cbeecdadbaf3..1a280d3e0c9c 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 749f122d39ca..e616391be946 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -2,5 +2,5 @@ AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 EBUILD cholmod-2.1.2.ebuild 1758 BLAKE2B c9c74a50027e6a07ae755ecbcfbd16b60bfdaf5597dbbe91363b8119fa5689ad8f07afb8f5fcfbce3839f8e793fed7968bd58d6aa2117a1661f64fd88f95386b SHA512 f655e8b83a6886e9596a1acc2f54d1c25dc15983a3e272f159bcd72c1e362035253f0389588c5a3b377617fed982495ace46659002cd49415405cf9a2107fe32
-EBUILD cholmod-3.0.13.ebuild 1598 BLAKE2B 14b5373a37540b745ae0d425f56b6b0732e907da4c220d40d06f1ab8ca035aa3579999274d44d9876c1dd7c9db70cd099b9565b969b371f8eaae3870f5d1e27c SHA512 c80c18f5fb27da4d556e55f855423f80405663dc26e091fb6eeb6398b0e3fae0365fa8dabb38c3f95ed89df4e345f5317f90feb9c6235807a87e282c4209cd94
+EBUILD cholmod-3.0.13.ebuild 1594 BLAKE2B 8abc7d683ae2ea59c42667ad01b26096ed86570c9b01a5bd5ee4a59e139464cf7c2f99ad784a81c388ddd1428ac66c190574292a7eb0ee4b33bf8ca75df22f2b SHA512 cdbbf59454b34c91f3d748ccd92613a76192aa53cd206543737181e3c79e07d3d363104f08069facf108aa8c2ec7f184ee65636b1b76bfdba6ca053c73a4c701
 MISC metadata.xml 1064 BLAKE2B b0e3376f34f051bd7cec27db2bda432e0b7bc7a941807061e93fc0ea51fdde5ebc3d2a3ca400c0d05efaa39b16bd86051dbd3e86a629c3e3b7b3dd3fe15e99da SHA512 fc1765b400dd7463fc707e50c45e1b82152de54cbf0fcc20d4c42ed71172fd7fc0f2e649642e9074f09c6af544bb4c3e9ffed16fdd971612a66de58c9f4d7308
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index 7e2b678d25bd..f27553cef9f5 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc +lapack +matrixops +modify +partition static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 6e79db23f770..12357fa9f4f0 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,5 +1,5 @@
 DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
 EBUILD colamd-2.8.0.ebuild 564 BLAKE2B feabb3e0326d7b12d7f174b0d806515fbb155dec9f442d3a483082d7bec35ab346910d80ce7665058e7d9dd0b0f21b88a2432f6ee250745ef3afc9a05841fdbb SHA512 e8b758cb658eabb035aabc1054e2366438b63b404771e6079f00fd0b9d526a40b0cda6c9ad15c77e20243548f794e1dd755939a18e7688a588a7ec4fb930b6c0
-EBUILD colamd-2.9.6.ebuild 602 BLAKE2B 8ef7fb3dd4c273534a175910968ab9950390f1e0cd934870f2ff5b5876e1070876a1eeca31487ce25905a9966452b16a08e193b10634a5a2a0b8d358267968ea SHA512 cdd8fa45437ebed66deea0553d0acacede97d238adcebbb87e5c28bd00e3a4cf57a8a790c072aa7e9dfa6265779077be049655baa621a6331cf87966c6c74844
+EBUILD colamd-2.9.6.ebuild 598 BLAKE2B f6677ce63c8debcb45568f6eafdd5a7c6c581373b7f9b059a9cd3c2d843b25e7f9e396c214e429932c4ee1464a0cdb9f9f2903d07a6f38fab3dfc30613e0b0dc SHA512 b684df13370f3a8115982ce797449a0233f187b72d32a38fa0658cda1e8680373fff527f1130150122bcbddd213c1144efcc9bdfc68830783bfaa80be49ab53b
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 2ddcb5d9db54..975a5335078d 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 04e5bc622aac..76f11e8c1a6d 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -2,5 +2,5 @@ AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da
 DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
 EBUILD cxsparse-3.1.2-r1.ebuild 753 BLAKE2B a3d892c3b4d585445b255ec89283b610964cf7e87bdb65a8920cebcc7c947e206bd374e6a235051c46e01afffe826ec2f4f872531bf2473ecf2fbaf30e4d34d5 SHA512 48404fb91b86177ed8c275ac1936cd03e20217e3927ac06a93c112a683040cddb5fbd5c68f954f65ef6413a5233ee1524df5dd02213d092699ff08cfa535e7e3
-EBUILD cxsparse-3.2.0.ebuild 811 BLAKE2B c3b57bd6d8cbb18f08d37cbac82eaf2f74739b296fae3e932d4f27dae73cfd7e3307bc3f532f7790c6457e25af07c3fb663bf8bfc6c6e11fc67575ed3b42c3de SHA512 1e88738b5bb8ad0a57774f7c6fa37ef426127c34854611388879e7158fc1a7e144a59347a47790223a7b6f77ec87f50cb9f3771c2781faa6bfae863b42110193
+EBUILD cxsparse-3.2.0.ebuild 807 BLAKE2B 17a792621c8ca0aaa84e6fb63089473b6f2df6c9c4207d543c6406c1f56c526f268cedf326acb3a08663ca5504f87e7b9308f81af863f03baeb0f0f184eccdc8 SHA512 0d6ea7183fd21d087e0b82a210957c6a61b494b29e95d9ae9f4053e3b4024a851d6d73a5af8a3cf091955538e8725ecd3c95a6d454699ecdaea7a705ec99dc40
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 0abd3b6775cb..916ab014d3dd 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 1b0e2829e143..047314d24a2f 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -5,7 +5,7 @@ AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d7382
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.11.ebuild 1637 BLAKE2B 1182b6cc0c1b9a4a21d11a3e232c6b7bc1b357617473493056b51252961c26e1c6747bf4893658222373b4ac695523a0486ed02ad1f0e6fa0ed1e5943f118bec SHA512 dea95330be6dba8c69180aa1c34f5068e1f2565d09893e4b02d1697c6d2d2dd8ec4ab0c4ce7a61765da65e282d19997bc3c90bbaa62e9a29b123e35f4fb2db2e
-EBUILD hdf-4.2.13-r1.ebuild 1823 BLAKE2B 4a5d632b3ad107129734c37ec0ba289f5b8c9ecfa593d2aaab3af124bc3d60492146153fa616d9995b0d78e146daa7afb7fb9cb383ec296269306b171329fb8d SHA512 1322ac7ba685da4f9ce71811cb1f046ecbfb25817d3ad3044433da337e81decff6c943eb30b47faeffaa248bf13d8cb33f3a7291de24913c1426f5403bf6a432
-EBUILD hdf-4.2.13.ebuild 1709 BLAKE2B c19ddf38cbbf55b529a5860755d7fd87dd98061e42bf0b5b11e089c204e5b24b73311bc773eb3d7ecec230bc336f8aabe93d33a669c6ab8dcc0f5ab5a076bca3 SHA512 74df72ce4b4467038ccfd45103b845f72f746e2826a51fc7f7504ac4e0e9ae07485f5a8d0d580130a7e784152735ef10f95c2facbeb6e42b34694e8ba295bc24
+EBUILD hdf-4.2.11.ebuild 1639 BLAKE2B e665ee1ddd8ed979cc7c86712289b610fed0ae71064dacef3f1d476ea3affa81783b49fcfe9f15de35ff94b37c60687c542ba824ce2f9663aed81d0b4030d912 SHA512 ccfde9e848bf91258c40853dc2161c7c80b65dd3cb07ff3928e8a465de01a2e3ae6ae1160d24f2afd177a87c86f3f814a6abf31c2d029d4231e56788a3292e04
+EBUILD hdf-4.2.13-r1.ebuild 1825 BLAKE2B d9a3ab5d47884442462115561ab2871ee537ec1ae8cc7f1babd4fb9773218bd41dcfbac49bd3bdf958df50e4fe2bad6e562eaad049d0062d6a6f4395bcc5bf6e SHA512 8f3b3373867dc97da0a1422de930b9b6ea709a830e69bb97a1be1c7294b48501222d6518d448a4f92254ea1c77b849da7ea1d6dbae739dee78a4065f5674bf3b
+EBUILD hdf-4.2.13.ebuild 1711 BLAKE2B a35ac70c77523f3bd60aedf15d4bcdf05a2d2b7d061d0ec4553a1b761566e6388f2b9d141f53bcb5bef44fb34d0cfb189031cde7bb6baca440089a251d3da6c9 SHA512 332a2a73a35a3970c18a43b1fbe139f94c8a6f0b84a37249c1a1d7b2a8fd010454bd22e64e4284d22c8fed314e5067ede2dfe25532f691a640f31ca1d4b63af9
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index a167bc4da9fd..e898f4d07374 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d50d336f6fcf..ae60cc865d33 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 39f741106714..feefb99d01aa 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 21a614534847..6c8a2a4aa155 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2811 BLAKE2B 1b8e555034e149f38a15046bdf4e4dbf8a5ce50093852db1dc0fe5fab512b301b887c3c1eccef1043f221f7589eec2b99cfff15ea4114822c671e8cff9a81ab5 SHA512 16468635badb6f81b09215e38739975fa2e99a89f63a7e39bc616228a0d92a5828b957187aa97da99781f67d98db646d964a72e521bf184b25d852fcc567a62c
-EBUILD hdf5-1.10.5.ebuild 2710 BLAKE2B 44d9392549ae2f6ac7e8c39fd42c8b7706c9fc626de94f79b695c9f04fa097330176253f2d7a0695daedd8bdd7c86ee6cbcfa3223490307139f86ed0e19aacb6 SHA512 40b10877a1ace67993de99e0748a5af315f8e0bda6bc539108cbef8a6ecdf4b01306f5d3b0150b6b4773be7bf8b0d82758d612cd3c8637d62c7c81f284f47db1
+EBUILD hdf5-1.10.5-r1.ebuild 2813 BLAKE2B d219ef180297f018cb3eab02d2fcb7361f6802ffbc7c4480e102ac8c9e1341c5c5e63c92fc85a9f8db909d98028d19b4396d8ba480b7f4e00b00a38729798382 SHA512 9a0e076667ebd917f2b825070d291d8435821da66fae453ec47993e4e5bf4aa4e9dcee3fcd61f0184ed66be23c293ad0f583cadcb7c5c6ccf09ccbb589288dd4
+EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index ef906aa6eefc..c2f1f217d63a 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -11,8 +11,8 @@ MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index d812cce90d46..9d3676dd8897 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -11,8 +11,8 @@ MY_P=${PN}-${PV/_p/-patch}
 MAJOR_P=${PN}-$(ver_cut 1-2)
 
 DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 1efb1aed9801..a11cf50816d2 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
 EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 652 BLAKE2B acc4ec5d390bf989f0eecfdff60b8183faec3badcf44f0fade78314f5b40ce26c12cab521e608a9935314dbbbd1d20a8691792190596dd1bcfb5e984bdf15804 SHA512 d29ddc8c1ae5eea76cd2e84bd7e4eebeaa3cf1ec365bf5e98f3d45afdcc696b32bb1f00ed41ac968e7afc6b041ac9701fb27c01e345dde36551c9697db37b668
+EBUILD klu-1.3.9.ebuild 648 BLAKE2B 514ada94433a3788a082a24ae67e35c085d5dfeadf6103ff06d813682b2f0f75d0d8a9cafa3549ac1602878f7759ca9aa0e793ce33242afa9b3fa2d869adfef0 SHA512 336daaaaff329a069a14e8af1427096afa5b790b4b4eedeae28109b2fbd98025efe9a60ef08d70065605b1716b8d8e568933508056e00ac53d5080df4149d46f
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 3222f16c3e55..555188448255 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 5e4a5bb54696..d7eb1fd4e3bb 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,5 +1,5 @@
 DIST ldl-2.1.0.tar.bz2 336442 BLAKE2B 8516e37ac66c329397739fb5d7ee0b3a5cc1a286d780062a749901a13b30dca52e131647e66a721be1f1e2ddd022ecc7c9d6ec5da81acc9c98afa53a06978367 SHA512 ad532e3481e48b9c3587ca0cba3d58a89a2174e3a0d523dcac6d420e04aa5da1cb8517bb14556d0a593110350fdc02aea3677eec41eb74821a3a63552418d0b5
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
 EBUILD ldl-2.1.0.ebuild 676 BLAKE2B 304a185bf67e6d05cb2de2f94fe4c62f773aa4bb9e93e20f20f766afcd49426ce7842f8397654a39e01c1b7741552720c8a8e4a83f29da724cd57db0ceb52d3c SHA512 d11d0a25d7dc3d54045b3dbb0fbb0a489f609d066122261a4b0531dfe33552c129a6ff57afac41c7d0d0a93385886c00d8c8b8004df5ecef19a9d23157b96a07
-EBUILD ldl-2.2.6.ebuild 644 BLAKE2B 446abc2d8bd61598da6c5dc998482c0f0e266eef983a002a4c2ab0079bab980f8fded0df818ef72fff922925eeb1fda1f3d5648715b91d1f0c2adc74cd4de99c SHA512 3f4d63be8724d4a7c4246e441833b99bdf72937c556d387804d7ab7d44d8aa5ee0274b07c7c9b7dbf2471add2412d7110404d3a399d2c929466645cfa29b92d0
+EBUILD ldl-2.2.6.ebuild 640 BLAKE2B cb0115e8bd91c007b60a8067e01f6fd37bec84b4b88798f33d794a9d0fd22a671110b447bcf146a520857e96f9810cf6c9dc4cef82ba9e1ba83e12f7ee29845c SHA512 c918362b140eeabfcaa399d1bf3628e3ab546e01f858f1e3e54af40bd6c86a2364d207a1b6e68339b89d3a73355fb595c10206c91e557835c119b7665c0c0e8f
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 97dc7300636b..59660d008192 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 6b938f4a80df..75598f0540ed 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -9,5 +9,5 @@ EBUILD metis-4.0.3-r1.ebuild 842 BLAKE2B 436b4eef63e9e4b8c48c7ce2c989c6614354acf
 EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
 EBUILD metis-5.1.0-r2.ebuild 1905 BLAKE2B 4bffcbb4a902c84b843a7398491242ec6a6c37a3c9a9353e28b4debad79edf95332db9578cd098b5469c8a9d144a05d4864333a29f888f46c061dd125bf59579 SHA512 7c2b0b9cece1f4842babea6cf02492584b79eb965acffe9135f43372ceabb3a87fa3514e29fb1edf061b579196a0664ee8ae5e133375e7793d06fb529b9bae5d
 EBUILD metis-5.1.0-r3.ebuild 1936 BLAKE2B ef3740f53f426b5ab9e241963a5a1401e776008a311b999297b2ec267bf59902efaff5d21a0ded45084de967de9b7ee14fd6a9ecdcf12d9601fac9b59f26747f SHA512 c42713219592ce941c56230c7b7181053c41d80ad476671115909e09ea02d7d631b485874ab348712f9867c2c0a2b4c11e13b71db4667f0591b09e694248167d
-EBUILD metis-5.1.0-r4.ebuild 1485 BLAKE2B b109c425982dbda5ca90f00acf3eba98d49ea1d4763550afe862f8036d81d3314ab3be27a349fa876f5710f2b7ad3d20cd44b4c1150d625c8c3592449ae6c302 SHA512 985ccd3091af2f4fd844a05d2650658d20d715fce071f0f51d14ac2c26befb880291d2dadf19ed46c070159eb09d4e47bdbc00f26082b59da5b0f1be8027a722
+EBUILD metis-5.1.0-r4.ebuild 1481 BLAKE2B 1fcc848c42773c37f808ce1e42104204df60fe344148815576230fb0d784da1e5c32f1d4b8ad1d51bff1400c079120fb24526fe719f3063a43cd0b3b1ea897f9 SHA512 62004079f5d2c81823a0185670ed6f15a6c3f55ac2c75e6144cf39df6e119a0db9f1fe23aaafcc6a4363df4ddd161ee6c44152fb70b5971ada676ba5a4a44797
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index 5f62daa4aff8..1883a113d0e2 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc openmp"
 
 RDEPEND="!sci-libs/parmetis"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index daf8aa793b31..00c58303e7fb 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -9,5 +9,5 @@ DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1722 BLAKE2B 0d356fc5762aa25d8dff40d72ad031201d6a1c01fd10107f815ae2cb4f6abbb5b2806b9097f87f916ea892f246d0ccf9e0f00cfc88b65f7b1d8ab4eab775e0ad SHA512 43d1bc825f15e4386a163860ff62917ccdffc7cc3d1ed4cc767e101ca78f86a6212fa618b92439d7f308108c4e71bb55d2a2cb7738d8b275b6714e6ac3e21b6c
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1840 BLAKE2B ae3684cc09c4853685bc97626fda129d4e3c23bec817e35b3edb18651907fd48f1e40ad52bb97121280130662c3da9ebf5d77157b3960626aa799a8b32cafd70 SHA512 43262a8e864aa234a7a05c537611b9464fa0ea934e4e2841af4c7d2b3c25b7d12457309cb0979e7debc97527c7f8b793482c11f9b9e6e20d4bc6a4a3693dadf7
+EBUILD mpir-3.0.0.ebuild 1842 BLAKE2B 232747c585153b4b71a8aa08574a4c4e41fb3f5c6d3c9cdf6e3dea34a7e330fb5a42dbbc740b02c36ae0261f251d3494bba29775280882fdd048c1d6dcefa9b8 SHA512 92bcd6e52bbbc97f3ac203c2d9afd5694cdf9c96ce18b716dc5d9e8e74615d0ecb162b61028cdb75c3502347810b199ae8b1c1fcfcafb8ffd6f939b6c2439792
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index dd1e6cc41e80..b22fb7b36036 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -65,7 +65,7 @@ src_configure() {
 		$(use_enable static-libs static)
 	)
 	# https://bugs.gentoo.org/661430
-	if !use amd64 && !use x86; then
+	if ! use amd64 && ! use x86; then
 		myeconfargs+=( --with-yasm=/bin/false )
 	fi
 	econf "${myeconfargs[@]}"
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 6f40d8de381d..5b902d46582f 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -3,7 +3,8 @@ AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac
 AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19
 AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4
 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
-DIST v2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
+DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
 EBUILD nlopt-2.4.2-r2.ebuild 2714 BLAKE2B 3939763ab3da6e8708c10b3ca39f1c001f2d9913e883648cade9d58b83c3242804991373fdd36599474715840562533881c8ab0ffd98cda54ad71d3d4c12cbe4 SHA512 c2a7e3336ccb1887c2c6074aed5fffb254dd11e607d871bd3ed864794d04cdfb7a3aff711b8cb5f7f0a98629f34a196f4f5fa7221f5c07324b2439b48cc9e5c9
-EBUILD nlopt-2.6.2.ebuild 1962 BLAKE2B dafee2481e89c71e5c55cb0480358754ee82fd9486f85a751485cfdfdeb0743119d6e7ac3cdfe10f85076eed564507296a6e9f94d640ecbd84800a53cc0ed55b SHA512 fb35120424450c937211755fc1350d24510b09c49fe6b58c6d611f3ca98ef861e0aa89bd3ac27d9aedd747e5c0a18a22df1fb1be2b99b7dfe3eed44ebba5b5e8
+EBUILD nlopt-2.6.2-r1.ebuild 2301 BLAKE2B 92872c3fe8856a81648071c2f4fea997c96f3e8590ccf9d5bcfc27dafc73bdff822e18768521c8ce42e1eb4e3ebca1a4ccd15038e4688ebb179907ab422c71ae SHA512 68a32c60540e17cb91ed86987e3981ad519656ab2bab83fbacc98fb01e439ca65e85a8c75c8d06860b4fc47329e08f19b591e1fae25192510f9a5d44216bf749
+EBUILD nlopt-2.6.2.ebuild 2412 BLAKE2B 722391655b7a5cebb487bf893efe1203a440affc3739282ba26e7a5202edff01d953a43a157da5c6c7d5f809135674089f8179edc2be43498daa8aaa5d8c4a19 SHA512 462bb900b0eaa779bf29c6dfb99f52b432e7c3c29c4c997e3fb8019b94ba0885fbab8b57e0d7673fc561407923942e7026febe1d3c196a10f9d53cd11feea02d
 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..416022d0dc54
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	guile? ( dev-scheme/guile:* )
+	octave? ( sci-mathematics/octave )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	"
+
+src_prepare() {
+	cmake_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNLOPT_CXX=$(usex cxx)
+		-DNLOPT_FORTRAN=$(usex test)
+		-DNLOPT_GUILE=$(usex guile)
+		-DNLOPT_OCTAVE=$(usex octave)
+		-DNLOPT_PYTHON=$(usex python)
+		-DNLOPT_SWIG=$(usex python)
+		-DNLOPT_TESTS=$(usex test)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_configure
+	else
+		cmake_src_configure
+	fi
+	if use static-libs; then
+		mycmakeargs+=(
+			-DBUILD_SHARED_LIBS=OFF
+		)
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_compile
+	else
+		cmake_src_compile
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
+	fi
+}
+
+src_test() {
+	do_test() {
+		local a f
+		cd "${BUILD_DIR}"/test
+		for a in {1..$(usex cxx 9 7)}; do
+			for f in {5..9}; do
+				./testopt -a $a -o $f || die "algorithm $a function $f failed"
+			done
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_test
+	else
+		do_test
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
+	fi
+}
+
+nlopt_install() {
+	cmake_src_install
+	python_optimize
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir nlopt_install
+	else
+		cmake_src_install
+	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}
diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
index f21aa295b041..21c2ada3624a 100644
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit python-r1 cmake
+inherit python-r1 cmake fortran-2
 
 DESCRIPTION="Non-linear optimization library"
 HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -52,6 +52,12 @@ src_configure() {
 	else
 		cmake_src_configure
 	fi
+	if use static-libs; then
+		mycmakeargs+=(
+			-DBUILD_SHARED_LIBS=OFF
+		)
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
+	fi
 }
 
 src_compile() {
@@ -60,6 +66,9 @@ src_compile() {
 	else
 		cmake_src_compile
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
+	fi
 }
 
 src_test() {
@@ -77,6 +86,9 @@ src_test() {
 	else
 		do_test
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
+	fi
 }
 
 nlopt_install() {
@@ -90,6 +102,9 @@ src_install() {
 	else
 		cmake_src_install
 	fi
+	if use static-libs; then
+		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
+	fi
 	local r
 	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
 }
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index aea16f086ed1..dea2b0401cca 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,5 +1,5 @@
 AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.9-r1.ebuild 4076 BLAKE2B 672d56f31f5148e878eb6b4cd2b5200e1d844d9f3e5e8d0bd0583c3052c4b15fa42fcbf4195c6a3c3a855b6b68f2a6e20f8bb129cff40ea268895972bd3b44e4 SHA512 82087864918ad0ac4777b88d5b5ec2036b7b2040d5b30af8247d960b8f460561d7215ca459087fe012ca537e65ac6fbb98c542d5bd1f57a1a9f25c940b33dc85
+EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
 MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
diff --git a/sci-libs/openblas/openblas-0.3.9-r1.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
index b0daf6becad6..391cd2524189 100644
--- a/sci-libs/openblas/openblas-0.3.9-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 3479aa164504..43797b961cb4 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4345 BLAKE2B 9fea4420e1bc8f0af25dc710644e0c99570da7967ec4a80bc146f9070de1bc36d9854f8cff78098b8eb697cf4518d0893e35318e2377a2eb189ea53582ed00b3 SHA512 138fa602906e2e82db04ec38bb3058decfd6329da1684233d65b03d792347d5eff034bef2da5eac4eb7e167488a702b8839f0fe879802f5874b09983b363c9cb
+EBUILD pgplot-5.2.2-r7.ebuild 4346 BLAKE2B 982b2bcf89e297515faeee32daca24196887678acbd593c3b79d1da7aab612ab5335d10fad649acdadbc81abcae9b5a0f59fd030de7508877acdce192852f0ac SHA512 11c7ed1c02b84d22f5b14be00fc28e20a6ccff136a60b35f7c1b7db7bf4b0eb31884c0a04bfb6cb939366b60d443de02791831b7f06fd894ead4edffbec18eaa
 MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index 33d7fc5c0a26..43b17b8974b1 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -8,7 +8,7 @@ inherit eutils fortran-2 toolchain-funcs
 MY_P="${PN}${PV//.}"
 
 DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
+HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/"
 SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 25cd128228e9..2b4f034efa61 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,11 +1,11 @@
 DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
 DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
-DIST proj-7.0.0.tar.gz 2893700 BLAKE2B a115bea09093cbd412cff439abb0f381fe7edc21aa118534e0d8844672a3497a9608ef8072e6aff850a3d70bc3df0fd4c4d4dbc3409ef2e975c84eac6a3dc83a SHA512 fd92937656c85c7f6969947323fa2752df0c931dd9c942b11c67dcae132f61f404c8da57ed7e7177aaa82f579e42b1c3611e6c2cc34d70454e548ad8afece243
+DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
 DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
-EBUILD proj-7.0.0.ebuild 1123 BLAKE2B b00047d3e07c603ffaa69a3a485e54fad0d2f4bcc3f583b1f50e6bd5d076a9a556a5661eda7077284d90f2cca81dcf6cf617e867956e5f06df6befe8a11ce8e8 SHA512 06c3f0e13d864155fd3164ddb826e479fc6db8e5256f9a0cc86010e8ffac1ac768cb6039ad93887b69ebb467a1cab5d00af4bfdc1e204672d985e917ce6ddaa3
+EBUILD proj-7.0.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-7.0.0.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 1864512c1dcd..5a90105f20d9 100644
--- a/sci-libs/proj/proj-7.0.0.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -17,11 +17,16 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0/19"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="europe static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
-RDEPEND="dev-db/sqlite:3"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )
+"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -34,8 +39,9 @@ src_unpack() {
 
 src_configure() {
 	econf \
+		$(use_with curl) \
 		$(use_enable static-libs static) \
-		--without-jni
+		$(use_enable tiff)
 }
 
 src_install() {
@@ -43,5 +49,5 @@ src_install() {
 	cd data || die
 	dodoc README.{DATA,DATUMGRID}
 	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index 4125fd76b5d2..c9b3da878bab 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
 EBUILD scikits-0.1-r1.ebuild 738 BLAKE2B 567a32a5ab294ba1d053bcbebf68da3998c633f9e6a943180bc968a2ac0b2ea5140ace14456b77f499ecc4b20dd82417e74c8a5959c8245e43cfd95ec2fc9f0d SHA512 c2c03a129d86ca4e68a99302375a811abfa4a750750425713c91d51ef58ba203bbd46e4ddd2f9f2841b9d61f4a5c06da6b8bb9b2111e56111d581028d73d535b
-EBUILD scikits-0.1-r2.ebuild 749 BLAKE2B da0b7d7ae2ee6d0e8af2d277b17de955a52fb8323691209c855324171a3266c2ba6e54f92ff04ea6becb7a5f9cded3a890f677e391fbf3f65e6bdceeac357074 SHA512 9af97c5f23da57c0b7013e56618451a349503c96dc3fa0fbbe4ead73a35033744a5426d53abdf64b90fb176a711b738e601c1678df38944cb5051b35a610eb28
+EBUILD scikits-0.1-r2.ebuild 756 BLAKE2B c5688ed662d8c90d3e79dd99e3463952060572dd6a61851e7b28fb1729eff349a21f7393d6a7fa1bc5d1f01a18116278eb66b54d07362909b2ff7f3198dd08ae SHA512 dc82efcf0fde9b4db145a0d729074c930a79164228d547c58bd6ec71ba8a50966d4bfef2be0a323b4f0c75f038f925976b212bb4cf4d096926bac51a21c210ee
 MISC metadata.xml 454 BLAKE2B 65b13370ebd7fdc79632a088b403f493076c87a0ccc49b64946c7ed0050fcfd85f7ac0fce2fa853e1be0944d0ee1628470dadb4124448e7a746bdb864ffe9977 SHA512 b33fed7d1199471c4a86dadf1aa90951035fe49c76df9310de4ed13c391b92782230308a55a33c7fa88f5bd42b8718fe5f6ac88c0a8c1818848a447c4c1d0eb8
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
index 921faa267648..054dde88eabc 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index f4d13ab78455..d082029a266a 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -7,5 +7,5 @@ DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e6
 EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
 EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
 EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
-EBUILD scikits_learn-0.22.2_p1.ebuild 1764 BLAKE2B d3e6613bb5b314db9a52d68197a6dd82e65afcec908c55e5156598cdaab93fa4e6b9f3b972fad326a423b62508410926bfef38128c1c7b617842c9ed28f5f91b SHA512 2667395c3add51180d1c5886100daad3ae6607db383da139be626272de662dbd4870e647bb97171d416b175e5a50e04ea962346f8d80b8dd6b4f608d1bbf3e28
+EBUILD scikits_learn-0.22.2_p1.ebuild 1771 BLAKE2B 58255129e8173118593b5231ea4cf2160363a1f7a07bb808b20b305b6396ce41f728bfbcbda96cebf7f27914af01c402404b3015827cf56c235cd53efe1c8118 SHA512 57e4e346bac7c6c665ec6ac482cae986fa54b5210e5699421a560ceb13f549163ef11b4927fde45a0c53da05a8674b72b5292696cdf7328c2e3c3584923818dd
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index aaf2a275fbbf..1c4068d298ca 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 8ff79d235f37..7910e0790e21 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -4,6 +4,10 @@ DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b2
 DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1 SHA512 9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
-EBUILD scipy-1.1.0.ebuild 4115 BLAKE2B 9444084b97ebd27c23e5bbaf6c650f1a0f3a0da7dd29f8b063c9168a4144928d10a76aa4cbce22e4608a68251ff5ace33fbb6e96a3bd6d294862b517cd354256 SHA512 4d7c8ee2129288b7308707b0aa6de8979b5f30b59f9d77e95b3813b25687dbf7a8344fdd0613e91f65220d59015623750778cf82f820fd4001d4146c99018947
+DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
+DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
+DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
+EBUILD scipy-1.1.0.ebuild 4122 BLAKE2B 6c4d91c33b7f02a461f0b2805a859e160687d8a4e4792f3a12a44dcadfb33b056a705e836b2ef4fa9da36a41e7e79e285da6571b97e0172262b991dc5aa715f2 SHA512 0df59214221d5ad19b70ee60e965008f9ba598d234e1b6bda0c8f2cd99cf0eba7dc3a718bc32d01b3f5f194b2858fa04eabee4aa0012519ce43c322887a04b2c
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
+EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index e57e5cd5b7b1..a4576826f4cd 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild b/sci-libs/scipy/scipy-1.5.0.ebuild
new file mode 100644
index 000000000000..21948a8eb2c5
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 8567aff42fbb..bbe7a68f69dd 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -4,5 +4,5 @@ DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008f
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
 EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
 EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1023 BLAKE2B ed6a0ac25f2429914de6698a642d81581925c3d508158c85d939d0d97ccd1bf078f0a24496c0a690e744e99a688cb3f266c0ffe58007220cf78ca897ffec2033 SHA512 a5b32420ecc94feac2372975f6115e5e25e15a3e1ea9f44cf4a87ae577b67f1548da01ff34e62b70b87b3aa5fb75b7c41ec09fc29c3d6e28f441e2b556c7e45e
+EBUILD spqr-2.0.9.ebuild 1019 BLAKE2B 3eae137cc4399e2d5793de65bea5838d3891a680c42272eda8a1c921de4e5345c1fb0792403adb1db4ab7d405e8dfa75701f622765916759da94273141674e37 SHA512 be62092f8accc27143fde71126c53c65d571edcc6ba14c664fd3c61aa01c646bb919ab8073bf5885c078c8da212b216126af41be6cd9b5f7f57c29200d403c6d
 MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index b29415ba3f9c..ae9b6c3adc4b 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition static-libs tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 1a4832e7b92a..e5c0636f67d9 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 780 BLAKE2B 15cc7b93a9e063f453b4f51bdd87781b89626a495eb520e2a0b35f57942df906787ba49c2ad3483bcc0801606288653a830ce9b1e0303343c6676cb6bfc49a58 SHA512 2204fc147fb22de262f24cb90feace1a837542aa28ac135fdd2c1448d55cb3c8f818478355080a63356164e70362d51e2c98b5444d0e34bf5deafeb0d8a2c50e
+EBUILD suitesparse-5.4.0.ebuild 776 BLAKE2B 99f423fec8a78e6b7e594c39ccc559b43a7765f1889d4831a7850d3b52d44c3afe0d757d269ad90f5b4dc230dc142d722b59351c26ea5b64b08731a6561515d8 SHA512 876eda545bc973008eca4ef1ff322fcfe9dd901a7f35bcc1a8c62c3ef2aeac5bbda5277f5db92133b70a22bac41e0fa3af04dc82f4eaf7fdc686a6a062317281
 MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index fc9edc66953d..83d8940a3b86 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 1b33b7638e13..0e126dac7318 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,5 +1,5 @@
 DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
 EBUILD suitesparseconfig-4.2.1-r1.ebuild 703 BLAKE2B c24f133a3a9b6b89521f8874c7259f54b3ce69f49e003fbd607d8340f9eb0f0b01b0b39fa0b1ae611f4ea22a75bf3762798ea19e743f399ed00a0a5fb398beb6 SHA512 36174e7f3e8024980d71e971c6b329f9cfe9d67f8b88f720a323d04f36d57e303510a4646d5e696122c6b31ac9c56d393209b143d4ffa6ad3949f9e702bd2118
-EBUILD suitesparseconfig-5.4.0.ebuild 795 BLAKE2B c633ecb9aca6782abde5b57179c2074202ec69d126941f3f4d49cf4a6ff247e5cef5a47121910dfdfbab11736bc4ace7f4717ab5dbf44543c7bb6b6f37bd75e3 SHA512 8f93a7db06f437af31c4f4db0f2166a86c5fe915e0f196cc4952b25720e9c33f1f5a8bb72b8c9d0c921a4150b9af8d7c3557138f9f740c16b3a645cb28f69a51
+EBUILD suitesparseconfig-5.4.0.ebuild 791 BLAKE2B ea9f2b184821029385104d95f6d7a389072a98f0b588d9b9a2ed858f317dfa5429667cac20767b9f3eb2a051f9777b9ac4b7ff0de9940ec7ae95e7b24e75ddcb SHA512 6040bd537cc5afb7bf88e5c86cdb5c9bcbcbdf336de7ddf41e9a60b1b52f316ff99e9710cdf99b299ed3560994fccbe06a4c0e1863c5ddda99f975007f729e16
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 6e48d59fa270..69191629f724 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 9f5e447101bd..83ff901f8bfa 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 713 BLAKE2B eee29f5269f96977d39f756124b32249a5dc0be413fb25bb536fab05b254350564a7d4299985f12fcfc203031866aa1ff1a24311cab5b79522ecdc3846da3661 SHA512 6319b14942b31fa7ec8be0aa95d87d9eaa008a67a6c8d3b6cf7b4ccc42c86de975d42957c4cc7ae35c54972435fc99eb73f019e2a5ff51ac886ab683d982985a
+EBUILD szip-2.1-r2.ebuild 714 BLAKE2B 1af45888836f994bd11cfae25c3925cd3a78c9c3522052bd8c357969b948bda94358aa466b821f74aa44eef3c27acfb8dbb70f107d77c0c01cd1023a0c5b27dc SHA512 c63edb78e85d4b196fa4ecd815185ceff5fa21bb3826290efe0ae30d00b367feee6f71381ef888df739b6db063b87ffbf15a5745bcc4710a58cfe4a5a8ff9475
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 7e5ab7936ab2..da08b6a5c3c9 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
-HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
+HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
 SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index b9068a5c95e3..93b17f5411eb 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,5 +1,5 @@
 DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
 EBUILD umfpack-5.6.2.ebuild 869 BLAKE2B d838942a6fd5ff1af5d10bd2015b3931f8f2e56009e4f5cd7d89ee38dd4fbb5fa5806c01ce597882310f7d5315d3c5386970661939bd31bbb9b4437ee833cf6f SHA512 4d94dbe622115b30d2bc3d9bf5ed7fbd65cae24361311b7fb52814c357dea1d6e7f3d66ae776ed937eed6cf4a813333bde0a6edc1acaa6603bde2c1331e96ca3
-EBUILD umfpack-5.7.9.ebuild 907 BLAKE2B 9b14efb61d8cd1c147581f4fadbedf643c61ad35d8e2bb51abe4c22b0842bc61386fda00f061ba6d7477cb2db31b0b3df405998696aa012b5fb43fcd420b950d SHA512 4accd648f6259dcafc64e54126b05d82e272c9f3f46c81cea4baa77c0da25482784a4b3cc4eba46f56685545477ed4fe52f6616a28d6cf5c3c81f10efead48d2
+EBUILD umfpack-5.7.9.ebuild 903 BLAKE2B c2b69a5cfbe9f480d215ba3679bf4cd59f271ec1a6e941ef3aca585fd2a7fac89c49d1294badfd7b76cd9edf27a529ec3fc2d6573161ca4544c872837e54e7d3 SHA512 4d6cc5ae0fe76d53a6bc2990aa1a4f045e3d563ac6c1234a23a8ad4e51eee07749456d23a2ddac8d46165e3a287e8379893d2d3e06861fbc969664305a4c5057
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index debdb6cbfa73..f173d42739a6 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index b5de6e0c6ccf..aa27518e35c0 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,3 @@
 DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
-EBUILD volk-2.3.0-r1.ebuild 1111 BLAKE2B 6dd21f37fc91d0824c5edc15f1c53e7c702d46139e7e5afe4b339cdd1823f8392b1dc0c5770e4f8d079a2b0a3e52679c5eca4a63d896051d55851d8f12967edb SHA512 d834630ae84b856e8496a804a815d261b4ce46bd65f12e7994504c40a16a58308bb9a2d31795ec1fd15b846fa30a78705273589867e64b26aa8d78d2edd03b56
+EBUILD volk-2.3.0-r1.ebuild 931 BLAKE2B 669d58f3e8f8bdba23bab9b92d52a5a0694fcac5b4d88edeefe74082352e481649ab27979294bfca79f7cfbad78c098de267277c0ef95f8265242e2d48d3c671 SHA512 ba79c624b9f7faf67feb2b2d0fbbe9d856b36fbc2f319f2a3340a1d61ecf145e29712e8ce8b7e1ac3d8ce85d689f6a30926a4e797e7c9519f43ea7147109321a
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.3.0-r1.ebuild b/sci-libs/volk/volk-2.3.0-r1.ebuild
index 31451c46050e..e8f45f0f6f9c 100644
--- a/sci-libs/volk/volk-2.3.0-r1.ebuild
+++ b/sci-libs/volk/volk-2.3.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 #https://github.com/gnuradio/volk/issues/383
-CMAKE_BUILD_TYPE="Release"
+CMAKE_BUILD_TYPE="None"
 inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="orc"
+IUSE="orc test"
 
 RDEPEND="!<net-wireless/gnuradio-3.8
 	dev-libs/boost:=
@@ -27,19 +27,12 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-src_prepare() {
-	#https://github.com/gnuradio/volk/issues/382
-	#Waiting for confirmation from upstream to push this fix
-	#sed -i '/_mm256_zeroupper();/d' kernels/volk/volk_32f_x2_dot_prod_32f.h || die
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 2b4272749df1..ec62e33fb1b6 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -3,12 +3,14 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
+DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
+EBUILD votca-tools-1.6.1.ebuild 828 BLAKE2B c81919d0f05f61e825af2cebe22e19da437e7e7ccd99f2a935e8425ca5dd71d8f7dd5571720621b86db8a6e0a9ec966c048d1e68b2d672bbb4f57a2415ce03c7 SHA512 2fa333854dfdc8af689080233ebb185b0fa1fe4ff6ba2d3e49d5b5f484ccb0e2041bbe58e3fe06e1e2bdf618c81dd1265495945fc15ddc059ce9687fc5f5201b
 EBUILD votca-tools-1.6.ebuild 824 BLAKE2B 12abb2c899f4f473ddc42d30f1f43618f759373a5530228c7b08deb512b3bd273ba9d0d5611c0de34de9ddcd96784b8339b1c46dc7ad00179e6983fb3bd11e2e SHA512 c463a1b68e8e5a44f1d3688059a4291cdedc54de7883233ff828ac61b177fad92ebafc21c2d4d022488174a2512b41465cc1e2f4369df2297bc20d47aca381dc
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
new file mode 100644
index 000000000000..83b4a6d5bce3
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /sci-libs
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)