gentoo resync : 29.06.2021

11 files changed, 110 insertions, 221 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3c0c48a01c10..ec897f8ebcc2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 63a89ad3bdb9..2e2abe68faf6 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -2,14 +2,6 @@ AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda
 AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
 AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
 AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953
-DIST cdf350crm.pdf 2139671 BLAKE2B fbfcc12d919ca07beb1df621f967bbe69b33d0c403613e1b12c01354e53e86f93920104d24dab4f3d1260d72f5e6de663ae3a87ef310dfabf46af2c216424f07 SHA512 382c3cfd73b7c75a017f0c563c61473fccc11ca344f33f4f5a543f4c339a52879400532dbff9956ae8c2b7706f63223132666c3154ad7ada281cd4418e48b4dd
-DIST cdf350frm.pdf 2194293 BLAKE2B 40b269a7987a1522ec7f92eae8efba1117993e459df574afe89d5325d21c3e685a5ed09216bfa56e22f40e831c99bf6d69faa14b9d3a1014d1cbceba43dc3bc9 SHA512 1c1db067f42b56ddb01399821103ced7207da1dc191f62f7acf6776a05c15a992f7be060790233e1b94444724aedb6f83ba687f60b7a20b4988f9d591b40d481
-DIST cdf350jrm.pdf 4009791 BLAKE2B 5b0ea4fcfe2237b4105707d2a3a9945e13333c4ee073d7d9a5a2b839a250308697aa9291aa1e224b886f821235b4d6c4f5f5304a1ad61d45436e1dc4f2b0425a SHA512 cf42de6d94168337936403fc2e504b03fdd676ae8daf8020186d3261bc7331822d47b7c509c804ca5fd637af3696308d09c5db102aaa546138d0630c3df999c3
-DIST cdf350prm.pdf 1111201 BLAKE2B fa0796143906c6b1d3744e97c9325596d8fa9db9f272be4af338f71c49c5b623adaa2f00835dacf671f4ee2ba104d5a9f89f443ec39338d01e726af97c43297d SHA512 5ab9002dea0d223e5322d3cfbd9faaa4306d701c9e81de77a27b6c28054ffde146ce1fc98c6f8f34d36c684fc65c8007e378af9990cf709f534da35c2ca1ecb4
-DIST cdf350ug.pdf 1396156 BLAKE2B 39f3e3b0441ef103c9131b3c5523c5a387eb785d545c68cd6f5ab9b3f696cf960a0f532722ef6b9a510675d30b061742ecedb4b7188aaac0c05db8bbf4d08266 SHA512 2c3111cb873f7e59b78e1963923a878564f4dbcd7bd8f54a3b35825e3fcfd162bf19ba6fef3ec1058616cc76bb0c57cdd2f7bf9fd5f4faaac9ba5559d7febe29
-DIST cdf35_0-dist-cdf.tar.gz 1137065 BLAKE2B df3235338e63686dd0446663b8738618c45c4e86c858b4f41d3326ebf14d391ecce43309cf5d6a3db4a9f9e53820bf8a73acb77549a0432594859b24acb7eb84 SHA512 f26bd1e298494563cb30c52751bd175124814dca2fe2c05ae056d6c2ad905fb5ddc7da35888c6a07d69914f52481cb4e9fcab9684c9a8a0ca4b80ca449ad3406
-DIST cdf35_0-dist-java.tar.gz 724055 BLAKE2B 563542821106b040bb0eaefa303cbda46ace5a127cda1936c55e5eaf3b395eb67073a622e84d1bfc33cb65faa4b51710008cfbae86fd680e5cca2c80dbc5162b SHA512 2e69447e9c36ced39a6bfcd1f2a5dfa7c36c04e9a5acac12952c1b415c5191471efbf2cc432b5b31eb37c8ee31bda3e27bce0fa266c5549fb1b0ab86c4dd6c4f
-DIST cdf35ifd.pdf 560458 BLAKE2B c44722d30c4217b492fe140833ae9c58721040b629cf414fe8d9d7d44433b3f62241d621d4b6d634f54e4f0ecb4c026b66a1e752a1d868b0861eed54d4a95bee SHA512 018a524f7fc8dc5b8b3512ed8bdea42bae141eb65d24b4fbbdac6ecebaeac5c458caf3a476fc4b7c0313b17441cbe7dce32d1002f9344d056cd46853ee3cd438
 DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
 DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
 DIST cdf380frm.pdf 2570409 BLAKE2B c8fb1444c7e02297af0c3bffbf58c048077e0d69c4aca8cb3e48331f496dba1551289d2e2b95f9f2d9fabe8048bd56f73a72bab58a52772cae22f184a6b39745 SHA512 de90e4893b976ab9e77f1e9512b2f310b043b8dc921ca43cf1d37e767bf5cbae5d06f91388ff5f4fb1258db5a1149712fa9a5dbc1c2d18f78705021fc31087bb
