gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sci-libs
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
84 files changed, 1698 insertions, 1326 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c00464fa7389..d98e862ad8d6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 00313359808e..534acf76139b 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,5 +1,5 @@
 AUX amd-2.4.6-dash_doc.patch 488 BLAKE2B ed5872a7b0a2dc90bf69a2c74db9dc9379afd54831c87ce4ba577a3d70f2a5f2cdcda1a8ea2b1932974c18a45ab6b8043d0de8217054464881476c2041ca1e29 SHA512 7ac31c0b64b3986c6c6e44babe326c385eacb8a4a5c542ea1e7bf8b566eceb3e70a3d3cdf48a783507c9ecc1b21b53487523838d8f2936e0d2cbae688e30bee2
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6-r1.ebuild 883 BLAKE2B bda3740e815fd11367dcc4fc15d021191443d03e9718f3a06c2b2dd926b0a090182ac7151f36233c16e4019878dfa1cf4df59af2e2b051d2a25d8c1928b8169c SHA512 8cbfd1951855959f4993e0231d05b6c9ee6cd15b505921138a8cc0ecc821654c1405cb29a4f6605398a782d5e725727f21c71dd4d19db513dfefcca30652b416
-EBUILD amd-2.4.6.ebuild 770 BLAKE2B b4cd6552357a25f2bb55316203cd34af09909621a7336d3f6eb03af974d2fe00193b0459536af8d4d961c41f769ae77131395a568b75823ec05c40efbc7d61bb SHA512 1608629f558dc14a4cf4a99beeb9973b9475332902311e16cdc0fff2a51f0b950ff5e6f64f602190cb4c76481eac0425f2c665171ec68531c445c984989641ed
+EBUILD amd-2.4.6-r1.ebuild 906 BLAKE2B 342dfe81efbb87dadfd3806fb0eb31b04c311dc771ef5e25b15d7f2b17076ff9e8664ae63f5652b13c9dc612ddb6444ff3f0a65afb14898651cbc2e8d673958d SHA512 67c8d84c2636c582c179287faa4e44196eaef4c39e5bdaf54565fcf4ee65152e61934fa92533361c5ba7b9ce7e7405c0752d4fded945942ca88230119ff3b286
+EBUILD amd-2.4.6.ebuild 793 BLAKE2B f9a25cd98333d370724cc165fffd407b7a05b94751e91ba852dff3df31c5f82b3926fd5ba4eae1a144f28eb6bf1b69837db8ce59ac77cbcbd2396de0c5745a72 SHA512 e305f6c46b7d8bad62dd081099e0b281c66f2c8027132ea092c02a72b8ac838fe6fd6d2d157d472bb405f2ce39dccb75e00b7e154980d570293f6b569e9ac510
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index 9fee90d18266..d6fb2915b940 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+FORTRAN_NEEDED=fortran
 inherit autotools fortran-2
 
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 4bdd81880c37..06a5de3d6c83 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+FORTRAN_NEEDED=fortran
 inherit fortran-2
 
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
deleted file mode 100644
index 83b916a1bd62..000000000000
--- a/sci-libs/cbflib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cbflib-0.9.3.3-unbundle.patch 8308 BLAKE2B f0038332a7e9fbdd45cd2747046df1d1ec6e5bd44b7e6e3dbac0e14e2be2c0d69317a96c6ce395fd7310139b9445d73019bef7ee60a931c4a68cf2572400fcbc SHA512 21f39214e188cc8fb76326765aba7da4d15c1b70d41c193016733d5b3d14e499178e25c45c807e7c9cabaf3a7f4e3e97c5ed2a8b383472ec9f4e4cbea9b3522d
-DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
-EBUILD cbflib-0.9.3.3.ebuild 1250 BLAKE2B 5faa13aab5e256bbf11c5bc0f9c6950d130be7c6425560eabc17bc6d5a7b1510c1101e414bc8e293024a9539d2f0284e91018171465605ed3b04b3d5729041e1 SHA512 0c91b5d6a7e50ecd1db3d8d9d95529cfec0971a382818006680cf3efc42bdf26cf9101c87cbed3826549a0717fe8a60fafe7e5a2818a3a7aacba45a81857b750
-MISC metadata.xml 987 BLAKE2B cfa565415af63f3eeb4afd33c5147da2619a7d5be4f871582fcef209cb606e55b40d95bd3f9e4d6c1fa938e849afc46140e761ada76ecbc9b744d9c2a8601674 SHA512 1917afb5bc1a5dbcd9e5ec175ac355e79929fd5ece8be7ea8606bf1ef7329affffa56efa5281df7d2c2eea4e1e3ef224c8310ee8cbeb1c44a0b32b232dadf007
diff --git a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
deleted file mode 100644
index 4d53d2881cf6..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
-#	test? (
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-S=${WORKDIR}/${MY_P1}
-
-RDEPEND="sci-libs/hdf5:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_prepare() {
-	rm -rf Py* drel* dRel* ply* || die
-
-	append-fflags -fno-range-check
-
-	tc-export CC CXX AR RANLIB FC F77
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUNPACKED_DIRECTORY="${S}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ${PN} /usr/include/cbf
-}
diff --git a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
deleted file mode 100644
index ef24c4b94b22..000000000000
--- a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
+++ /dev/null
@@ -1,181 +0,0 @@
- CMakeLists.txt | 118 +++------------------------------------------------------
- 1 file changed, 6 insertions(+), 112 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75054d6..15bab99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran)
- enable_testing()
- set (CBF_CMAKE_DEBUG "ON")
- 
--set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing")
- 
- #
- #  User setable parameters
-@@ -530,42 +530,6 @@ find_package(ZLIB)
- 
- 
- 
--#Load external packages in build directory at cmake time
--add_subdirectory(${CBF__EXTERNAL_PACKAGES}  "${CBF__EXT_PKG}")
--
--find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}")
--if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
--  file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running")
--  CBF_DEBUG_MESSAGE("CMAKE_COMMAND:        ${CMAKE_COMMAND}")
--  CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR:    ${CBFlib_SOURCE_DIR} ")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR}
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running")
--endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
--
--
--file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*")
--CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH:  ${CBF_HDF5_LIBRARY_PATH}")
--file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*")
--CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}")
--
--if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
--  MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}")
--  MESSAGE(STATUS "Then rerun cmake")
--  MESSAGE(WARNING "Finishing run to make Makefiles")
--endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
--
--
- #
- # Data Directories
- #
-@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE	"http://downloads.sf.net/cbflib")
- set(CBF_DATAURLI  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz")
- set(CBF_DATAURLO  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz")
- set(CBF_DATAURLS  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz")
--#
--# Load and unpack the Data Files
--#
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS})
--#
--# Verify the checksums
--#
--file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*")
--file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*")
--foreach(loop_file ${CBF_DATADIRI_FILES} )
--  if (NOT "${loop_file}" MATCHES "[*.]md5")
--    file(MD5 "${loop_file}" loop_file_md5)
--    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
--    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--      message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
--    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--  endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
--foreach(loop_file ${CBF_DATADIRO_FILES} )
--  if (NOT "${loop_file}" MATCHES "[*.]md5")
--    file(MD5 "${loop_file}" loop_file_md5)
--    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
--    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--      message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
--    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--  endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
- 
- 
- #
-@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED  ${CBF_C_SOURCES})
- set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf")
- set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C)
- set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}")
--target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(cbf_shared hdf5)
- 
- #
- # Build the static and shared IMG libraries
-@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib")
- add_library(img_shared SHARED  ${CBF__EXAMPLES}/img.c)
- set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img")
- set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C)
--target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(img_shared hdf5 m )
- 
- 
- #
-@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH})
- #
- #  C and C++ examples
- #
--CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}")
--CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "")
- 
- 
- 
-@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary     fcb_static)
- #
- # install
- #
--install (TARGETS makecbf DESTINATION bin)
--install (TARGETS img2cif DESTINATION bin)
--install (TARGETS cif2cbf DESTINATION bin)
--install (TARGETS adscimg2cbf DESTINATION bin)
--install (TARGETS cbf2adscimg DESTINATION bin)
--install (TARGETS changtestcompression DESTINATION bin)
--install (TARGETS convert_image DESTINATION bin)
--install (TARGETS convert_minicbf DESTINATION bin)
--install (TARGETS minicbf2nexus DESTINATION bin)
--install (TARGETS cbf_template_t DESTINATION bin)
--install (TARGETS testcell DESTINATION bin)
--install (TARGETS sauter_test DESTINATION bin)
--install (TARGETS sequence_match DESTINATION bin)
--install (TARGETS tiff2cbf DESTINATION bin)
--install (TARGETS cbf_static DESTINATION lib)
--install (TARGETS cbf_shared DESTINATION lib)
--install (TARGETS fcb_static DESTINATION lib)
--install (TARGETS fcb_shared DESTINATION lib)
--install (TARGETS img_static DESTINATION lib)
--install (TARGETS img_shared DESTINATION lib)
-+install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX})
- install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
- install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
- 
-@@ -914,10 +812,6 @@ endif ()
- #
- # tests  -- to be extended
- #
--add_test(NAME cbftest_makecbf
--  COMMAND ${CMAKE_COMMAND}
--    -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf
--    -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake)
- add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc)
- add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5)
- add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree)
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
deleted file mode 100644
index e0080f59068f..000000000000
--- a/sci-libs/cbflib/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription>
-CBFLIB is a library of ANSI-C functions providing a simple mechanism
-for accessing Crystallographic Binary Files (CBF files) and Image-supporting
-CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for
-mmCIF files. Starting with this release, CBFLIB performs validation checks
-on reading of a CBF. If a dictionary is provided, values will be validated
-against dictionary ranges and enumerations. Tags missing under parent-child
-relationships or category key requirements will be reported. CBFlib provides
-functions to create, read, modify and write CBF binary data files and imgCIF
-ASCII data files.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cbflib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 0434fb753764..7cb03fb408ca 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,3 +1,3 @@
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
-EBUILD ceres-solver-1.14.0.ebuild 2320 BLAKE2B 1371d359bcb5765179d5f20bb7af27df05c4c5d0680f193b10a4a9ee1001611ff625f86080d440b8e64502aea74cc1d5558b127da315d8a9bee6a81973dbb530 SHA512 c95e5ff53e84131030575eb517f13fd1a14aad098802b32325e11d9187a708c3c54440d5cfc652460f690be90983a4759833fc1b932a0274146b455cb6204a18
+EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a
 MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa
diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 30cce977960d..4bd35e1b7fc8 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
@@ -23,8 +23,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
 	>=dev-cpp/eigen-3.3.4:3
 	doc? (
-		dev-python/sphinx
-		dev-python/sphinx_rtd_theme
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
 	lapack? ( virtual/pkgconfig )
 "
diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest
index 2784662aa182..43c0218ff534 100644
--- a/sci-libs/coinor-couenne/Manifest
+++ b/sci-libs/coinor-couenne/Manifest
@@ -1,3 +1,4 @@
+AUX coinor-couenne-0.5.8-fix-build-with-gcc11.patch 1497 BLAKE2B edc1886a22c886a667181b42bd8d764f368af22c424a96d326a878104a01600a7b1f155c6a0ae66ccd0b09df39a44d8e6e6acb02ead8cd8c359cd7e173b02463 SHA512 f5a2b371129b5e50567d06794a4907cfc64c688518f931518b653159929c322ec070298d66e45d7443cd9af1cb394d9349b5a8322aa23f4bdb0eff2e3fb1bd9a
 DIST coinor-couenne-0.5.8.tar.gz 1321163 BLAKE2B 841a4af3d76fd308ef5abe481157fa1ecf307e7fae03fa0cb931483be74443febc7eb1ba7e85f47c3dca5d5447a74ae86dc0f3dbeb6c0f0032f543861462e0a1 SHA512 bf474503bd77be6536f9d00b40ff45041b3976ea2167d64e667fa580aa8ed6a383861ec67d57eec83623b6542f7779ed7d50d9b72347c3f77ef36a194a3f9e71
-EBUILD coinor-couenne-0.5.8-r1.ebuild 1247 BLAKE2B a0f2baa8d2708464933dd5b10150d83cca76401848a24a3f392d964307e0b0510a5116608925bb30b77fff7691054961bf45c7b73ac4152976dec7e5504c10e5 SHA512 3b6d1de91b30e507a032c467cd70c11fbba63e23e017e074ae035ada6f9882498115373ab8bc562eac92b4f724b78907e41db3210f7dbb8f9cce3ecf3dfac2a0
+EBUILD coinor-couenne-0.5.8-r1.ebuild 1314 BLAKE2B 18b8c8fccced626330a6aabd72c1f1656951c8710a6f85a1481e6f50caedbaef664b4ab5a30daa7adbd9950281810e3db2af95d4f4b5c0bc8f5c359184905b88 SHA512 b3f67f357dce7aa682eb1684ae18012aa76f7868cdf98aff457489ec31b9b9906d2068e92962cbe57a924f9893f95fa51a89adaccab6cda7585240033ade0f50
 MISC metadata.xml 700 BLAKE2B 945c3aafd3cc6b2280c64b664cc9a49ccc5be8b9d6dd33c4bb4730c7367e1ad15b25f9fefb968b69f29f2b5cf1e57d8cae3f990db8948d8436385bea67e34212 SHA512 641fa4e5a9bd4f66e42aa86960141e3de0d8f68bc9b01d8235a6be90c1b2c60a262221b0253a366491ed161b8acf114df8549affbc30acd250b89ca3d65105fc
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
index 63bb046a3073..cd577558b1c2 100644
--- a/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
@@ -32,6 +32,10 @@ BDEPEND="
 		virtual/latex-base
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.8-fix-build-with-gcc11.patch
+)
+
 src_prepare() {
 	default
 	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
diff --git a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
new file mode 100644
index 000000000000..339ce1a0e903
--- /dev/null
+++ b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/792798
+
+From debc5de2d0ac9654c01db080448df064b808c56e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 04:24:22 +0000
+Subject: [PATCH] Fix build with GCC 11
+diff --git a/src/problem/CouenneProblem.hpp b/src/problem/CouenneProblem.hpp
+index e5b54a5..db28cfd 100644
+--- a/src/problem/CouenneProblem.hpp
++++ b/src/problem/CouenneProblem.hpp
+@@ -74,7 +74,7 @@ class Nauty;
+ #define COUENNE_EPS_SYMM 1e-8
+ 
+   struct myclass0 {
+-    inline bool operator() (register const Node &a, register const Node &b) {
++    inline bool operator() (register const Node &a, register const Node &b) const {
+ 
+       return ((               a.get_code  () <  b.get_code  ())                     ||
+ 	      ((              a.get_code  () == b.get_code  ()                      &&
+@@ -120,7 +120,7 @@ class Nauty;
+     
+       
+   struct myclass {
+-    inline bool operator() (register const  Node &a, register const Node &b) {
++    inline bool operator() (register const  Node &a, register const Node &b) const {
+       return (a.get_index() < b.get_index() );
+     }
+   };
+
+--- a/src/cut/sdpcuts/CouenneMatrix.hpp
++++ b/src/cut/sdpcuts/CouenneMatrix.hpp
+@@ -69,7 +69,7 @@ namespace Couenne {
+ 
+     struct compare_scalars {
+       inline bool operator() (register CouenneScalar * const &a, 
+-			      register CouenneScalar * const &b)
++			      register CouenneScalar * const &b) const
+       {return a -> getIndex () < b -> getIndex ();}
+     };
+ 
+-- 
+2.32.0
+
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 0d869d4a9370..a0eb945abb0f 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,3 +1,3 @@
 DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
-EBUILD dcmtk-3.6.5.ebuild 1910 BLAKE2B 0411da5d5aa764098ce8793d5c04d2b5f96a499912c85bb4ad3a6a4b38b8a4f722a1e17d25709570069106a24eba84a648581e3060ecb1c6a548a9b66320bc07 SHA512 c4097e382454cc3b8477bc076d5d2d416105a17a30a30647fb0c751c0b5474eaccbd7dd58ea1536517f90a361f9c2bb6fb7a362b1b60a1483d325f54ecb15d23
+EBUILD dcmtk-3.6.5.ebuild 1912 BLAKE2B ee9912659850959cee5e30bfa44bdc50d0595af0948de519df2c59efd6917ce570273ad3f2386c920a6bae2e81e764b269de35db932f5d4fe7fbcd616c0e3bf3 SHA512 ab004503170a2a9145a3b1aded2cfd72fc8fd6c57a6bd9510a25ab305c948337099ba7c22da34b90571e44a81bf23540157d33eac4313a8dc431f2956a89d9ad
 MISC metadata.xml 227 BLAKE2B ed3fc2ad8c0bb2658fb120d3a54c69b5f03eb006f601b6aa8b45a48d73ab523ece0fa1efcee0ebd8fa6f134f77ff33f957dad0954d5c0fcef98e56179e24c041 SHA512 381afcd62a7b7d54c6108ee892d3609de2c183713947c7f04fad1e6c69a49866ee30265e313c72d446e4f8cab9296160f7f3d1797f9a37430fc8c4e02f50a166
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 17f4eb3f34de..3a0f52103c40 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,7 +51,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EROOT}/etc"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
 		-DDCMTK_WITH_ICU=ON
 		-DDCMTK_WITH_TIFF=$(usex tiff)
 		-DDCMTK_WITH_PNG=$(usex png)
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 08bf8c916684..0cde14dd9b54 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -2,6 +2,9 @@ AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aae
 AUX dealii-9.2.0-fix-boost-include-file.patch 533 BLAKE2B f8aad2b17a3083da8c1aaf5461e5cf2b4aac2e78b34c46c7a3b965495a9c263687db6d75498a404be44f09bb952e7eeea0ac005da047f98ae526edd5ee8af473 SHA512 9a05e7787b7352c59e4756729ca4080f6c2a21bcd84429f2ed22d3fcd8e6d7183cb5686a7d88b0fd5868b2bfe53130d1fb2e9c3940ca0ccb8c8119a5e7532625
 DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
-EBUILD dealii-9.2.0.ebuild 5189 BLAKE2B 536b0a1974c989ccf822846c45f99cfd665d5ea5132b0650319d55e562b1ac5e1e80fbaa880f2b0765346bc0d39d5fef1e1af5a51f09eaa0be06ccb353318c08 SHA512 7ebd8a28a7dc806a4e235ed3e93b756e1af5b2e488e61aa3cd3bb92c6b1ca9c2c710f7d417c221b58796f1d91e77bee7e1490c8bc286d36c13bdae18b4e24e09
-EBUILD dealii-9999.ebuild 4993 BLAKE2B 4c897f1fcd5af319ce209cee9cde4634ee30f9669f2094218cc481f076c3f5d1543101c83a6e64857b7191f73ef2fba4b50e0a5fe0741072d8a7e38cfd60adbe SHA512 0ac3d5e2333d5d3cb3a20c5f0c7ed2ca6c11cc55f976e6b1b4348acaa64071268a5e3ef4b71e9a45108f9d92dd719e1d0975bfb0d40e0ae6f13a5db023f36b78
+DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
+DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
+EBUILD dealii-9.2.0-r1.ebuild 5158 BLAKE2B 943d46bfc24058b7f57d4e0644c5808fe9b7123da2f3c527712c2d50a7774890a6a1e004b500e488489576ec4a55537d5ec2f861b2bd95335db7489aacb17624 SHA512 55670d51feaf635cdab52f3745be686d6acaecc13b4a58e673ce92f865adde68adc224623f44e27fb9cef8e7505b02fbb6a96710daaca5d28bed8d4029a498ed
+EBUILD dealii-9.3.0-r1.ebuild 5288 BLAKE2B 8bef90aca441b30b84d8b755257f1bfc9384121f3621337b61830b512a06c2b0b247a3ed49e0deede86360af0da0df6e0052ce182f35e879d1d1544cd418f452 SHA512 e006d8ec3699468c66ee6a565174d9617e6f26b48e71074fa7cb37931b0222ed4aef0a5cb9a3ec302175d3bec108b6f1ee9623aff8b91230e15940e71abf897b
+EBUILD dealii-9999.ebuild 5339 BLAKE2B 4c92f7953990bd19ff1ec7144b46ffff5ba04d9dfe6a1483c5b7c66ae9cba3ea63c79a616a8ce5801b4a69044ed164abc00c57319a78611d388450d686a6f42d SHA512 2dc18b083efd54210ef6b04d8f6d9aa810bef9395f1e043ab57d0e938cd13a99dcbf2055118d3851c3ebc45e4aa76dd438dac65096d9dd61dd304ad61913d53c
 MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
index 00d5f0fe2429..468137f5fed7 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="dev-libs/boost
 	cuda? ( dev-util/nvidia-cuda-sdk )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
-	gsl? ( sci-libs/gsl )
+	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
 	metis? ( >=sci-libs/parmetis-4 )
@@ -109,7 +109,6 @@ src_configure() {
 		-DDEAL_II_WITH_MPI="$(usex mpi)"
 		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
 		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
-		-DOPENCASCADE_DIR="${CASROOT}"
 		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
 		-DDEAL_II_WITH_P4EST="$(usex p4est)"
 		-DDEAL_II_WITH_PETSC="$(usex petsc)"
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
new file mode 100644
index 000000000000..faa68c5b29d2
--- /dev/null
+++ b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+# deal.II uses its own FindLAPACK.cmake file that calls into the system
+# FindLAPACK.cmake module and does additional internal setup. Do not remove
+# any of these modules:
+CMAKE_REMOVE_MODULES_LIST=""
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="https://www.dealii.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+		doc? (
+			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
+			)"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="
+	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
+	+lapack metis mpi muparser opencascade p4est petsc
+	scalapack slepc +sparse static-libs sundials symengine trilinos
+"
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE="
+	p4est? ( mpi )
+	slepc? ( petsc )
+	trilinos? ( mpi )"
+
+# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
+# the names of the correct include and library directories are not easily
+# accessible. Just fix the version for the time being.
+CAS_VERSION=7.5.1
+
+RDEPEND="dev-libs/boost
+	app-arch/bzip2
+	sys-libs/zlib
+	dev-cpp/tbb
+	adolc? ( sci-libs/adolc )
+	arpack? ( sci-libs/arpack[mpi=] )
+	assimp? ( media-libs/assimp )
+	cuda? ( dev-util/nvidia-cuda-sdk )
+	ginkgo? ( sci-libs/ginkgo )
+	gmsh? ( sci-libs/gmsh )
+	gsl? ( sci-libs/gsl:= )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? ( >=sci-libs/parmetis-4 )
+	mpi? ( virtual/mpi )
+	muparser? ( dev-cpp/muParser )
+	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
+	p4est? ( sci-libs/p4est[mpi] )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	scalapack? ( sci-libs/scalapack )
+	slepc? ( sci-mathematics/slepc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	sundials? ( sci-libs/sundials:= )
+	symengine? ( >=sci-libs/symengine-0.4:= )
+	trilinos? ( sci-libs/trilinos )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
+src_configure() {
+	# deal.II needs a custom build type:
+	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
+
+	local mycmakeargs=(
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
+		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
+		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
+		-DDEAL_II_SHARE_RELDIR="share/${PN}"
+		-DDEAL_II_WITH_ZLIB=ON
+		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
+		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
+		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
+		-DDEAL_II_WITH_CUDA="$(usex cuda)"
+		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
+		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
+		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
+		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
+		-DDEAL_II_WITH_GSL="$(usex gsl)"
+		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
+		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
+		-DDEAL_II_WITH_METIS="$(usex metis)"
+		-DDEAL_II_WITH_MPI="$(usex mpi)"
+		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
+		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
+		-DDEAL_II_WITH_P4EST="$(usex p4est)"
+		-DDEAL_II_WITH_PETSC="$(usex petsc)"
+		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
+		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
+		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
+		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
+		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
+		-DDEAL_II_WITH_TBB=ON
+		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
+	)
+
+	# Do a little dance for purely cosmetic "QA" reasons.
+	use opencascade && mycmakeargs+=(
+		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}"
+		-DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}"
+	)
+
+	# Do a little dance for purely cosmetic "QA" reasons. The build system
+	# does query for the highest instruction set first and skips the other
+	# variables if a "higher" variant is set
+	if use cpu_flags_x86_avx512f; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc && [[ ${PV} != *9999* ]]; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+			"${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake_src_install
+
+	# decompress the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 61619c7dc3d0..d52bf8a2523b 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake multilib
 
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
@@ -40,23 +40,29 @@ REQUIRED_USE="
 	slepc? ( petsc )
 	trilinos? ( mpi )"
 
+# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where
+# the names of the correct include and library directories are not easily
+# accessible. Just fix the version for the time being.
+CAS_VERSION=7.5.1
+
 RDEPEND="dev-libs/boost
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
+	dev-cpp/tbb
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
 	cuda? ( dev-util/nvidia-cuda-sdk )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
-	gsl? ( sci-libs/gsl )
+	gsl? ( sci-libs/gsl:= )
 	hdf5? ( sci-libs/hdf5[mpi=] )
 	lapack? ( virtual/lapack )
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
-	opencascade? ( sci-libs/opencascade:* )
+	opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
 	scalapack? ( sci-libs/scalapack )
@@ -105,7 +111,6 @@ src_configure() {
 		-DDEAL_II_WITH_METIS="$(usex metis)"
 		-DDEAL_II_WITH_MPI="$(usex mpi)"
 		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
-		-DOPENCASCADE_DIR="${CASROOT}"
 		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
 		-DDEAL_II_WITH_P4EST="$(usex p4est)"
 		-DDEAL_II_WITH_PETSC="$(usex petsc)"
@@ -116,12 +121,16 @@ src_configure() {
 		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
 		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
 		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
+		-DDEAL_II_WITH_TBB=ON
 		-DDEAL_II_WITH_TASKFLOW=ON
 		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
 	)
 
 	# Do a little dance for purely cosmetic "QA" reasons.
-	use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
+	use opencascade && mycmakeargs+=(
+		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}"
+		-DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}"
+	)
 
 	# Do a little dance for purely cosmetic "QA" reasons. The build system
 	# does query for the highest instruction set first and skips the other
@@ -134,7 +143,7 @@ src_configure() {
 		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
@@ -147,7 +156,7 @@ src_install() {
 			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
 			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
 	fi
-	cmake-utils_src_install
+	cmake_src_install
 
 	# decompress the installed example sources:
 	use examples && docompress -x /usr/share/doc/${PF}/examples
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 747138e59ad3..94a65f8252bb 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,12 +1,4 @@
-AUX fftw-2.1.5-as-needed.patch 4082 BLAKE2B bdf1cda8cbc4127c96785ed57a827cba8e468dbcc9c1351c20b7dcad9544d75d48a4c9adb21f24972c455b67f14fe01c02bfc22190a7b6ffa73cd6dbd58a43ce SHA512 9dc1b911bc8360b43c8b604cb3e823abd7c958e4c0aba596daa5fbd2c79d774f3a925d5fa253361f6b87c0e40be57e615bb47c52766acaf8be4bf1ef0787bc0b
-AUX fftw-2.1.5-cc.patch 546 BLAKE2B 3d5891e1b3b299e2c3b1d4db6bbcaaf65884c03a4e6fc79b61ce900cc4f68a7e80226229afd3cd33abb0c706781aaec6abfb30ce2d2e09347e4c593e4dd5a4cd SHA512 f21ba12ec727a023d41df95b24d03273d416888b21f56dde8d2a256d15b9543a091a02f7100e86196bb7a38492d470b58ab293fed58a21e2417e2427f786368a
-AUX fftw-2.1.5-configure.in.patch 8135 BLAKE2B 07b882acf4b065ca53803829ddddac28dbcd97e4850e2f9294bccc0024e80306f61b87c2f0336e1191852972e50151b6307d0f53248391830aa80a8bcff9c531 SHA512 ac8bdb6772c64b30a1da4308e612f09bca579b5608f8ddf216ee40db63a458218a7cc7c5df7655c2572a6e2c0c5e497a5e81dc4bdbd3f3e86c153b7e160cfcfd
-AUX fftw-2.1.5-no-test.patch 1028 BLAKE2B 878780d275d1454edff28c6834c118981e8ecbdf837d5f7205d5bed4df835d9e368cbd14eba4ae79baded27fadb0153d76d47c9bfc20960920955ad9e5d9c233 SHA512 cfc1efd51c5bd7d7f90ae823cb255192a9935ec436eeea60de41854348ce5ff5eb451a1ef00314caacbdc61f3a8b6f701693859237c9254e555ec817ee30cd45
-AUX fftw-2.1.5-parallel-tests.patch 3720 BLAKE2B 6b18c68e121035c517cf8eae245d32a1b99f51fc01f3baa0b96351f0a0833714c89798fc06b231c3acda6131cb6e0fe9782a0d1c34c76eac04eee8d0b9144857 SHA512 2e02c69dcbae6c11b8bdf0edb1a49c9754c9a599438e1073eb2bcff04c52c38c1e76eb352f21957a0518d61ee2e32d302e5624e234d28344fc99036313394d3e
-AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a19e5e75734a5c7d7901b8464403ceb675efcf6e43b00f10779776a8e9789956bb77e937b754c0a070e15821f4877 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214
-DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
-EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb
-EBUILD fftw-3.3.9.ebuild 4054 BLAKE2B 11a7746384d1a61d24b66deffa2e20a0e030cecbba14d138196ba99a72d4d37248771607ca2a33af41d42103ca09365c1d66a0b226469eefabd94f1b0baa7f17 SHA512 8e2b8522398387550289b4cdd46ce959ca94577c8b94a5c3d63b676acd0225782210e694efea2423a67c49ffd1bcc2a7d4fdc4a22d816120dd65140f50d0beba
+EBUILD fftw-3.3.9.ebuild 4136 BLAKE2B aa00e8fc60c612cc764ee31628c07217ae099c52162e408bd12b6a44d9640545490c136b47819db591a44e14bbaadecb290effce0fd5ed495dbe458d2e6cab3a SHA512 0a66d6d31fe30607f9102625b5b5b8866a1c89eed7946114996eb1bd18ed44ce65ae269c5e8b7651e448d10de8f3ac235475229cef848d7169fba6a226996aa4
 EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47
-MISC metadata.xml 1081 BLAKE2B ef31000f7d7f02b98d2b982ecfdf9e1560fbce84098b4b1ff8964e35be53b4ac0a4b098c03f07557316de988b6791949fef7e4900d23e9d922293143e42ec1e2 SHA512 bcbac3f302c6c064782c8567a33f2b67f7a03e3efc02e8a2fc8f023286ea91c93b943b92ad7ddd48ec5a6cc5c33f8f2b6c35d985b6f8b361b41f5e9bcf243bfc
+MISC metadata.xml 959 BLAKE2B 91fa1956cbe25068165585a0e09bdf8e6c75c30a80ea27df46b99c9336ecdf1db13c49b62ea111a70eb2b5a456386ae745a77f28cf616858c8dbb4015f26735a SHA512 b3e3b65573de896dc2a5e3481a885dd172e3422858d9f967758dc9663d84e5809116aa41371e704d65173c400c03240798cea892e7ce5d211547d6db0a7f493e
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
deleted file mode 100644
index 0d4eae2fdb7b..000000000000
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools flag-o-matic fortran-2 multibuild toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-LICENSE="GPL-2+"
-SLOT="2.1"
-IUSE="doc float fortran mpi openmp threads static-libs"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-configure.in.patch
-	"${FILESDIR}"/${P}-no-test.patch
-	"${FILESDIR}"/${P}-cc.patch
-	"${FILESDIR}"/${P}-texinfo5.1.patch
-	"${FILESDIR}"/${P}-parallel-tests.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double )
-}
-
-src_prepare() {
-	default
-
-	# fix info files
-	local infofile
-	for infofile in doc/fftw*info*; do
-		cat >> ${infofile} <<-EOF || die
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	done
-
-	mv configure.{in,ac} || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	eautoreconf
-
-	# 'FAQ' is actually a dir and causes issues with einstalldocs
-	rm -r FAQ || die
-
-	multibuild_copy_sources
-}
-
-fftw_src_configure() {
-	local myconf=(
-		--with-gcc=$(tc-getCC)
-		--enable-shared
-		--enable-type-prefix
-		--enable-vec-recurse
-		$(use_enable fortran)
-		$(use_enable mpi)
-		$(use_enable static-libs static)
-		$(use_enable x86 i386-hacks)
-		$(use_with openmp)
-	)
-
-	if use openmp || use threads; then
-		myconf+=( --enable-threads )
-	else
-		myconf+=( --disable-threads )
-	fi
-
-	[[ $MULTIBUILD_VARIANT == single ]] && myconf+=( --enable-float )
-
-	econf "${myconf[@]}"
-}
-
-src_configure() {
-	# this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath sse
-
-	# here I need (surprise) to increase optimization:
-	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if use x86; then
-		is-flag -fomit-frame-pointer || append-flags -fomit-frame-pointer
-	fi
-	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
-
-	multibuild_foreach_variant run_in_build_dir fftw_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir default_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant run_in_build_dir default_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/*.{html,gif} )
-	multibuild_foreach_variant run_in_build_dir default_src_install
-
-	doheader fortran/fftw_f77.i
-
-	create_fftw_symlinks() {
-		local i f letter=$1
-		for i in fft rfft; do
-			for f in "${ED%/}"/usr/{include,$(get_libdir)}/*${letter}${i}*; do
-				ln -s $(basename ${f}) ${f/${letter}${i}/${i}} || die
-			done
-		done
-	}
-	create_fftw_symlinks $(usex float s d)
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 32ce75db90af..cb50c0ff6875 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -147,13 +147,16 @@ src_install() {
 		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
-	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+	augment_pc_files() {
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+			local u
+			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+			done
 		done
-	done
+	}
+	multilib_foreach_abi augment_pc_files
 
 	# fftw uses pkg-config to record its private dependencies
 	find "${ED}" -name '*.la' -delete || die
diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
deleted file mode 100644
index 63f46dccc4fd..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/rfftw/Makefile.am
-+++ b/rfftw/Makefile.am
-@@ -18,6 +18,7 @@
- 					 rfftw.h                   
- 
- lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@fftw.la
- MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
- DISTCLEANFILES = srfftw.h drfftw.h
- 
---- a/threads/Makefile.am
-+++ b/threads/Makefile.am
-@@ -28,6 +28,10 @@
-                              -version-info @SHARED_VERSION_INFO@ \
-                              -rpath $(libdir)
- 
-+lib@FFTW_PREFIX@fftw_threads_la_LIBADD = \
-+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
-+	 		  @THREADLIBS@
-+
- @FFTW_PREFIX1@fftw_threads.h: fftw_threads.h
- 	rm -f $@
- 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_threads.h > $@
-@@ -49,6 +53,11 @@
-                               -version-info @SHARED_VERSION_INFO@ \
-                               -rpath $(libdir)
- 
-+lib@FFTW_PREFIX@rfftw_threads_la_LIBADD = \
-+                          $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
-+                          $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
-+			  @THREADLIBS@
-+
- @FFTW_PREFIX1@rfftw_threads.h: rfftw_threads.h
- 	rm -f $@
- 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_threads.h > $@
---- a/mpi/Makefile.am
-+++ b/mpi/Makefile.am
-@@ -28,6 +28,9 @@
-                          -version-info @SHARED_VERSION_INFO@ \
-                          -rpath $(libdir)
- 
-+lib@FFTW_PREFIX@fftw_mpi_la_LIBADD = \
-+                    @MPILIBS@ $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
-+
- @FFTW_PREFIX1@fftw_mpi.h: fftw_mpi.h
- 	rm -f $@
- 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/fftw_mpi.h > $@
-@@ -39,32 +42,38 @@
-                           -version-info @SHARED_VERSION_INFO@ \
-                           -rpath $(libdir)
- 
--@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h
-+lib@FFTW_PREFIX@rfftw_mpi_la_LIBADD = \
-+                       @MPILIBS@ \
-+		        $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
-+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
-+
-+@FFTW_PREFIX1@rfftw_mpi.h: rfftw_mpi.h 	
- 	rm -f $@
- 	sed 's/\"fftw/\"@FFTW_PREFIX@fftw/g;s/\"rfftw/\"@FFTW_PREFIX@rfftw/g' $(srcdir)/rfftw_mpi.h > $@
- 
- CLEANFILES = @FFTW_PREFIX1@fftw_mpi.h @FFTW_PREFIX1@rfftw_mpi.h
- 
- test_sched_SOURCES = test_sched.c
--test_sched_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
--                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
-+test_sched_LDADD =  @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
-+                   $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
- 
- test_transpose_mpi_SOURCES = test_transpose_mpi.c
--test_transpose_mpi_LDADD = lib@FFTW_PREFIX@fftw_mpi.la \
--                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
-+test_transpose_mpi_LDADD = @MPILIBS@ lib@FFTW_PREFIX@fftw_mpi.la \
-+                           $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
- 
- fftw_mpi_test_SOURCES = fftw_mpi_test.c
- fftw_mpi_test_LDADD = ../tests/test_main.o \
-+		      @MPILIBS@ \
-                       lib@FFTW_PREFIX@fftw_mpi.la \
--                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la @MPILIBS@
-+                      $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
- 
- rfftw_mpi_test_SOURCES = rfftw_mpi_test.c
- rfftw_mpi_test_LDADD = ../tests/test_main.o \
-+		      @MPILIBS@ \
-                        lib@FFTW_PREFIX@rfftw_mpi.la \
-                        lib@FFTW_PREFIX@fftw_mpi.la \
- 		       $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
--                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la \
--                       @MPILIBS@
-+                       $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
- 
- # for some reason, automake tries to use autoheader in order to
- # generate config.h.in, and fails because config.h.in is GNU-lly
---- a/mpi/test_sched.c
-+++ b/mpi/test_sched.c
-@@ -27,6 +27,8 @@
-      int **sched;
-      int npes = -1, sortpe = -1, steps;
- 
-+     /* needed to link with proper mpi libs */
-+     MPI_Init(&argc,&argv);
-      if (argc >= 2) {
- 	  npes = atoi(argv[1]);
- 	  if (npes <= 0) {
-@@ -121,5 +123,6 @@
- 	  }
-      }
- 
-+     MPI_Finalize();
-      return 0;
- }
diff --git a/sci-libs/fftw/files/fftw-2.1.5-cc.patch b/sci-libs/fftw/files/fftw-2.1.5-cc.patch
deleted file mode 100644
index aa5c6db038c8..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-cc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -25,6 +25,8 @@
- AC_ARG_WITH(gcc, [  --with-gcc              use gcc instead of the native compiler cc], ok=$withval, ok=no)
- if test "$ok" = "yes"; then
- 	CC=gcc
-+else
-+	CC=$withval
- fi
- 
- AC_ARG_ENABLE(float, [  --enable-float          compile fftw for single precision], enable_float=$enableval, enable_float=no)
-@@ -96,6 +96,7 @@
- AM_PROG_LIBTOOL
- AC_CHECK_PROG(PERL, perl, perl, echo perl)
- AC_SUBST(PERL)
-+AC_SUBST(CC)
- 
- dnl -----------------------------------------------------------------------
- 
diff --git a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch b/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
deleted file mode 100644
index 7abe3e751d5d..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-configure.in.patch
+++ /dev/null
@@ -1,226 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1,6 +1,8 @@
-+
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(fftw/planner.c)
- AM_INIT_AUTOMAKE(fftw, 2.1.5)
-+AM_MAINTAINER_MODE
- 
- dnl This is the version info according to the libtool versioning system.
- dnl It does *not* correspond to the release number.
-@@ -27,7 +29,7 @@
- 
- AC_ARG_ENABLE(float, [  --enable-float          compile fftw for single precision], enable_float=$enableval, enable_float=no)
- if test "$enable_float" = "yes"; then
--	AC_DEFINE(FFTW_ENABLE_FLOAT)
-+	AC_DEFINE(FFTW_ENABLE_FLOAT,1,[Compile fftw for single precision])
- fi
- 
- FFTW_PREFIX=""
-@@ -56,27 +58,27 @@
- 
- AC_ARG_ENABLE(i386-hacks, [  --enable-i386-hacks     enable gcc/x86 specific performance hacks], ok=$enableval, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(FFTW_ENABLE_I386_HACKS)
-+	AC_DEFINE(FFTW_ENABLE_I386_HACKS,1,[Enable x86 specific performance hacks])
- fi
- 
- AC_ARG_ENABLE(pentium-timer, [  --enable-pentium-timer  enable high resolution Pentium timer], ok=$enableval, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER)
-+	AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER,1,[Enable high resolution Pentium timer])
- fi
- 
- AC_ARG_ENABLE(debug, [  --enable-debug          compile fftw with extra runtime checks for debugging], ok=$enableval, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(FFTW_DEBUG)
-+	AC_DEFINE(FFTW_DEBUG,1,[Compile with extra rutime checks for debugging])
- fi
- 
- AC_ARG_ENABLE(debug-alignment, [  --enable-debug-alignment          enable runtime checks for alignment on x86], ok=$enableval, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(FFTW_DEBUG_ALIGNMENT)
-+	AC_DEFINE(FFTW_DEBUG_ALIGNMENT,1,[Enable rutime checks for alignment on x86])
- fi
- 
- AC_ARG_ENABLE(vec-recurse, [  --enable-vec-recurse    enable experimental performance hack], ok=$enableval, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE)
-+	AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE,1,[Enable experimental performance hack])
- fi
- 
- dnl -----------------------------------------------------------------------
-@@ -90,7 +92,6 @@
- ACX_PROG_CC_EGCS
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
- AC_PROG_LN_S
- AM_PROG_LIBTOOL
- AC_CHECK_PROG(PERL, perl, perl, echo perl)
-@@ -115,7 +116,7 @@
- dnl -----------------------------------------------------------------------
- 
- AC_SUBST(SHARED_VERSION_INFO)
--AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION")
-+AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION",[Fftw Version])
- 
- # Get the version number that will be appended to shared libraries:
- SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'`
-@@ -123,7 +124,7 @@
- 
- ACX_PROG_CC_MAXOPT
- 
--ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK), [
-+ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK,1,[Gcc align stack]), [
- 	if test "$enable_i386_hacks" = yes; then
- 	if test "${acx_gcc_stack_align_bug-no}" = yes; then
- 		# we are using a gcc with a stack alignment bug, and we should
-@@ -183,7 +184,7 @@
- AC_TRY_LINK([#include <math.h>
- ], if (!isnan(3.14159)) isnan(2.7183);, ok=yes, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(HAVE_ISNAN)
-+	AC_DEFINE(HAVE_ISNAN,1,[Have isnan])
- fi
- AC_MSG_RESULT(${ok})
- 
-@@ -196,7 +197,7 @@
- #endif
- ], [hrtime_t foobar;], ok=yes, ok=no)
- if test "$ok" = "yes"; then
--	AC_DEFINE(HAVE_HRTIME_T)
-+	AC_DEFINE(HAVE_HRTIME_T,1,[Have hrtime_t type])
- fi
- AC_MSG_RESULT(${ok})
- 
-@@ -205,7 +206,7 @@
- 
- AC_ARG_ENABLE(unsafe-mulmod, [  --enable-unsafe-mulmod  risk overflow for large prime sizes], enable_unsafe_mulmod=$enableval, enable_unsafe_mulmod=no)
- if test "$enable_unsafe_mulmod" = "yes"; then
--        AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD)
-+        AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD,1,[Risk overflow  for lar prime sizes])
- fi
- 
- 
-@@ -221,15 +222,25 @@
- FFTW_THREADS_INCLUDELIST=""
- FFTW_THREADS_PROGLIST=""
- THREADLIBS=""
-+omp_enabler=unknown
- if test "$enable_threads" = "yes"; then
- 	if test "$with_openmp"x != nox; then
- 		AC_MSG_CHECKING(how to enable OpenMP)
--		omp_enabler=unknown
- 		save_CFLAGS="$CFLAGS"
- 		CFLAGS="$save_CFLAGS -omp"
- 		AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" "
- 			omp_enabler="$CC -omp")
- 		if test -z "$THREADLIBS"; then
-+			CFLAGS="$save_CFLAGS -fopenmp"
-+			AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS="-lgomp"
-+				omp_enabler="$CC -fopenmp")
-+		fi
-+		if test -z "$THREADLIBS"; then
-+			CFLAGS="$save_CFLAGS -openmp"
-+			AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" "
-+				omp_enabler="$CC -openmp")
-+		fi
-+		if test -z "$THREADLIBS"; then
- 			CFLAGS="$save_CFLAGS -mp"
- 			AC_TRY_LINK_FUNC(omp_set_num_threads,THREADLIBS=" "
- 				omp_enabler="$CC -mp")
-@@ -240,68 +251,70 @@
- 				omp_enabler="automatic")
- 		fi
- 		AC_MSG_RESULT($omp_enabler)
--		if test -z "$THREADLIBS"; then
--			AC_MSG_ERROR([don't know how to enable OpenMP])
-+		if test x"$omp_enabler" != x"unknown"; then
-+		       AC_DEFINE(FFTW_USING_OPENMP_THREADS,1,[Using OpenMP threads])
-+		else
-+		       AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])
- 		fi
--		AC_DEFINE(FFTW_USING_OPENMP_THREADS)
-+
- 	fi
- 	if test "$with_sgimp"x != nox; then
- 		AC_MSG_CHECKING(how to enable SGI MP)
- 		mp_enabler=unknown
- 		save_CFLAGS="$CFLAGS"
- 		CFLAGS="$save_CFLAGS -mp"
--		AC_TRY_LINK_FUNC(mp_set_numthreads,THREADLIBS=" "
-+		AC_TRY_LINK_FUNC(mp_set_numthreads,THREADLIBS=""
- 			mp_enabler="$CC -mp")
- 		if test -z "$THREADLIBS"; then
- 			CFLAGS="$save_CFLAGS"
--			AC_TRY_LINK_FUNC(mp_numthreads,THREADLIBS=" "
-+			AC_TRY_LINK_FUNC(mp_numthreads,THREADLIBS=""
- 				mp_enabler="automatic")
- 		fi
- 		AC_MSG_RESULT($mp_enabler)
- 		if test -z "$THREADLIBS"; then 
- 			AC_MSG_ERROR([don't know how to enable SGI MP])
- 		fi
--		AC_DEFINE(FFTW_USING_SGIMP_THREADS)
-+		AC_DEFINE(FFTW_USING_SGIMP_THREADS,1,[Using SGIMP Threads])
- 	fi
- 
- 	# POSIX threads, the default choice:
--	if test -z "$THREADLIBS"; then
-+	if test x"$omp_enabler" = x"unknown" ; then
- 		sinclude(acx_pthread.m4)
- 		ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
- 	                     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 	                     CC="$PTHREAD_CC"
--	                     AC_DEFINE(FFTW_USING_POSIX_THREADS)])
-+	                     AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using POSIX Threads])])
- 	fi
- 	# Solaris threads:
- 	if test -z "$THREADLIBS"; then
- 		AC_CHECK_LIB(thread, thr_create,
- 		             [THREADLIBS="-lthread"
--                	      AC_DEFINE(FFTW_USING_SOLARIS_THREADS)])
-+                	      AC_DEFINE(FFTW_USING_SOLARIS_THREADS,1,[Using SOLARIS Threads])])
- 	fi
- 	# Mach C threads:
- 	if test -z "$THREADLIBS"; then
- 		AC_CHECK_FUNC(cthread_fork,
- 		             [THREADLIBS=" "
--                	      AC_DEFINE(FFTW_USING_MACH_THREADS)])
-+                	      AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])])
- 		AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
- 	fi
- 	if test -z "$THREADLIBS"; then
- 		AC_CHECK_LIB(cthread, cthread_fork,
- 		             [THREADLIBS="-lcthread"
--                	      AC_DEFINE(FFTW_USING_MACH_THREADS)])
-+                	      AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])])
- 		AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
- 	fi
- 	if test -z "$THREADLIBS"; then
- 		AC_CHECK_LIB(cthreads, cthread_fork,
- 		             [THREADLIBS="-lcthreads"
--                	      AC_DEFINE(FFTW_USING_MACH_THREADS)])
-+                	      AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach Threads])])
- 		AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
- 	fi
- 	# BeOS threads:
- 	if test -z "$THREADLIBS"; then
- 		AC_CHECK_FUNC(spawn_thread,
- 		             [THREADLIBS=" "
--                	      AC_DEFINE(FFTW_USING_BEOS_THREADS)])
-+                	      AC_DEFINE(FFTW_USING_BEOS_THREADS,1,[Using BEOS Threads])])
- 	fi
- 	if test -z "$THREADLIBS"; then
- 		AC_MSG_ERROR(couldn't find threads library for --enable-threads)
-@@ -334,7 +347,7 @@
- 	CC="$MPICC"
- 	ok=yes
- 	AC_TRY_LINK([#include <mpi.h>
--	], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C)], [ok=no])
-+	], [MPI_Comm_f2c(0);], [AC_DEFINE(HAVE_MPI_COMM_F2C,1,[Has MPI COMM F2C])], [ok=no])
- 	AC_MSG_RESULT($ok)
- 	CC="$save_CC"
- else
diff --git a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
deleted file mode 100644
index cc844a455e66..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = fftw_test rfftw_test
-+check_PROGRAMS = fftw_test rfftw_test
- noinst_HEADERS = test_main.h
- 
- FFTWDIR=../fftw
---- a/mpi/Makefile.am
-+++ b/mpi/Makefile.am
-@@ -4,8 +4,8 @@
- 
- lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@
- include_HEADERS = @FFTW_MPI_INCLUDELIST@
--noinst_PROGRAMS = @FFTW_MPI_PROGLIST@
-+check_PROGRAMS = @FFTW_MPI_PROGLIST@
- 
- EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_mpi.la \
-                     lib@FFTW_PREFIX@rfftw_mpi.la
- EXTRA_HEADERS = @FFTW_PREFIX@fftw_mpi.h @FFTW_PREFIX@rfftw_mpi.h 
---- a/threads/Makefile.am
-+++ b/threads/Makefile.am
-@@ -4,9 +4,9 @@
- 
- lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@
- include_HEADERS = @FFTW_THREADS_INCLUDELIST@
--noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@
-+check_PROGRAMS = @FFTW_THREADS_PROGLIST@
- 
- EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_threads.la \
-                     lib@FFTW_PREFIX@rfftw_threads.la
- EXTRA_HEADERS = @FFTW_PREFIX@fftw_threads.h \
-                 @FFTW_PREFIX@rfftw_threads.h
diff --git a/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch b/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch
deleted file mode 100644
index b92e6dad299c..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-parallel-tests.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fix failure of parallel test suite. This is due to
-misspecification of the test suite, which requires
-first compiling $(check_PROGRAMS) and only then
-running $(TESTS):
-
-* check-am: all-am
-*         $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-*         $(MAKE) $(AM_MAKEFLAGS) check-TESTS
-
-The old build system never specified $(TESTS) and
-erroneously made the check target depend on the
-two tests.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=603352
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -12,22 +12,7 @@
- rfftw_test_LDADD = $(RFFTWDIR)/lib@FFTW_PREFIX@rfftw.la \
-                    $(FFTWDIR)/lib@FFTW_PREFIX@fftw.la
- 
--check: fftw-tests rfftw-tests 
-+TESTS = myfftwtests.sh myrfftwtests.sh
- 
--fftw-tests: fftw_test
--	./fftw_test -p 0
--	./fftw_test -x 128 -a 0
--	./fftw_test -x 32 -a 2
--	./fftw_test -x 100 -r 0
--	@echo "--------------------------------------------------------------"
--	@echo "         FFTW complex-complex transforms passed tests!"
--	@echo "--------------------------------------------------------------"
--
--rfftw-tests: rfftw_test
--	./rfftw_test -p 0
--	./rfftw_test -x 128 -a 0
--	./rfftw_test -x 32 -a 2
--	./rfftw_test -x 100 -r 0
--	@echo "--------------------------------------------------------------"
--	@echo "          RFFTW real-complex transforms passed tests!"
--	@echo "--------------------------------------------------------------"
-+TEST_EXTENSIONS = .sh
-+SH_LOG_COMPILER = $(SHELL)
---- a/tests/myfftwtests.sh
-+++ b/tests/myfftwtests.sh
-@@ -0,0 +1,4 @@
-+./fftw_test -p 0 && \
-+./fftw_test -x 128 -a 0 && \
-+./fftw_test -x 32 -a 2 && \
-+./fftw_test -x 100 -r 0
---- a/tests/myrfftwtests.sh
-+++ b/tests/myrfftwtests.sh
-@@ -0,0 +1,4 @@
-+./rfftw_test -p 0 && \
-+./rfftw_test -x 128 -a 0 && \
-+./rfftw_test -x 32 -a 2 && \
-+./rfftw_test -x 100 -r 0
---- a/threads/fftw_threads_test_check.sh
-+++ b/threads/fftw_threads_test_check.sh
-@@ -0,0 +1,4 @@
-+./fftw_threads_test 1 -x 100 -r 0 && \
-+./fftw_threads_test 2 -x 100 -r 0 && \
-+./fftw_threads_test 3 -x 100 -r 0 && \
-+./fftw_threads_test 10 -x 100 -r 0
---- a/threads/Makefile.am
-+++ b/threads/Makefile.am
-@@ -78,29 +78,7 @@
- # incorrect.  Just disable autoheader
- AUTOHEADER=echo
- 
--check: @FFTW_THREADS_PROGLIST@
--	@set fnord $(MAKEFLAGS); amf=$$2; \
--        list='@FFTW_THREADS_PROGLIST@'; for prog in $$list; do \
--          target="$$prog""-check"; \
--          echo "Making $$target"; \
--          ($(MAKE) $$target) \
--           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
--        done && test -z "$$fail"
-+TESTS = fftw_threads_test_check.sh rfftw_threads_test_check.sh
- 
--fftw_threads_test-check: fftw_threads_test
--	./fftw_threads_test 1 -x 100 -r 0
--	./fftw_threads_test 2 -x 100 -r 0
--	./fftw_threads_test 3 -x 100 -r 0
--	./fftw_threads_test 10 -x 100 -r 0
--	@echo "--------------------------------------------------------------"
--	@echo "    FFTW complex-complex threads transforms passed tests!"
--	@echo "--------------------------------------------------------------"
--
--rfftw_threads_test-check: rfftw_threads_test
--	./rfftw_threads_test 1 -x 100 -r 0
--	./rfftw_threads_test 2 -x 100 -r 0
--	./rfftw_threads_test 3 -x 100 -r 0
--	./rfftw_threads_test 10 -x 100 -r 0
--	@echo "--------------------------------------------------------------"
--	@echo "     RFFTW real-complex threads transforms passed tests!"
--	@echo "--------------------------------------------------------------"
-+TEST_EXTENSIONS = .sh
-+SH_LOG_COMPILER = $(SHELL)
---- a/threads/rfftw_threads_test_check.sh
-+++ b/threads/rfftw_threads_test_check.sh
-@@ -0,0 +1,4 @@
-+./rfftw_threads_test 1 -x 100 -r 0 && \
-+./rfftw_threads_test 2 -x 100 -r 0 && \
-+./rfftw_threads_test 3 -x 100 -r 0 && \
-+./rfftw_threads_test 10 -x 100 -r 0
diff --git a/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch b/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch
deleted file mode 100644
index 1947bef8f21f..000000000000
--- a/sci-libs/fftw/files/fftw-2.1.5-texinfo5.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- doc/fftw.texi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/fftw.texi b/doc/fftw.texi
-index 90e8bb6..85a7a53 100644
---- a/doc/fftw.texi
-+++ b/doc/fftw.texi
-@@ -46,10 +46,10 @@ approved by the Free Software Foundation.
- @titlepage
- @sp 10
- @comment The title is printed in a large font.
--@title{FFTW User's Manual}
-+@title FFTW User's Manual
- @subtitle For version @value{VERSION}, @value{UPDATED}
--@author{Matteo Frigo}
--@author{Steven G. Johnson}
-+@author Matteo Frigo
-+@author Steven G. Johnson
- 
- @c The following two commands start the copyright page.
- @page
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index c884ae1bb936..bf126e2d0802 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -15,8 +15,6 @@
   publicly available FFT software.
 </longdescription>
   <use>
-    <flag name="float">Link default library to single precision instead of
-    double (symlinks only and fftw-2.1)</flag>
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>
   <upstream>
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index b7b2a633ef9f..26690b4da095 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -4,6 +4,9 @@ DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe5
 DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
+DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
+DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
 EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
+EBUILD gsl-2.7.ebuild 1456 BLAKE2B a7eb14aa4241789d1cb7d3c480fcd39fc1337401f12723e977dd0186cdd968cf2f3a2db3c5e712a2b96933fc016ef2f40edff95de943926d312e3245408cc145 SHA512 090f6df2ac6b24e3507328e8faa84df916555e0ef11a605d9627825806649abe6989d9efdfaee354889a55985805fd0839111425ba96f23c45b0bb41cd9994cd
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
new file mode 100644
index 000000000000..35e85c74340b
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external +deprecated static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-2.7-cblas.patch
+)
+
+src_prepare() {
+	# bug #349005
+	[[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(tc-getCC)$ != *apple* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
+		&& filter-mfpmath sse
+	filter-flags -ffast-math
+
+	default
+
+	if use deprecated; then
+		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	if use cblas-external; then
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with cblas-external) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	local MAKEOPTS="${MAKEOPTS} -j1"
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 5b3cba695bc7..d62cacb2dfd0 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -2,6 +2,10 @@ AUX hdf-4.2.11-enable-fortran-shared.patch 1287 BLAKE2B 4b1b7aab9a2eb958684418a0
 AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24cf1f428d5d130f9aebfc261e6108d19cbd7846fc2d90820c993d03fab5c7943b032afb3c8d0b2053ef1665a94f6e38403c60f SHA512 44342b4e7680a002a3dd9ae2a56dcb6689ee57824476436dc5ef5ff1884174e9de6c98972fccc88296f376a354f92e049d64c493df81da2d08ace6271cd2292a
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
+AUX hdf-4.2.15-enable-fortran-shared.patch 1271 BLAKE2B bdeb5214a92618b0587472db79d6bef7677cf51ceeb77d9b8593fc374547ee4f63eb7e614c621043670236151731fcdcaac2f3e1fc18b4f577cceca24e38aa37 SHA512 daa6bf33cf5b0f9445c1e96c67907463f2a3813d2d6528a0fd19a57db98253794c3d147e736c3568766e87d01ff41a492ecd18fcef3d85af2adb77315d770be8
+AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f637d144dae5c88d4a88d19a5cc3897f7e20c61e36678dee730ee80bece1c05cd69514f87658e6a691826dce233cdbe9ff49e SHA512 77855e3e7562412fa18e102385264af42605d462690bbe4fbc867268c1cd1837eb012546294b433c4de8e98ddfdeb58c2a5480a7418252563579d6ee26808f88
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
+DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
 EBUILD hdf-4.2.13-r1.ebuild 1945 BLAKE2B dcb348ffbc90a69e6230b6ea72625e9f7c11f2ca1c7dfe015a5bdfb60b0e7b702296fa55da8b57118168b45be8f86ad33f71b14f9e155312928d04d9d987dddf SHA512 6b547d1d5f46318ec1c5c01393cf759efeeea6409c4ff5e1fe8e341958e656ae9cd6baaa8e39ace87be83f35f18c28e8663117880eac7db3fdbbe154c9642cbd
+EBUILD hdf-4.2.15.ebuild 1826 BLAKE2B f4204427a029277ad702442e83967b7ee8beb9c020d2e604188dd079fde96cbf431bf9e482bbf0916f0009cc247c92b6187a2a163520de7bd173bde3b73616d5 SHA512 ba15290c244592fedacd0ca1967a9337359721c3f7a0ce68186b1703a70b24bde54ff40b605d814584f6075ad79025fd5e2cc54ca2212ab9ef2273f790e856b1
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch
new file mode 100644
index 000000000000..8c6a1c9f8681
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch
@@ -0,0 +1,37 @@
+diff --git a/configure.ac b/configure.ac
+index 0014f85..5601a1c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -290,20 +290,6 @@ fi
+ ## Build static libraries by default. Furthermore, fortran shared libraries
+ ## are unsupported. Disallow a user from enabling both shared libraries and
+ ## fortran.
+-if test "X${enable_shared}" != "Xyes"; then
+-    enable_shared="no"
+-fi
+-
+-if test "X${enable_shared}" = "Xyes"; then
+-    if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
+-    fi
+-fi
+-
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+ 
+ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
+ 
+@@ -948,11 +934,6 @@ done
+ ## ------------------------------------------------------------------------
+ ## Check to see if libtool has enabled shared libraries. Set a conditional
+ ## as some Makefiles will build based on availability of shared libraries.
+-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
+-  enable_shared=yes
+-else
+-  enable_shared=no
+-fi
+ 
+ ## ------------------------------------------------------------------------
+ ## Specify shared library extension the host machine should recognize.
diff --git a/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch b/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch
new file mode 100644
index 000000000000..a373649e2ab4
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 5601a1c..df03984 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -693,7 +693,7 @@ if test "X$BUILD_XDR" != "Xyes"; then
+       if test -z "$HAVE_OLDRPC" ; then
+         LIBS="$LIBS -ltirpc"
+         CPPFLAGS="$SYSCPPFLAGS -I/usr/include/tirpc"
+-        AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_TIRPC])
++        AC_CHECK_HEADER([tirpc/rpc/rpc.h],[:], [unset HAVE_TIRPC])
+         if test -z "$HAVE_TIRPC" ; then
+           CPPFLAGS="$SYSCPPFLAGS"
+           AC_MSG_ERROR([couldn't find rpc headers])
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
new file mode 100644
index 000000000000..b2ff7488868a
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+	net-libs/libtirpc
+	sys-libs/zlib
+	virtual/jpeg:0
+	szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+	test? ( virtual/szip )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch
+	"${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+	eautoreconf
+}
+
+src_configure() {
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+	# GCC 10 workaround
+	# bug #723014
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	econf \
+		--enable-shared \
+		--enable-production=gentoo \
+		--disable-netcdf \
+		$(use_enable fortran) \
+		$(use_enable static-libs static) \
+		$(use_with szip szlib) \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+
+	cd "${ED}/usr" || die
+	if use examples; then
+		mv  share/hdf4_examples share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r share/hdf4_examples || die
+	fi
+
+	mv bin/ncgen{,-hdf} || die
+	mv bin/ncdump{,-hdf} || die
+	mv share/man/man1/ncgen{,-hdf}.1 || die
+	mv share/man/man1/ncdump{,-hdf}.1 || die
+}
diff --git a/sci-libs/io_lib/Manifest b/sci-libs/io_lib/Manifest
index 43ef0a60cda2..2efd159eab9f 100644
--- a/sci-libs/io_lib/Manifest
+++ b/sci-libs/io_lib/Manifest
@@ -1,3 +1,5 @@
+DIST io_lib-1.14.14.tar.gz 6681583 BLAKE2B 192dbd073ac901c4d6f04a20a674bbbaa6c7bc1eb353c22a99feb3c9540ba82cbeaf3272b674e97199a2aac97f73219086f78c45809d491cc968d320f6cab411 SHA512 ccca26f41d48d6bce42218b1f510a7ff2691da7aa65ab8e83b353cfa1a32b3bb9470e17c3bb9e4f2beea190f719d003ee69e68769eb178859c5826e44ffa83d1
 DIST io_lib-1.14.7.tar.gz 2177248 BLAKE2B 6c1a8133a0f0edd253bf0c475cb206294f95659efc82679034f36d8eb963e4020b953f18c0ccfefa6dad61daffbd054513d36a7bdf0e725b8c5a943d98e0d567 SHA512 c1021f0a0dd284e8abbf9cc1dd11995550cf6621455c873effaab56b573fee053ed9e55879003c735c26c403a0aa34d75be87d337cd515cc912706abe7e08665
+EBUILD io_lib-1.14.14.ebuild 882 BLAKE2B 77654252dd95c4c80e16564051575ffd99270cec42e68a0517b21baca3d81735d6f53cc4261e905151c0ffd9bc988f4733722ef6482c1f3b0f15469d3c975e62 SHA512 6282a25506303a869b6902fa174a4dcf77b8763046c19c3e8dd02b12890a6b61d7e569489c255ea1af0259209a5d1baaf6f3ed8bc335ea77d29ea77db832a295
 EBUILD io_lib-1.14.7.ebuild 805 BLAKE2B 2c4344fdc6ae895c2e8ade9baa31424bd98487b68a683c8cc7a149aa9924499cfc9e5201888c4eb59f6ff7cb8a3f997261304826ca26b1bca76846c86cb6b011 SHA512 dab3698a96a8cab0bcdf13bc5a907615524051dcf0e312128c82d4cb7c6dbc7fb60b0c127d286604d1eb44fcf48f717ffee2fc23c56e1b2e9f36f3f603d7f8f7
 MISC metadata.xml 625 BLAKE2B d382a7ef928c9164eb879f8b178ee14a44c1caeec61357eb6cfbdd507f9ebc8a68fd34aed0cecbc7923eed432fac190ec4fdb19c0db6e29f660f4aa02699e88b SHA512 925fc23e12ed16087cde34f7ce857e9f513430a3ccf2d992b99583ba08fb3ade154d1a941efe779b821c59c7820836b7aab65a72ed119aac6d9f8ead1a91ddd9
diff --git a/sci-libs/io_lib/io_lib-1.14.14.ebuild b/sci-libs/io_lib/io_lib-1.14.14.ebuild
new file mode 100644
index 000000000000..d6d07fabe007
--- /dev/null
+++ b/sci-libs/io_lib/io_lib-1.14.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="General purpose trace and experiment file reading/writing interface"
+HOMEPAGE="http://staden.sourceforge.net/ https://github.com/jkbonfield/io_lib"
+SRC_URI="https://github.com/jkbonfield/${PN}/releases/download/${PN}-${PV//./-}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	net-misc/curl:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+# tests fails and might need sci-biology/staden from
+# the science overlay
+RESTRICT="test"
+
+src_configure() {
+	econf $(use static-libs static)
+}
+
+src_install() {
+	default
+	dodoc docs/{Hash_File_Format,ZTR_format}
+
+	if ! use static-libs; then
+		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
+	fi
+}
diff --git a/sci-libs/libcmatrix/Manifest b/sci-libs/libcmatrix/Manifest
index bfdbe8249778..ae3f1404c901 100644
--- a/sci-libs/libcmatrix/Manifest
+++ b/sci-libs/libcmatrix/Manifest
@@ -7,5 +7,5 @@ AUX libcmatrix-3.2.1-gcc4.7.patch 7685 BLAKE2B 34bdb6bef22d532d0b6fd95a7d3dd6ec7
 AUX libcmatrix-3.2.1-minuit2.patch 516 BLAKE2B 6da5f3412fa92de91f354d72fdbe76d11724595cad57a25a1a2768e155e57033542274c0a1d192ed9bc1f560ed69a79ece58fa314e7cfd62b3771d251648d1ec SHA512 3675033dc2c1ca0224ead0c61159a4b27fffc1f9dee5612de7dc8e8b6e98a1211ab6c61aa219f30039540a5a9e1274900e3eb7a12ce264711587f45b98087a13
 AUX libcmatrix-3.9.0-atlas.patch 983 BLAKE2B 1aaaf25720f64db89434466b29009bca07d401a46f8ed73fa239c98725f6d8d8d20c6b7421cffee689281d24ddfc39d083951b3f89a4f01e95f35c3a4e09a84c SHA512 7294e79c880c7b76ec020ba573db1b1f411f65157845447019e4562534298ce07a34d450b0e232a5ba707ce1860a1407bbff7ba61007ad7e66653715570c7543
 DIST libcmatrix-3.11.0.tar.gz 1064634 BLAKE2B 5eb5ffe7ceb80f430fcfb8ca42ab029863a2571ef01adfdc59644fa9951cb1c5205eb74faefdef1fa335af3a16396bb154b6258f0d4dd2c52b5a40eac6cda9b0 SHA512 b0f5d9382e0a7c6f8695488481c51e5cdc38d89c9371203870c31a91bf957956a85301cf3aa035b9214d581077581dc1f599f092dd2f077ee14e6b4fd06128c2
-EBUILD libcmatrix-3.11.0-r1.ebuild 1200 BLAKE2B 6155bb1e639144cf9d4c39726107dcbff271c334c0bbe6df565b59e2452fdcc8e15e46c3ea57505d62d8dc6798b7e393e5269bb59bbff8207cec478b63c98abc SHA512 c930dc476b1ee980b8306c5c1ff62ddb13c812b04cacb39e2c31fb5dbfa93db246005e2901154315bbcdcc1970ca6abc18975a2e52b702937b65a84304f0de59
+EBUILD libcmatrix-3.11.0-r1.ebuild 1202 BLAKE2B 82e714c9ca8cbff3542f3664c55d9302f74cc6ee54d3879d8eaeb95cf0984cc5f6bf2b8a94d7a278fdf322c6d5577fbede8c759a87b42d847041575953a39d19 SHA512 d7917284024d24602cba945186c5129adeb17a4ade03a083780081f1ad66d934ebdc58437d5242ecc6364c14ce1142e2f70029070ea03da01a5670ee5c1beaab
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild
index 8596928ef6a1..87813567028c 100644
--- a/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild
+++ b/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -19,7 +19,7 @@ IUSE="cpu_flags_x86_sse threads"
 RDEPEND="sci-libs/minuit"
 DEPEND="${RDEPEND}"
 
-RESTRICT=mirror
+RESTRICT="mirror"
 
 S="${WORKDIR}/${PN}R3"
 
@@ -44,7 +44,7 @@ src_configure() {
 	econf \
 		--with-minuit \
 		--without-atlas \
-		--with-sysroot="${EROOT}" \
+		--with-sysroot="${ESYSROOT}" \
 		$(use_with cpu_flags_x86_sse sse) \
 		$(use_with threads)
 }
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index 6d135e3ce191..e060b8562a42 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,5 +1,3 @@
-DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
 DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8
-EBUILD libecpint-1.0.5.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 EBUILD libecpint-1.0.6.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.5.ebuild b/sci-libs/libecpint/libecpint-1.0.5.ebuild
deleted file mode 100644
index 47004ee7019c..000000000000
--- a/sci-libs/libecpint/libecpint-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
-HOMEPAGE="https://github.com/robashaw/libecpint"
-SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/pugixml"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBECPINT_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 46b5b603f245..9ba04972ac8b 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,6 +1,10 @@
 AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c
+AUX libsc-2.3-add_soname.patch 479 BLAKE2B 3e7e199f88160dc7d5af67696d1a1b1cb2d668589e5a219adcdb6791879e1370f3f638d546b915a4cc40bc5fa594a4e3dd927d31e735dfb287d95ffaa4e6e897 SHA512 d8460b4b1ddb790903f7ddf053f5cb1eabf74741a10a79784a2764b756f82e7c160e6e6752c01eeb4cca2e2e99316c0b2b0f3192bf4415685523abdf71dc1065
+AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7
 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
+DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
 EBUILD libsc-2.2-r100.ebuild 2291 BLAKE2B 418dc0bc9219b6f897523352c8c056c2e495fe5e89634f29aea1810fba4ad23073c544b807c42bd594eb3f2892e320918b9cb0151f5aece319d442c2a9517706 SHA512 7922b32ff3989cedb0b34fa9b6abedd8cdd8a890ede27dade44fb3e2082b353c47444f30a21f4e0d5e84c3cc78a16dd92dcfcf1dcdf8a267f9327915be723cf1
+EBUILD libsc-2.3.1.ebuild 2333 BLAKE2B ec5969ed4acac58bfd0d50675ac8b7b52f552f6cc82c9270edf72f2a18464333fc5bdcde0670ede24f6bd0b6e80ff13023dae91f97c6d10c8434fd3a27162934 SHA512 a257c87659a08a3a68ae2f9096c5f0633fc892ef15e59c76f966fe8994200571c7a1ca0185bf8145e7a9cfffd92c0798c2a8123325bc17fbf00cff4e1359b847
 EBUILD libsc-9999.ebuild 2301 BLAKE2B d0512fc7b8fbcf57439361287a160376a9b88fed9c8bb8d6026d95a133f50fd6f0796e81e143f55abbf5d964a9a55dbaf57a83b3a28f2dca02cae1cac553ce22 SHA512 0ffaeb80966af4463a496059605895669bde82381b3a8bfd76d899806d8cba863ac6a252ec400a38659b872126fb4dd5d69e4816334c87e430665183382ea064
 MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74
diff --git a/sci-libs/libsc/files/libsc-2.3-add_soname.patch b/sci-libs/libsc/files/libsc-2.3-add_soname.patch
new file mode 100644
index 000000000000..61e8d56fa44d
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.3-add_soname.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9d030d5..decbea8 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -43,7 +43,7 @@ src_libsc_la_SOURCES = \
+         $(libsc_internal_headers) \
+         $(libsc_compiled_sources)
+ src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS)
+-## src_libsc_la_LDFLAGS = -release $(VERSION)
++src_libsc_la_LDFLAGS = -release $(VERSION)
+ LDADD += @top_builddir@/src/libsc.la
+ 
+ nodist_include_HEADERS += $(libsc_generated_headers)
diff --git a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
new file mode 100644
index 000000000000..9881d0aa6227
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
@@ -0,0 +1,64 @@
+diff --git a/config/sc_include.m4 b/config/sc_include.m4
+index f6f7873..3befe0e 100644
+--- a/config/sc_include.m4
++++ b/config/sc_include.m4
+@@ -281,8 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
+ [
+ SC_REQUIRE_LIB([m], [fabs])
+ SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
+-SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
+-	     [LUA], [$1])
++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], [LUA], [$1])
+ SC_CHECK_BLAS_LAPACK([$1])
+ SC_BUILTIN_ALL_PREFIX([$1])
+ SC_CHECK_PTHREAD([$1])
+diff --git a/configure.ac b/configure.ac
+index ce462e0..b291685 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,7 +78,7 @@ echo "o---------------------------------------"
+ AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/select.h sys/stat.h])
+ AC_CHECK_HEADERS([linux/videodev2.h])
+ AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
+-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
++AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
+ 
+ echo "o---------------------------------------"
+ echo "| Checking functions"
+diff --git a/src/sc_lua.h b/src/sc_lua.h
+index 770b52f..a6db175 100644
+--- a/src/sc_lua.h
++++ b/src/sc_lua.h
+@@ -30,29 +30,9 @@
+ 
+ SC_EXTERN_C_BEGIN;
+ 
+-#ifdef SC_HAVE_LUA5_3_LUA_H
+-#include <lua5.3/lua.h>
+-#include <lua5.3/lualib.h>
+-#include <lua5.3/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_2_LUA_H
+-#include <lua5.2/lua.h>
+-#include <lua5.2/lualib.h>
+-#include <lua5.2/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_1_LUA_H
+-#include <lua5.1/lua.h>
+-#include <lua5.1/lualib.h>
+-#include <lua5.1/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA_H
+-#include <lua.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
+-#endif
+-#endif
+-#endif
+-#endif
++#include <@LUA_IMPL@/lua.h>
++#include <@LUA_IMPL@/lualib.h>
++#include <@LUA_IMPL@/lauxlib.h>
+ 
+ SC_EXTERN_C_END;
+ 
diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1.ebuild
new file mode 100644
index 000000000000..e84c20273cf0
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.3.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Support for parallel scientific applications"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="debug examples mpi openmp romio static-libs threads"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="${LUA_DEPS}
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio?] )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
+	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+AUTOTOOLS_AUTORECONF=true
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp openmp)
+		$(use_enable romio mpiio)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+	)
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
+	# Fix wrong installation paths:
+	dodir /usr/share/libsc
+	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 9ca7a9e73fad..5426c179e873 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,5 +1,7 @@
 AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
 AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
+DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 710e0e5791defed993a820b2bc8cc500d6df28b739b726bc4a4181b16892035c3d0e088cbb92284915c131905673acaf0e169ad03928d14f306c9bdc76c18145 SHA512 909838eeb6af0280d4cc7ec27e84c9ffa5c44544bb2a3a5ca9da862e4ace9f40a8b8ecff6131ef7504558ec35ecba3c24be27806bc45088aaee46dd157d13d79
+EBUILD libsvm-3.25.ebuild 2683 BLAKE2B b57d0d18bebd2f4b441a0d36831206e1354e108fe0f7a5576b2328f99068c37ad67d236afb24ca8e12d19f84175d9ac04302792cc8cf3e99f96b410664ba20fa SHA512 f8fe08780d85e0d2882829c1f3e28e7b331b1b6751f768e778d8dba12c2b248bccfa3c0fe931fcd2d4789ea7d666c14b95b8423a14fe3b40b7a5df5661944b62
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.25.ebuild b/sci-libs/libsvm/libsvm-3.25.ebuild
new file mode 100644
index 000000000000..f4a2fdf7ebd9
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.25.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
+
+DESCRIPTION="Library for Support Vector Machines"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
+SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="java openmp python tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	java? ( >=virtual/jdk-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+	tools? ( sci-visualization/gnuplot )
+"
+
+PATCHES=(
+	"${FILESDIR}/3.11-openmp.patch"
+	"${FILESDIR}/3.14-makefile.patch"
+)
+
+pkg_setup() {
+	if use openmp; then
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not supported by your currently selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
+		fi
+
+		append-cflags -fopenmp
+		append-cxxflags -fopenmp
+		append-cppflags -DOPENMP
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
+		|| die "Failed to fix paths in python files"
+	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
+		|| die "Failed to fix paths for svm-grid"
+	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
+		|| die "Failed to rename grid.py to svm-grid"
+
+	if use java; then
+		local JAVAC_FLAGS="$(java-pkg_javac-args)"
+		sed -i \
+			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
+			java/Makefile || die "Failed to fix java makefile"
+	fi
+	tc-export CXX CC
+}
+
+src_compile() {
+	default
+	use java && emake -C java
+}
+
+src_install() {
+	dobin svm-train svm-predict svm-scale
+	dolib.so *.so*
+	doheader svm.h
+
+	DOCS=( README )
+
+	if use tools; then
+		local t
+		for t in tools/*.py; do
+			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
+		done
+
+		mv tools/README{,.tools} || die
+		DOCS+=( tools/README.tools )
+
+		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
+		doins heart_scale
+		doins -r svm-toy
+	fi
+
+	if use python ; then
+		installation() {
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
+		}
+		python_foreach_impl installation
+
+		mv python/README{,.python} || die
+		DOCS+=( python/README.python )
+	fi
+
+	HTML_DOCS=( FAQ.html )
+	if use java; then
+		java-pkg_dojar java/libsvm.jar
+		HTML_DOCS+=( java/test_applet.html )
+	fi
+
+	einstalldocs
+}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index eca227ae6819..d4214e06a8d2 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,7 +1,5 @@
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
-DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-4.3.3.ebuild 4791 BLAKE2B 6cfd15ace01acb85c7e79fd8b743e2ed21ded765e12ddcb0be99ec6502d8e1203bd9b26155185ed3c4392bd4549f9ac0b547ed65f1e600785e0117fb0ac40c22 SHA512 ed878490eca99e6a248eeef1d0634e8a575995066d1f501f093ff5a9c8052517a1b99e4f378699b83d1a34c0646d80d7b023f8dd707c03d5d223dd36530e3e9e
 EBUILD linux-gpib-4.3.4.ebuild 4797 BLAKE2B 0016f765269875faedfac78d04a99e39860396b5fe01d78487a72f0b12d8b0cf4202ecb1ee5c08dc6be50183a3adeca78af240d3f07203268610213787fc9661 SHA512 f3e020026a4b0b63be4988492f05ad3f27251f9d87b8e56c184a815449448aa45c3806d8c9881892b72c8b1683c8130f271d84427e9f213a593d9774c61a0184
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
deleted file mode 100644
index eeecbc6b2319..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-perl.patch
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-As the udev rules were changed and refactored in this release it is
-necessary to remove any manually installed pre-4.3.0 gpib udev rules files
-in /etc/udev/rules.d/. The files to remove are:
-\n
-	99-agilent_82357a.rules\n
-	99-gpib-generic.rules\n
-	99-ni_usb_gpib.rules\n
-\n
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index ae80bfd93bdf..ec771cd255ad 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,4 +1,4 @@
 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf SHA512 6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
-EBUILD mathgl-2.4.4.ebuild 3670 BLAKE2B 32467472419c3a59d3367db425563762d682ed46b281da844cfa72fbc2fac6cc57520da9a404250b26feaf78f9b1febe52b51eaaecfc9b6e9d9e39dea57eb209 SHA512 43212c360268e68b84b021adb5d03afade4921348e9dae633fb11206fefa3fc33d3233491628a9e9b3fd3ff9876d0d6786e6e0724c017297423592447242a205
+EBUILD mathgl-2.4.4-r1.ebuild 3672 BLAKE2B ed57ddda84538cbe77ab5922064bc68e7a4480c597d0c9492149a4a82140ef5cb5f3842da322f6e918a2279de991ada4c54b1477fa40a45c238eec68d38eb3d8 SHA512 66ded566f6c47a449d2205809a2d793e57d019aa9114d3acdd1d961f1bdd68c4e3472ecc5969e5f897ece31f3bad09bda49037290223dd15a7b9d364699e6c3d
 MISC metadata.xml 800 BLAKE2B baa75251910016e5d059cebeebd85632d290ab0c3c50089de0485ffbcd08ee8ac59cbfe33824347a5a5c339c74ea7a56c516d4d38661e56f7498d628d748f64a SHA512 8b75db0a01ce59f22543701447630c56a82f9091b5901f85ae102de7deca281e09dbcb443b8ff2930cf18145d63504646a289fd5e77defccc4d38480596d1968
diff --git a/sci-libs/mathgl/mathgl-2.4.4.ebuild b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
index c3da586164f2..ba882749acc0 100644
--- a/sci-libs/mathgl/mathgl-2.4.4.ebuild
+++ b/sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	fltk? ( x11-libs/fltk:1 )
 	gif? ( media-libs/giflib )
 	glut? ( media-libs/freeglut )
-	gsl? ( >=sci-libs/gsl-2 )
+	gsl? ( >=sci-libs/gsl-2:= )
 	hdf? ( sci-libs/hdf )
 	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
 	jpeg? ( virtual/jpeg:0 )
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index 3b73db1d64c3..9326ad3f0f99 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3-r2.ebuild 1762 BLAKE2B b3ae7d2fc7df479c2a93d8db32d5a3bd4f2607322dd4935fb731f3a413901414ec299b18da305d9dd9baa3602095ce52e1fc1279ccbbc3320bef41c0652f3e75 SHA512 e397eda1a177948617bbf7e354fab546c0300424b02b76f71a4f836755e203b142eb6e79b3da4f22fc6264c204d38ee023ba6e005ad931aa1c6acd9ee40456a1
+EBUILD oce-0.18.3-r2.ebuild 1756 BLAKE2B c652c9ad2154f7a557fd2ae146ad8c51de321320f70265ad3d381a3117f4ca60bbfeab7e8c2cac70764e9c063d85f3a9665aeb73cf1374a51b0beb3d24be3d16 SHA512 f8c070dc752b86715fc5d61291136b5c14aa7c9436ed074e6a9566431b198edaf4656ddfc346db04f0c28a0baabad2e8e01a0c29997013ec6a12ba9c245e4eab
 MISC metadata.xml 930 BLAKE2B b8b5156a6c08c5042317fd2f840a3a9c6049065501cae670fc9bbf39d38a67236f01c32f719675f28acf83dfd302ff141825256e4eca9b53946d4304d41eed40 SHA512 c419e6f8a455c626af8635c10c94f3429e03d0440b9e487b1f0a4cb388b23d2c755abdbdba03471fef531d7205cd6eea085ff74981cc28f2523915ca59cb9772
diff --git a/sci-libs/oce/oce-0.18.3-r2.ebuild b/sci-libs/oce/oce-0.18.3-r2.ebuild
index 9a331c5771e8..d9c1053179f8 100644
--- a/sci-libs/oce/oce-0.18.3-r2.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r2.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
 	tbb? ( dev-cpp/tbb )
-	vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
+	vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views] )"
 RDEPEND="${DEPEND}"
 
 CHECKREQS_MEMORY="256M"
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 4f47a1c68f0f..fec4b880e257 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,5 +1,4 @@
 AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
 DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
 EBUILD octomap-1.9.5.ebuild 1689 BLAKE2B 169c1a5e542e61cf5a3c9dc0774cac2afd4dab5052d49058da0c6c8bc70be0a5a4d0165a2dc74d798b71d4eec60288cf884cb4df8e0585a973f335297e246d4f SHA512 9c6ed3429728027d951c4298aba8f6762a35efeba50575ab4dff6c5c49e752842f84ec71f66d1febbd506531c1f4ec96abe74bc17c58dad7f4066ea61b8f68e0
-EBUILD octomap-9999.ebuild 1959 BLAKE2B 4011f9870ad688b0d2d9f055fc612a3a2d8f344dd0cd460dc92cc4863c32e6a47da5cbec65d1b3229ba25065cd9c08846374ae89f49626a1891567b6028727ae SHA512 ab10778e2187536b615267407e8b9acc59c96c785504ac2a4ab5f4cbb885456589eb1fc58dbc4d88fa2fbb1dab06f9365e30fab5a8da6a4146a718e50ba1f902
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
deleted file mode 100644
index c53f4e28eafc..000000000000
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="http://octomap.github.io/"
-IUSE="qt5 dynamicEDT3D doc"
-LICENSE="BSD qt5? ( GPL-2 )"
-SLOT="0/19"
-
-RDEPEND="
-	qt5? (
-		virtual/opengl
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		x11-libs/libQGLViewer:=
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-		-i */CMakeLists.txt \
-		-i */CMakeModules/InstallPkgConfigFile.cmake || die
-	sed -e 's/iewer-qt4/iewer-qt5/g' \
-		-i octovis/CMakeModules/FindQGLViewer.cmake || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
-		"-DOCTOVIS_QT5=TRUE"
-		"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd "${BUILD_DIR}/octomap"
-		emake docs
-		if use dynamicEDT3D ; then
-			cd "${BUILD_DIR}/dynamicEDT3D"
-			emake docs_dynamicEDT3D
-		fi
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html/octomap
-		doins -r "${S}/octomap/doc/html/"*
-		if use dynamicEDT3D ; then
-			insinto /usr/share/doc/${PF}/html/dynamicEDT3D
-			doins -r "${S}/dynamicEDT3D/doc/html/"*
-		fi
-	fi
-
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-	if use qt5; then
-		insinto /usr/share/ros_packages/octovis
-		doins "${ED}/usr/share/octovis/package.xml"
-	fi
-}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ffd5ef735163..d38e10a1da6d 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -14,5 +14,5 @@ AUX opencascade-7.5.env.in 4643 BLAKE2B f3492a12e0e0fd31bed8c65e8aa7af68f84a9e75
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 EBUILD opencascade-7.4.0-r4.ebuild 3957 BLAKE2B 4118554fff8ff80f64ce581dd5f233211d4a77d4366ada96ae646e819ad03adebfa8561ff9c4b9f9fcfed6cc2bad65fe6db0373d434768fcf5cc8a1808fe34e6 SHA512 a7783c641793480726433be75fd5c7260d9f62e32347aa1ee4e68b97adc5e18d829984f05e84e42c120a1c027c0ad15ee73e646c708466e0eeb2a9440b9726ac
-EBUILD opencascade-7.5.1.ebuild 4415 BLAKE2B 49fe2fbcfb8933608ee516b8a1eb23e7968a922c74f7b8cb36ae25179c6a09e413f4fb2ddad16de77b9ae0bd766d3fff86cc7ff7e950d474877a462204b2fa85 SHA512 e4c18a8406a8956b4133992e94ee8a4da20f16d36221d08bdced57c3255a0a22e9352984974ae645b8ce7c8fe86576c412e8b7040e1ff1b86b264f0209fbe960
+EBUILD opencascade-7.5.1-r1.ebuild 4784 BLAKE2B 824ba3dc6e3a314ae80d7cbc0e9b359b1444679318d8dd478ed0bb259b7dd867a53cf59e8b32b7aa9c9a905256618537058c85cc9af7a350e76ef58aee448903 SHA512 fc2478a817e26724bb4dd80d270b9788a3b13a1250c1a7e88779b457518cb5a4c58eae3acb85fa5a12f691a0f467e683b312026cca570a537ca8efcc33299b63
 MISC metadata.xml 1074 BLAKE2B 88bba4427a254f02a0ca70936c0931ceb72a5d752c6664502cd20dbd6cc294080222d9ef143334c147b77667a342f7912384b8af92a1b90868d243294f72215f SHA512 b42f338af31848be031702bbee6cfe105db4c6ffa5970e7229b5a63841097af1b60eb886f4513ec86f0b27fd0c7ad090b635061c737714ae43b7b45db02172f9
diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 474b381f5561..ffa4d80678e2 100644
--- a/sci-libs/opencascade/opencascade-7.5.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -80,6 +80,13 @@ src_prepare() {
 
 	sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
 		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i "adm/cmake/occt_toolkit.cmake" || die
 }
 
 src_configure() {
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index d80a2b237f9c..e7cec303e773 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,5 +1,3 @@
-DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
-EBUILD openlibm-0.7.4.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/openlibm-0.7.4.ebuild b/sci-libs/openlibm/openlibm-0.7.4.ebuild
deleted file mode 100644
index ca3ab8af5117..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	default
-	sed -e "/^OLM_LIBS :=/s/^/#/" \
-		-e "/install: /s/install-static//" \
-	-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 4c45348f9209..9bf258f97022 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,5 +1,10 @@
+AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a
+AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
+DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
+DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
 EBUILD p4est-2.2-r100.ebuild 2908 BLAKE2B 768a3e492a9b2dc00dba2443111e6a39cc701b113a696398f93a2b9947ca6ca8fc7fe1203c8e650e3dc122161ca55b85f91f2bded64b13bd0a60d3618d8529f8 SHA512 9ec1e876334f5cd13e148b68a30a661ce03e91cdd0f4dcd6126b044c0fd645ee4494e1e6aa03edb8f787ad10a1136f47cc636f8a44e38aafdc482a85d17a3461
+EBUILD p4est-2.3.1.ebuild 2913 BLAKE2B eed1fe198cdab40113eb84ca27cf01abf416fe3bb2e9038366855bfb8e6df0bd6a934b92bc9a654d2369917183206e5014163aedda21996fe0e459f232e7be1b SHA512 44eb74926a3bd881beecc63d74de81f62cbd3ee698ce7b482b2e0c4eaf8dea5542eb23517a534234d175bf8f8bfe30dbad9e73dff4fdde889177b526fdcac442
 EBUILD p4est-9999.ebuild 2908 BLAKE2B 25d8be9880948ec1d3f30c3e10049b89f1d05880e366b74f60e814847baa7b63f5582013f28ba41af3ab3055912c823b580f2021f55d6e91fcd79da3d811f1d5 SHA512 27dd306e9a793bdcb08c4eaab32d39facfaae784e80f2c50e0f137c9a9121d5e5304a0b432003c55c695df8bacd0e5a83265bfd8629833baad4b5af2d60c831d
 MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba
diff --git a/sci-libs/p4est/files/p4est-2.3-add_soname.patch b/sci-libs/p4est/files/p4est-2.3-add_soname.patch
new file mode 100644
index 000000000000..9438633138a0
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.3-add_soname.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0d96429..1b76969 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -80,7 +80,7 @@ src_libp4est_la_SOURCES = \
+         $(libp4est_internal_headers) \
+         $(libp4est_compiled_sources)
+ src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS)
+-## src_libp4est_la_LDFLAGS = -release $(VERSION)
++src_libp4est_la_LDFLAGS = -release $(VERSION)
+ src_libp4est_la_LIBADD = @P4EST_SC_LDADD@
+ LDADD += @top_builddir@/src/libp4est.la @P4EST_SC_LDADD@
+ EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@
diff --git a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch
new file mode 100644
index 000000000000..a3209d5064fb
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index e8b7e67..1817e37 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@
+ # This file is part of p4est.
+ # Makefile.am in toplevel directory
+ 
+-ACLOCAL_AMFLAGS = -I config @P4EST_SC_AMFLAGS@
+ if P4EST_SC_MK_USE
+ @P4EST_SC_MK_INCLUDE@
+ endif
diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1.ebuild
new file mode 100644
index 000000000000..597b67a136a5
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.3.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="
+		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# TODO petsc
+IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
+	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Inject libsc to get  all parts of the build system...
+	if ! [[ ${PV} = *9999* ]]; then
+		rmdir "${S}/sc" || die "rmdir failed"
+		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+	fi
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version
+
+	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+	eautoreconf
+
+	sed -i \
+		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+		"${S}"/configure || die "sed failed"
+
+	sed -i \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
+		"${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+	# avoid underlinkage
+	LDFLAGS="${LDFLAGS} -lsc"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp)
+		$(use_enable romio mpiio)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable vtk-binary)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-sc="${EPREFIX}/usr"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/*
+
+	if use examples
+	then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Fix wrong installation paths:
+	dodir /usr/share/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 39404ff1b087..4ac8b8f3e799 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -3,5 +3,5 @@ AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f5
 DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
 EBUILD pastix-5.2.2.22-r1.ebuild 3653 BLAKE2B 2fde445d7fa06f9c7f38fd61d23550df25a3c5b414eb309c7b2a5ebaac6ff844052e8cf612ba5d6e308c970e6d2d5d317b52a62365bec4fecd2e70614595fbf5 SHA512 884c7d5eec941cc2fc55597a62d674ec239a62ea3d66ec9811671b2841dcb0723937298abc9599011fc431bc8cf2c27aea9ea396936e78edccd4e8d4c19d57bb
-EBUILD pastix-5.2.3.ebuild 3335 BLAKE2B 93748a732327fb5c04ecfa1aa722f781da2c44afdad104be4d7248960e3a463f40ba41940c4ed40ea362834c353308df02ee3e412660e200115d7a912bd11547 SHA512 817fe4a38ddfdf1d6240a47f311f6a98931fc3c77e8562bc5091056155da22d3373c2bc55b0a4a6d877534e80a770c7320008329447633839f67c0e30ed79b6c
+EBUILD pastix-5.2.3.ebuild 3340 BLAKE2B f8f0da2f1af8e8736c7697d1aabfa8d98975a743d1a3166233db6af4652c94baac68704c3817736f5b64c19bb407f2b345596af9d690852ee97623fceb8bee05 SHA512 9c31a8358f22cf6350da37a10a50e2963b48023d1c93d51039d1068cce46c8f8bab8b871cc4c35692b97342c9ab1d9c4938137b0bd440f2b8a0e0e47a0b350ad
 MISC metadata.xml 1055 BLAKE2B 237a5db431f2c60ea448c9627f943e88a7fd50509884af078c1de5b9ed51317806d815cf8f8ad9c1f85272077438df2d8c76e26fa9a1c9133bb17f3b1cd056ed SHA512 42f9f1f03c4a2df46918ef461d814ca3c0e80e0fa5420327a45d6ca7ec87dd3f14ad0e5a4384b49aebae971578a425b475fa0e1ed6b73370afb743222765bfde
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index f304384adf9f..3cd36ee0e4bd 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index feb00ba5a979..0a55cc03b138 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r101.ebuild 7365 BLAKE2B 861295cc021c38f2f0dc5f0b8e3defd09598aac5471153541aae2c512d5032560ec028164c7c8eecc7ad65d73529900fb6d2661ce831c67180947062bb55e130 SHA512 04c0ee802ae4cbd40dfec62ec178fdb31cdb3fd9808f40a4a36589a28013f930ca27a68a7b9063412dcada8cbf13735b45203dc59c3d002ddab52b42cb0e6d81
+EBUILD plplot-5.15.0-r102.ebuild 7504 BLAKE2B 8461982fe592d9168266f291e5b6ea36ebdcaedc0e88c202d81962db1fa11d51d554528fdf56a890587a1969ea524696ba3fdcd87c28a3d98d1abd428d150dec SHA512 06a5d6cf5908ea8270208fcd9c6fcd4820f0a95b772cae4ee5c2d7e220ccf80e492d73062e01e9ee5c7b34c21092d0a0bb04523d100db842d57dfd0abcbdfef7
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
index a8ca91a4eed2..25ff02cc744c 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -6,7 +6,9 @@ EAPI=7
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+# fails with ninja, due to USE=java missing swig output dependencies
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets
 
@@ -36,7 +38,7 @@ RESTRICT="
 RDEPEND="
 	cairo? ( x11-libs/cairo:0=[svg?,X] )
 	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	java? ( >=virtual/jre-1.5:* )
+	java? ( >=virtual/jre-1.8:* )
 	latex? (
 		app-text/ghostscript-gpl
 		virtual/latex-base
@@ -88,7 +90,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	java? (
-		>=virtual/jdk-1.5
+		>=virtual/jdk-1.8:*
 		dev-lang/swig
 	)
 	lua? ( dev-lang/swig )
@@ -290,8 +292,10 @@ src_install() {
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
+	use python && python_optimize
+
 	if use java; then
 		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
+		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/libplplotjavac_wrap.so
 	fi
 }
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 022876b7b83b..334dd41a9227 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,4 +1,4 @@
 AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce
 DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
-EBUILD qd-2.3.22.ebuild 1102 BLAKE2B aa7e8ba96034d3f1541be3bc4ce7cebb6c92af3107ad83fa55c30891280cd4842ae8eb31f2020af459fb5c71934d66f92fef83d4a08b586425b03f92e485af2c SHA512 6c8af78a2dc0c12957ff8e66745f31870c4eb43f831ca79fd96eed22d54f8b59c403156d14e6fe7d77fcfc51672e876a6e0e6ded9e1b6c95d8691a17d13efa9f
+EBUILD qd-2.3.22.ebuild 1100 BLAKE2B 50c55e5d7b4bb1d1e8c0298619aad3ec1d7ba65084dd87f59105cd2be3a4e940ab71e03ecdbb3e3fd842d9604fc84df1c4c5b8ed30a9d5c8a1508be364aa7f5f SHA512 f86a94765cd174ec9d2573d79cb39e94c381d4d752ca13ea47d805336381284dd6382695c375e589899f627cf9bf2fb5b66688f82f598dcd3c5b9dd1461bac95
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/qd/qd-2.3.22.ebuild b/sci-libs/qd/qd-2.3.22.ebuild
index ba78c43a2ef1..46948cd55894 100644
--- a/sci-libs/qd/qd-2.3.22.ebuild
+++ b/sci-libs/qd/qd-2.3.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
index 2984fc2893df..ffbd4eba5758 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1,3 +1,5 @@
 DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
+DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607
 EBUILD rtree-0.9.4-r1.ebuild 622 BLAKE2B a049bc3c2ffe5097533ac435a6eb0218a6e8139c9023a5f5f4bf75a47d726c08cda67173b9a414db1b6ff18da685737851e7648c3d295a0aec5156d69d0f198b SHA512 c48970d96ed4bae2fe3f6fec4c03e375a766c7b448e1326fd77c1d0dfa6338e6e64cf6548ab9b3041d438f0a543cf16f87b77bc5c16cd8c062c56f8c50f4ac72
-MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
+EBUILD rtree-0.9.7.ebuild 636 BLAKE2B 21b484de0c2f5df823efe0f0cfb061133389769f1365caa9491121c6b2d31893536c6bf5807f19930379a073a47760d80b4f65ff3111d2491aa0801856d552f4 SHA512 7b70451a0ec57e33cd7a762edb3f3524482cba35e698dbc9b7505954b620a09939aa07855c9ca4edb7cbf9eeadbbf3fa1120e4b594dc331645a6378cf675c83f
+MISC metadata.xml 838 BLAKE2B dc4e6490095118fcf8ff5a8e8660774e0a320d0d4396aff76841ea2e26b2329e094ecc1e524443137365e744273bb4443feab7dd0c2c5eec423bbd7a501b2cfa SHA512 a42b53908a909d3d4c9e3eb27067210553e176e7adaca2374a0868267503fddc64db89dfd9ae21bfc183d911d3ec36f9994abd911250776ec457bbb8b417acbc
diff --git a/sci-libs/rtree/metadata.xml b/sci-libs/rtree/metadata.xml
index d03728e20d7e..a0a47a2da71d 100644
--- a/sci-libs/rtree/metadata.xml
+++ b/sci-libs/rtree/metadata.xml
@@ -5,6 +5,10 @@
         <email>3dprint@gentoo.org</email>
         <name>Gentoo 3D Printer Project</name>
     </maintainer>
+    <maintainer type="person">
+        <email>andrewammerlaan@gentoo.org</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
     <longdescription>
         Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing
         features for the spatially curious Python user.
diff --git a/sci-libs/rtree/rtree-0.9.7.ebuild b/sci-libs/rtree/rtree-0.9.7.ebuild
new file mode 100644
index 000000000000..751660dc98d3
--- /dev/null
+++ b/sci-libs/rtree/rtree-0.9.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+MY_PN="Rtree"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="R-Tree spatial index for Python GIS"
+HOMEPAGE="https://rtree.readthedocs.io"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
+RDEPEND="sci-libs/libspatialindex"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+DEPEND+="
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 3cff08e67f79..72d0155b8d87 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,7 @@
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
+DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
-EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B d280f08077dd93265b86458d7b9585451c1388344e96f410df601993550b79494d494d433e0ef9e46638108495b5903c3a2b646cc6d7f34ad26c4c3fbbad0226 SHA512 64c12a7fb1d4b6493e416e9a4d860a9135001541896068a718e8df3461fb5c226daa78f187e39d8e48cead80688390080051814fa546d35414b2211e3aa4b30e
+EBUILD scotch-6.0.4-r2.ebuild 5046 BLAKE2B 8e69b5110256582554ea1bdbc288f30bba8cb4316692f995f898e7fc16e27011b0d8dae00aba4d3fad6cfadcc82589625e42c43ebdf48f0c61440336d0cc61ec SHA512 5cd78fc6579b56ee2faf5a1b1ae6d584fede1e074513ed612b15b9bf4494ae3b7d89c3c9c9092df972576cc8a3955759667fe0dbfc6a27468089145fd8665497
+EBUILD scotch-6.1.0.ebuild 4935 BLAKE2B 94eba9a49a1ba532cd2fb6c70d09e06d298e4eb92313ee0fb8ab73a21661564a8da8eb2917415fc57c28c06e2e39a14cbdd6d823b21a1eade7fde27b845a168c SHA512 35a08e93c0b5e6d8e2e41d34ce8103598ccc1948520e4c569862fb3680faa7087a4495cb0b9c950a1559b7be3b9274928212919d3e7bc17f597d0c1ae5a170a4
 MISC metadata.xml 1168 BLAKE2B e77807bd62ed2b78c83b9b0c99b4dd62f79259bacd1559a017ad7e22d5e7b23bfde27c512630da9243739f11a180ae76f280bf5b524ca5ef2b8adc95bf2ce207 SHA512 15d84db92f7c2fb144f9385686041193cd35b2dda682eb0cef254e9ee62a20d38b748131d3878f4a326568993a23eb0c971909d62402ea3f1c30f4ec89300968
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 8af0ccfe611a..4a01b91e5ca2 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -64,10 +64,12 @@ src_prepare() {
 			-e 's/ -DSCOTCH_PTHREAD//' \
 			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
 	fi
-	sed -e "s/gcc/$(tc-getCC)/" \
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
 		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
 		-e "s/LDFLAGS/LIBS/" \
 		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
 }
diff --git a/sci-libs/scotch/scotch-6.1.0.ebuild b/sci-libs/scotch/scotch-6.1.0.ebuild
new file mode 100644
index 000000000000..ebd2b1e8d84b
--- /dev/null
+++ b/sci-libs/scotch/scotch-6.1.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+SOVER=$(ver_cut 1)
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
+SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="CeCILL-2"
+SLOT="0/${SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc int64 mpi static-libs test tools threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		VERS_COMP=${PV//.}
+		[[ "${#VERS_COMP}" -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	default
+	use int64 && append-cflags -DIDXSIZE64
+	if use threads; then
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
+	else
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
+		sed -i \
+			-e 's/ -DSCOTCH_PTHREAD//' \
+			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
+	fi
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC scotch esmumps
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
+		export LINK=mpicc
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/lib" emake -C src check
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/*.a
+
+	#install metis headers into a subdir
+	#to allow usage of real metis and scotch
+	#in the same code
+	insinto /usr/include/scotch/metis
+	doins include/*metis*
+	rm include/*metis*
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch/metis
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null || die
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null || die
+
+		pushd man/man1 > /dev/null || die
+		for m in *.1; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null || die
+	fi
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index a59e61cce6e7..af05fb2564b8 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,2 +1,2 @@
-EBUILD suitesparse-5.4.0.ebuild 775 BLAKE2B c62ad76b7b483d24097013e9d753b2ebca7e7837fe0f4b977afa988682857ba9970984f89bd20dbb9ad18b7803fe37bc28ec9ad2aa8555b0b236467c8bdd2365 SHA512 737efaa2d4ada9a3c0771306db06c82c6b93148f7ff7ee82f8e37ba50e4a96ddbff2cae4372487e29d63fd11eaed8c8fdea9c15a437f6c6ec50609db1be12a87
+EBUILD suitesparse-5.4.0.ebuild 781 BLAKE2B 006fe8f6daab847efb7dc9dacb8116c4cd10572130cef134c457e733fc9c481f1ee8426e398cbd4bb3eea7331128bf91bcc95687f64d94c69c7bbf18ff21b3d7 SHA512 8a4f7683536cf2de259f143043c94b5db9caf0ff05316347559d9a630d0f70c48d16a13a3f72141cf642568222f010dd5a7f565c53eb381382bb4fd8129f87d4
 MISC metadata.xml 1888 BLAKE2B a62df893d5cf6ca03c42eab18220fde29cf92ecc53222be7488c9e2bf4cdc259890fbe7734126f76cdf256e4c9a00570ee85ab1c4f4941448f13f071e4974ca3 SHA512 c892aa1b84b7dc94157ae9e2008913d385978a59db9d35b76aced538f15343222449412d0d2fe117757390d0be698f90f4519eaa45aca366052459c631b3cb96
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 17adeab9975c..16749167bca4 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index c3baec6a12c0..3adca653a52f 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,5 @@
 DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
+DIST volk-2.5.0.tar.xz 322280 BLAKE2B edbf0f7ffecf08e8f0d8ebbb85a9bc943286c5d022442d0d7e480be4ecbd696a8b2e87e4d16d7133467b429e4894a1d166c534b5a05630cb313906aed8476cfe SHA512 94e5af925d6b6e157445ca80c2ba47a92f5ee681716d2a70a5519caa30a603b3f31a9f1ccbd14ef65349645b56a3f406b4aa1f354c322be60bd76d646a4850c6
 EBUILD volk-2.4.1.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
+EBUILD volk-2.5.0.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.5.0.ebuild b/sci-libs/volk/volk-2.5.0.ebuild
new file mode 100644
index 000000000000..aff22b50715c
--- /dev/null
+++ b/sci-libs/volk/volk-2.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+#https://github.com/gnuradio/volk/issues/383
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1
+
+DESCRIPTION="vector optimized library of kernels"
+HOMEPAGE="http://libvolk.org"
+SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="orc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}
+	!<net-wireless/gnuradio-3.8
+	dev-libs/boost:=
+	orc? ( dev-lang/orc )"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]')"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 14a47ebe3585..2b19502e8597 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,4 +1,5 @@
 AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
+AUX vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch 2055 BLAKE2B 2abc5d8e0855e52ce7a741097cf5e903a7e00b20d5ef7f8d71975c39eda513ced909addecc3c7fe02df4b8784b3ac9394377b2e7b6b224634a85dd7c458bf66a SHA512 a00cff2c33d67c95284f923495a7119d1da92d48c619999ea67fb4db277b6b24ce88db793133b0ae21ecc38c19c0855ab026f7ff3b7e340ae9573c0622a0800d
 AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
 AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943cfc8130e4d1a72776639e49212d9efa66db71fba6a9469381aaf35f526f316e4a6e5bd144dc8054f857b3a3f7a179eb1875c9ad0859ba669c5d63215 SHA512 28fd381693a1ed9584be3d1acc3d3de20be3cb23a3605f3f66470cf9ec0bc66ef0e3f574fc760fbbd4aeca75ea3aa96c0e22b37fbdb54a22073fee179e4a26cb
 AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
@@ -15,7 +16,8 @@ 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-r1.ebuild 9708 BLAKE2B c2a3febf381f2dbc8298361bfe5c832c2e4dc5eb7f0ecab1357791c464d96ee5857b50086a517315682a8e6ffad837ba0c32f70cc4541cd3c6b53ad7966e3663 SHA512 c68899d16abe366d5286b4840605e8d173141681fee3489152524a70dfdb25611a9d2934d457284b6199261f0b3c2c34a4d4b097069feaae6d234cedcdcf137a
+EBUILD vtk-8.2.0-r1.ebuild 9716 BLAKE2B 4e4ec0345e9edd664fb58e74678eb003f3aaefde46535c937135f9aa27320424c75da3adab8b56fad10341e421067ac5add84c7e8b35fb2f95c8a99ee07506a9 SHA512 e7b67a0f8251aef9ed41472431758c7f0450112c76935908666f34550f1a95784ff2da08e01140ad8f87acedf3e7ca59835b33ad9be35a4a322effbacbede13c
+EBUILD vtk-8.2.0-r2.ebuild 10533 BLAKE2B b72995a463065f531e86bddf0fd7c86b6e34e74b6080642882da342428f4c51f31fcf05b3bc1ce4780933f97c8b5131cc1d042ee128ffc8dec5f210802759810 SHA512 bd0539e0da4d98a005317c1a8fdd1519d2c1ea400d59778351cded4ff53f9bb6580ac8b8b2b8f2d7096470c7640102d1cde5a0c7282bf90a13c31d55925f17b0
 EBUILD vtk-8.2.0.ebuild 9415 BLAKE2B f1784bad98faef85b698e73889943c1177783bd2b356baac8b7024f536c7f64e7343a0d26c003a948fa9917f8946a7482bcddf836a0334927185f38d6d98a37a SHA512 f4c5d23f72f69994241337e0bc20a936c64d3c0d5fb785b3da72d7e6612de4f35f98dbc2e4b6e670388051952cacc1d4827a0b0ea92ce909123a35606e9dc1c7
-EBUILD vtk-9.0.1.ebuild 13556 BLAKE2B b21501eeedd084b6887ed1c68bd5d9ef69d8336cd2f77458bc33fad938f42f321aec1fb56e08b3ef8dd08d042a5b6a6104e400a1f11c3ad674cc5b01d6d51016 SHA512 0c00f57c8d20d6ac7e1b692a12557f5256462aa2756a2b7a765ad60017c4c63c8b8d2c60fa0ada241e6d8fac2dcbf8016b70dbb67057805bfed534c2dff19f86
+EBUILD vtk-9.0.1.ebuild 13690 BLAKE2B cc4d8764f7b37bd28c7490f51b10b21faaec308ad4768817a3c1aa55c8694187a40bb6ca18274402c1e5781c2a066d276abaca5429492364cef53cf4cbee566d SHA512 3dbb44fb1fef2c2004013d76e7f84f0dab470787943585dc48b0d9066197ff68bd3bac753e5d409e95b08a73c59be72e77ba705e8802de077e13d3e9e1fa2949
 MISC metadata.xml 1467 BLAKE2B 9d3762c4dbcc6b7f499350523fa3e55dd7c1f4fd5074ccdbe72c68a0c275758e5e4db187574dfc9180345e81ea263373232f826de8d55aa966fd3378569bf200 SHA512 6c8bf52de0c5591af316acc5c8a008893445241fd638d645733146af78fbbc2b0109e267be4e9b8fb8ec8841e5003ae7fdb9c948d3db0b0a24163d6380722078
diff --git a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
new file mode 100644
index 000000000000..d03cab326f4f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
@@ -0,0 +1,57 @@
+From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 3 Jun 2021 13:13:38 +0200
+Subject: [PATCH] fix library installation dir for xdmf3
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+index 86d688f8..7d009dfe 100644
+--- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
++++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+@@ -269,10 +269,10 @@ endif()
+ 
+ if(UNIX)
+     if (BUILD_SHARED_LIBS)
+-      set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so
++      set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so
+           PARENT_SCOPE)
+     else()
+-      set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a
++      set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a
+           PARENT_SCOPE)
+     endif()
+ endif()
+@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT)
+ endif()
+ install(TARGETS XdmfCore
+   RUNTIME DESTINATION bin
+-  LIBRARY DESTINATION lib
+-  ARCHIVE DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
++  ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
+   install(TARGETS XdmfCore_Static
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}
++    ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ endif ()
+ 
+ if (Boost_FOUND)
+@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS
+   CACHE INTERNAL "")
+ 
+ set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE)
+-set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
++set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
+ set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
+ 
+-- 
+2.31.1
+
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index 9ab67fa0c1e0..4d29ebbccca6 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
@@ -216,7 +216,7 @@ src_configure() {
 		-DVTK_Group_Views=$(usex views)
 		-DVTK_Group_Web=$(usex web)
 		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
-		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
+		-DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}"
 		-DVTK_WRAP_JAVA=$(usex java)
 		-DVTK_WRAP_PYTHON=$(usex python)
 		-DVTK_WRAP_PYTHON_SIP=$(usex python)
@@ -261,7 +261,7 @@ src_configure() {
 			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
 			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
 			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+#			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
 			-DVTK_USE_SYSTEM_SIX=ON
 		)
 	fi
diff --git a/sci-libs/vtk/vtk-8.2.0-r2.ebuild b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
new file mode 100644
index 000000000000..4335d1c44a2f
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+	mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+	video_cards_nvidia views web +X"
+
+REQUIRED_USE="
+	all-modules? ( boost ffmpeg gdal mpi mysql odbc postgres python qt5 )
+	java? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	examples? ( python )
+	tk? ( tcl )
+	web? ( python )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-cpp/eigen
+	dev-db/sqlite
+	dev-libs/double-conversion:0=
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.11
+	>=media-libs/freetype-2.5.4
+	media-libs/glew:0=
+	>=media-libs/libharu-2.3.0-r2
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf:0=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	all-modules? (
+		!sci-libs/xdmf2
+		<dev-libs/pegtl-3
+		sci-libs/kissfft
+	)
+	boost? ( dev-libs/boost:=[mpi?] )
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	java? ( >=virtual/jdk-1.8:* )
+	mpi? (
+		virtual/mpi[cxx,romio]
+		$(python_gen_cond_dep '
+			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qtx11extras:5
+		$(python_gen_cond_dep '
+			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	R? ( dev-lang/R )
+	tbb? ( dev-cpp/tbb )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	web? (
+		${WEBAPP_DEPEND}
+		$(python_gen_cond_dep '
+			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	mpi? ( app-admin/chrpath )
+"
+
+S="${WORKDIR}"/VTK-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
+	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
+	"${FILESDIR}"/${P}-pugixml.patch
+	"${FILESDIR}"/${P}-0001-fix-library-installation-dir-for-xdmf3.patch
+)
+
+RESTRICT="test"
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	local x
+	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 zfp
+	for x in expat freetype hdf5 jpeg jsoncpp kissfft libharu libxml2 lz4 netcdf pugixml png tiff zlib; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+
+	sed -i -e '/add_subdirectory(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
+	sed -i -e '/vtk_target_export(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
+
+	# my_bool is no longer used in MySQL and MariaDB isn't supported in vtk-8
+	sed -e 's/my_bool/bool/' -i IO/MySQL/vtkMySQL{Database,Query}.cxx || die
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
+		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_AUTOBAHN=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ=OFF
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PUGIXML=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_XDMF3=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+		-DVTK_USE_SYSTEM_DIY2=OFF
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_LARGE_DATA=ON
+		-DVTK_USE_PARALLEL=ON
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+		-DVTK_Group_Imaging=$(usex imaging)
+		-DVTK_Group_MPI=$(usex mpi)
+		-DVTK_Group_Rendering=$(usex rendering)
+		-DVTK_Group_Tk=$(usex tk)
+		-DVTK_Group_Views=$(usex views)
+		-DVTK_Group_Web=$(usex web)
+		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
+		-DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}"
+		-DVTK_WRAP_JAVA=$(usex java)
+		-DVTK_WRAP_PYTHON=$(usex python)
+		-DVTK_WRAP_PYTHON_SIP=$(usex python)
+		-DVTK_WRAP_TCL=$(usex tcl)
+		-DVTK_USE_BOOST=$(usex boost)
+		-DUSE_VTK_USE_BOOST=$(usex boost)
+		-DModule_vtkInfovisBoost=$(usex boost)
+		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+		-DVTK_USE_ODBC=$(usex odbc)
+		-DModule_vtkIOODBC=$(usex odbc)
+		-DVTK_USE_OFFSCREEN=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
+		-DVTK_USE_X=$(usex X)
+	# IO
+		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+		-DModule_vtkIOGDAL=$(usex gdal)
+		-DModule_vtkIOGeoJSON=$(usex json)
+		-DModule_vtkIOXdmf2=$(usex all-modules)
+		-DBUILD_TESTING=$(usex examples)
+	# Apple stuff, does it really work?
+		-DVTK_USE_COCOA=$(usex aqua)
+	)
+
+	if use all-modules; then
+		mycmakeargs+=(
+			-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON
+			# we don't have a package for zfp yet
+			-DVTK_USE_SYSTEM_ZFP=OFF
+		)
+	fi
+
+	if use java; then
+		local javacargs=$(java-pkg_javac-args)
+		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+	fi
+
+	if use mpi; then
+		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+#			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+			-DVTK_USE_SYSTEM_SIX=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
+			-DDESIRED_QT_VERSION=5
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+		)
+	fi
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+	# 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"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# with MPI, rpaths are not deleted properly
+	if use mpi; then
+		chrpath -d "${ED}"/usr/$(get_libdir)/*.so.* || die
+		if use python; then
+			chrpath -d "${ED}"/$(python_get_sitedir)/vtkmodules/*.so || die
+			chrpath -d "${ED}"/usr/bin/{,p}vtkpython || die
+		fi
+	fi
+
+	use python && python_optimize
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
index 848e2fce63de..8c86ad38458b 100644
--- a/sci-libs/vtk/vtk-9.0.1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -515,6 +515,11 @@ src_install() {
 	doenvd "${T}"/40${PN}
 
 	use web && webapp_src_install
+
+	# Temporary!
+	# Avoid collision with paraview.
+	# bug #793221
+	rm -rf "${ED}"/usr/share/vtkm-1.5/VTKm{LICENSE.txt,README.md} || die
 }
 
 # webapp.eclass exports these but we want it optional #534036
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sci-libs
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)