@@ -19,6 +11,5 @@ DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a
 DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
 DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
 DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
-EBUILD cdf-3.5.0.2.ebuild 3224 BLAKE2B 9df2c75735c47956c48404dfe407b90fd85b3409f0f97b162711206cd21d25ac78c622f3448423b73f037eff31b9e7e80e469a31b5697f6c29794a569045e113 SHA512 4d5c92f58891aeb519ddf4a0975d642cc2166e87b79fb137bf97b265491d678ead449f6f07f28574f568e269fb216e82c9ad23811dfc109879a77148fb4adcbd
-EBUILD cdf-3.8.0.ebuild 3250 BLAKE2B d8aae20b0039338238f3331368966779e82a77eb55035728a3f198ba8a6bf2e7ab337bc44c4f6c6e9982919fc45bcf35e7032d613c4d1f4c7e9e9185a049bdcb SHA512 20819048c9c075111701f20f2189722fdcf5c709e9ed8518ae8dfb0ce4cb6aa89dd0743d8c154ca30c86f8fa84882833cc89038ec68591aac95c0dc5f0e3b47a
+EBUILD cdf-3.8.0.ebuild 3247 BLAKE2B 1a803b6b61f99dde5075cbd3a1259ed93177e6c8a02bdc30bcdbb295ec1936360f1f11b646fbf4641a500d345f21126aa822adc08f0d429b56f95bb015b0ec4c SHA512 57c2263a5b96681c04fbc0472ad7e8db255b01ab6922037ba7af7c3fed3945f4860be75bcc5f90e5c685aa10fe913b153d7040887d9fa57dcff195494028c2e2
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
deleted file mode 100644
index 2942136cd5fb..000000000000
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_P="${MY_DP}_$(get_version_component_range 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="http://cdaweb.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
-		java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0jrm.pdf )
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-RESTRICT="bindist"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.5:= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-src_prepare() {
-	# respect cflags, remove useless scripts
-	epatch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.2-soname.patch
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		CC=$(tc-getCC) \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{0{crm,frm,prm,ug},ifd}.pdf
-		use java && dodoc "${DISTDIR}"/${MY_DP}jrm.pdf
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			insinto /usr/share/doc/${PF}/examples/java
-			doins examples/*
-		fi
-	fi
-}
diff --git a/sci-libs/cdf/cdf-3.8.0.ebuild b/sci-libs/cdf/cdf-3.8.0.ebuild
index 4350f3e58cc9..84faafaf9a4d 100644
--- a/sci-libs/cdf/cdf-3.8.0.ebuild
+++ b/sci-libs/cdf/cdf-3.8.0.ebuild
@@ -26,7 +26,7 @@ SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
 RESTRICT="bindist"
 
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 562d6a38efa7..693002578ed6 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,7 +1,9 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 AUX lapack-3.9.0-deprecated-headers.patch 7489 BLAKE2B c60377475eb9db34f9da1456358c6302fb9584212e74874d2f028fea895a272caa147fee64573d8aebfcfa58af4c6dab3e297b375af6353f5711b437e9a67533 SHA512 eae3c502354bc362612ede131f759f9f814ea80a8cf8597b553ac81d4d7e0910d4c75e56079ca012209f22c1f5a9160ac1f01fe7c7a6ca1238d245e9bc505f00
+DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
+EBUILD lapack-3.10.0.ebuild 3064 BLAKE2B 6505b36b4c85807bbc2661297375d2088c23f58f0721e067e8f5d8860c26c2e5e5701030f3832e92667ecbb062af220ad06743abe0c468bf2620007d43ddcebf SHA512 5eb93a0f2d35f82e513f74afa1b7d92404e79c9ac4ee75c1c2a5f651d638dca45872f94fa4fdfa8342c77cbf53e04e1a602fc664e46d6f0f903318f0b1082b03
 EBUILD lapack-3.8.0-r1.ebuild 2892 BLAKE2B 8aa139fdb09e219c539ade5c873dcc2f3d8e919daa4cefef4984484b0288799dbfddea33b74f2d5c88dbc7bab95109e4ad421aa32dde82059571cafb600fbbb0 SHA512 e8c1721460ed64ea9e1366c47fc36782f717d7bf87b3ab2ece988fe79373ec956f9c76cfcc729ddf5c984c3150ba4183ab5220da19f0fd3818a501b3f72c4aa1
 EBUILD lapack-3.8.0.ebuild 2840 BLAKE2B de601370663d749b99a65b28611ac24c73704c6ffa4998a5b430eba3ce70140de0a4ef3350cc564841fefd4d6fd0015602c481bfedc9165ab7e0fd894d46d72c SHA512 899e9d9e8687228ae8bb3f33badb7f2c102a3d1ec618d6236b35ffeaa2fcd6173e0b69bc2b60405cc319b5cf854738aaa6b28258442e7e242ff3ee697d70b1e1
 EBUILD lapack-3.9.0-r1.ebuild 3120 BLAKE2B ecafcba61f6320601aa3891f49f9a9a65eb5a029228d8d46cc0c44e06906f49922f94507c8d44751b701877b19ab42fc48047c6f49b8f827aa6b27cf8749d806 SHA512 49b6125480abf08914ebb1f8df85a1641edfa1d43e6f62a6c8e77ef9a38c40810692c7e02db1066d80611c11c85b7326613f88c1352bc8849846b7ef1d5431ed
diff --git a/sci-libs/lapack/lapack-3.10.0.ebuild b/sci-libs/lapack/lapack-3.10.0.ebuild
new file mode 100644
index 000000000000..baa91f484123
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.10.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+# TODO: static-libs 64bit-index
+IUSE="lapacke deprecated doc eselect-ldso test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!app-eselect/eselect-cblas
+	virtual/fortran
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	#"${FILESDIR}"/${PN}-3.9.0-build-tests.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index ab48a5117475..d5e4de96805f 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,6 +1,4 @@
 AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8
-DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
 DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
-EBUILD scikit-learn-0.22.2_p1-r1.ebuild 1636 BLAKE2B c0a9c93eff797279d36a47d6990b76dd290c6b170c982a7179557043d0a7f84b8eea598c925166ded61ab4acc8ea2d5ec2ddf61d0549b51170e7626521694d3c SHA512 08f222a4c3d0e250e6a2ddd73fb1073898812c29f3728618ca1a33b9c559a69bd84e2d949df8bd15b8066909677292e0ee2c13815efbd8fe33a06a8ebe8c0c02
-EBUILD scikit-learn-0.24.2.ebuild 1807 BLAKE2B d3208c01ce56f170091968c3c7c5b9a017b895135d349691f04d26a590d3525cbb0b979cdaefa263dc8c0648a4421c5f18c532f6425eaf5188ddd3f55b386940 SHA512 6e2758fe1dc095f5f23ef85d748839563015884512391ba6127b9ac50e9c5bd37b73dde9924af91dd369fe1719f6d5cd0162e12a8f0a09753ff51f919cb333af
+EBUILD scikit-learn-0.24.2.ebuild 1805 BLAKE2B 7068a1538013068d72b41fd0fdceee3a548a4f099276d8e83d61b326c6672fe30136de1452ade265f54e4ac70e5ef5cc80e35031be8f99fc799262b8e90464bc SHA512 56412248e6cd41865537eaf2b2d3606a850a8c58df3d816157ea9880bba4ada721bab09f70974a399a9adebe7910670faeb397e8575ce70247ca3ab41cbc9876
 MISC metadata.xml 736 BLAKE2B eb5c07231e185d9f9bd985209815f8515abf6bcff68e38563524542c8f591c1625711238b0d1b028776c8d658c32df3de4052a9dc88627a009eef5b8a7e68b5a SHA512 ee09304bdd96093bac49584a10b71650a3c764c28f03b851e197c31f8bbb6529b40433ad70f8100f33901b5b7fac8d349aad83ea10ad4770e16574484223af56
diff --git a/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
deleted file mode 100644
index 65589e8274da..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-MY_PV="${PV//_p/.post}"
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-#ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -rf sklearn/src || die "failed to remove bundled cblas"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	pushd "${TEST_DIR}/lib" >/dev/null || die
-	pytest -vv || die "testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-}
diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
index 7fe7e3be3a4f..c8cd5f268027 100644
--- a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 8296f8972b08..c86d52e0ff33 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,6 +16,6 @@ DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d
 DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4
-EBUILD vtk-8.2.0-r3.ebuild 10466 BLAKE2B cf908d91b4720e34ce18ef6c102324966da22054cf01d828320171acccf7c8d973bf923e1cf320ef34de02e750ebf0babaaa424ffb4f544dc6987e67b79f9fcc SHA512 386faa68182d280b75fa5274572b364f29f74d02033d1884b80500530cf34db059f25df9f290b7dda9d0258301a00ee914807a3c9458421228c0fb6f16ae8e3e
+EBUILD vtk-8.2.0-r4.ebuild 10378 BLAKE2B f07cb45f4a64b364c3b7f90235d6b4c8e1a2dc6051d6bb431d0f1455d58f887e5735313aaecf5a4498e2b7dc9eec87d67d6630c58821c4bbf9c7a2a567986837 SHA512 fd469be69433a394f2507b2fbf2144ca199c49efda5a27f7ab6d9a5a1507a3e21497b0f74bf7c256512e9ad896ce28af13faffe9871c6829618e7b918589efb6
 EBUILD vtk-9.0.1.ebuild 13690 BLAKE2B cc4d8764f7b37bd28c7490f51b10b21faaec308ad4768817a3c1aa55c8694187a40bb6ca18274402c1e5781c2a066d276abaca5429492364cef53cf4cbee566d SHA512 3dbb44fb1fef2c2004013d76e7f84f0dab470787943585dc48b0d9066197ff68bd3bac753e5d409e95b08a73c59be72e77ba705e8802de077e13d3e9e1fa2949
 MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1
diff --git a/sci-libs/vtk/vtk-8.2.0-r3.ebuild b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
index 63e8d2b3d602..5573bf1a4a73 100644
--- a/sci-libs/vtk/vtk-8.2.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r4.ebuild
@@ -335,12 +335,6 @@ src_install() {
 	# Stop web page images from being compressed
 	use doc && docompress -x /usr/share/doc/${PF}/doxygen
 
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		docinto .
-	fi
-
 	# install examples
 	if use examples; then
 		einfo "Installing examples"
@@ -351,10 +345,10 @@ src_install() {
 
 	# with MPI, rpaths are not deleted properly
 	if use mpi; then
-		chrpath -d "${ED}"/usr/$(get_libdir)/*.so.* || die
+		chrpath -d "${ED}"/usr/$(get_libdir)/*.so* || die
+		chrpath -d "${ED}"/usr/bin/* || die
 		if use python; then
 			chrpath -d "${ED}"/$(python_get_sitedir)/vtkmodules/*.so || die
-			chrpath -d "${ED}"/usr/bin/{,p}vtkpython || die
 		fi
 	fi