gentoo resync : 29.01.2021

57 files changed, 751 insertions, 345 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 16fd314df567..150d87621dfd 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index d1cc32f28e93..5923d4ad8be5 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,10 +1,6 @@
 AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f9e95913b26741199c0db68ef8e69bd3efb901bf938d6bf2529d9359d3e97bd9823e6c871b8873aa368aebf097faa SHA512 8a78b2ba84bb5fc904c7e642410945674b9bee20fe36e46b1e7c0b4f369ef934cd75ded3f9fb9dcf465f11ae30d1e2fbfa5c0e70adf3c8264b96bca5238e31a2
 AUX cfitsio-3.490-pkgconfig.patch 613 BLAKE2B acdaedb24b8a06019346b44eade4cf9f8cdce93578a08354dab61bfa5e7979fd22ab5214676d0f08a8dde5bb70b10c0ec54527d25b73892aa6bbbe935614ee92 SHA512 46c2f7ae36529c4d3afc17afe2f22b2f21b1d5ecfa1d460fca8a95335bf94017c322412da67b57cd052ab98701e5f7776845fe30171cb400f97e2b4411497387
 AUX cfitsio-3.490-system-zlib.patch 2816 BLAKE2B eb16c43cc5be95877424469eeebc085a46fb37e78d0b2fb48db72d71c2bb05d5b85eaf6d7341ed07da25858765cb9902e1dcf8ef33f3ab42b191d2b7689976ed SHA512 4f05a0a35d6bcdc03676d9142d2cc46dd4df69aff4759464c2dc441753e7e3085c756059d2218e9deef9da91c27e760c0f73562bbc02b5a73e0044f47560ded8
-DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
-DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
 DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
-EBUILD cfitsio-3.360.ebuild 1433 BLAKE2B 79dc499048a4c08bec4fe8d11a99ea5bf064716460ae2a80530ca8dd073fc0f00647edacb3f3206cece007e34a3ead466e3d2e1264c6429c9de888a3c3c61a19 SHA512 09c143480ef52b7d979aca2b76b7fa127eba383636e186bcc4d811ec03905a01bba9c018788bdbd2d8864e1746c71f80853de4fcfca45e17f29f73bc819adc9c
-EBUILD cfitsio-3.410.ebuild 1565 BLAKE2B 72d14e52ecd130a4db75b36f673e6b18b471a24ef508e1b91d8cdf624bdb134d874c4514aa47d7eecf280e9d7e2e004e1d7361c0c60e10669ef95081f805e132 SHA512 31777199cabaad85b790099a21b777e2b0edab4dc113617e8e6d7e253f9bc7d904a1acbca022e1c680edc94a244c3a1e8c710d4054953a874be11abc2e399c47
 EBUILD cfitsio-3.490.ebuild 1686 BLAKE2B d0c6ae3ca97256014b099d06e1e6845cab85de45687dd0382885fd3ff546ae9de8c232a47c034aecd0dbdbdc47cd971c48530280ef302faf5ee9e7682cf67228 SHA512 875024f7b8fad89b808353c899fd28406877c8b5a013de903822967ae9729d8829d8ef0e18db45441425bc6c5c1ec4e1f8f505e35224d5c32b88b528fd9c8f0c
-MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
+MISC metadata.xml 735 BLAKE2B 86858521413eb8b7c4157eb8209d78ff3812b23455b11c1c34ab3c12bfc3c353da22b4a2406f875443a09917d9a62be7e6abb64bf68a52eab63c5e5471a0bd0a SHA512 a910acae21cb1bf47116b3b85a2c48f8327daaf146bb8c8d9d984b098f23b5885d6554750f9c555c1044c19d2a5f7e94f546f0a4b2cff407160215b9691bfde8
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
deleted file mode 100644
index d281612a65bf..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples fortran static-libs +tools threads"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_enable threads)
-		$(use_enable tools)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc README* Changes* docs/changes.txt docs/cfitsio.doc
-	use fortran && dodoc docs/fitsio.doc
-	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	use doc && use fortran && dodoc docs/fitsio.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc cookbook.c testprog.c speed.c smem.c
-		use fortran && dodoc cookbook.f testf77.f
-	fi
-}
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
deleted file mode 100644
index 2ff8d4bbe26e..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 ltprune multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="bzip2 doc examples fortran static-libs +tools threads"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		$(use_with bzip2)
-}
-
-multilib_src_install_all() {
-	dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc
-	use fortran && dodoc docs/fitsio.doc
-	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	use doc && use fortran && dodoc docs/fitsio.pdf
-	if use examples; then
-		docinto examples
-		dodoc cookbook.c testprog.c speed.c smem.c
-		use fortran && dodoc cookbook.f testf77.f
-	fi
-	prune_libtool_files --all
-}
diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
index 70b6e88c674a..c25c3510d3a5 100644
--- a/sci-libs/cfitsio/metadata.xml
+++ b/sci-libs/cfitsio/metadata.xml
@@ -14,8 +14,4 @@
   features for manipulating and filtering the information in FITS
   files.
 </longdescription>
-  <use>
-    <flag name="tools">Build execs fpack, funpack, imcopy, fitscopy, listhead
-  </flag>
-  </use>
 </pkgmetadata>
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
new file mode 100644
index 000000000000..3a422dcd4f45
--- /dev/null
+++ b/sci-libs/hipCUB/Manifest
@@ -0,0 +1,3 @@
+DIST hipCUB-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
+EBUILD hipCUB-4.0.0-r1.ebuild 1099 BLAKE2B 93fb8305ce51fa26eae6be6d26ef05fa5916c7c7f8975d1694209e25d9bb5d69b55ef45175b65a957b79b32f61de6a76b7661f1cca1e2248dce0ce3b7048e6e5 SHA512 59440f40bc7f8600665c30f6098afd18d9219ad9e18db2a43edf654ad4a3d86241f0e12680721d16d056573d690ceae96f0bcb08b6d251d7963c829c9807fa3b
+MISC metadata.xml 545 BLAKE2B 322181ffcfe654260a2e65d7b73d5950d99094eb11495fb28ec3c24107fc3aa4dbcdb4eae53db9ae7532fccd66fc58987eb54bc1832548e1d7be547d26da3ea2 SHA512 a84c2a3df04d541a792bf026ac80f18e2f905f180699e36368dfdb74b2649f3956694263f9cc184d01ecbf60803f6cb213b4a283f252ba3e6028297d205bd038
diff --git a/sci-libs/hipCUB/hipCUB-4.0.0-r1.ebuild b/sci-libs/hipCUB/hipCUB-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..922c5df9c8ab
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-4.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A thin wrapper library on top of rocPRIM or CUB"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*
+	=sci-libs/rocPRIM-${PV}*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+src_prepare() {
+	sed -e "/PREFIX hipcub/d" \
+		-e "/DESTINATION/s:hipcub/include/:include/:" \
+		-e "/rocm_install_symlink_subdir(hipcub)/d" \
+		-e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die
+
+	sed	-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
new file mode 100644
index 000000000000..bc384a7a870c
--- /dev/null
+++ b/sci-libs/hipCUB/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
new file mode 100644
index 000000000000..eb5a604af10e
--- /dev/null
+++ b/sci-libs/hipSPARSE/Manifest
@@ -0,0 +1,3 @@
+DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614 SHA512 78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
+EBUILD hipSPARSE-4.0.0-r1.ebuild 1139 BLAKE2B f121839a28ad5d73c51175ac4b0d071e315165010ac02cb3659658d55c13ac7b679d9b347bac747c1ecb00f5f486e1129f287346a92cda0c738ff468ff8d2b18 SHA512 2637a62410ca0084fa15ebd46507615cfba7a6b10a91326dae41ff7b9b35a1e0fcc11f160885d6333c37956e1b8a5f96191792d03406f923bad50f43f884059c
+MISC metadata.xml 588 BLAKE2B 28ef304a020639fe4677a6fac7d4bd56a544406d05feab9c11567d98c00fc612d4f2bd89b95df4850d0a892bfadd01e38356c35df7ecd4e3ea156482e50eb0f8 SHA512 491b454e61d5aae073bcf5a591dcddc7267bb929bdc686c5d811310025dd94ab8b5ad65abbec1b2ab5e9d91eff204b5e97c163a0e6c5f9af9ad7a245fcad4b4b
diff --git a/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..6db7fd375008
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=dev-util/rocminfo-$(ver_cut 1-2)
+		 =dev-util/hip-$(ver_cut 1-2)*
+		 =sci-libs/rocSPARSE-${PV}*"
+DEPEND="${RDPEND}"
+
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s/PREFIX hipsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \
+		-e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \
+		-i library/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
new file mode 100644
index 000000000000..b745c3d73285
--- /dev/null
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/kim-api/Manifest b/sci-libs/kim-api/Manifest
index dff67f7037f3..ae24f3dec07a 100644
--- a/sci-libs/kim-api/Manifest
+++ b/sci-libs/kim-api/Manifest
@@ -1,3 +1,3 @@
-DIST kim-api-2.1.3.txz 296492 BLAKE2B 707ae2eaeaa737865d9b4f48a7f1ed53fb6453fc3680dee3b5b41f315b60710dfa9546105bc871cf1a4667644434e4a8eab0c95976feef3bed73ff8401613ac3 SHA512 efbc0214234b43a65ed40d23d8faa5264ac1dbd056e9e340548ea7ee5dc530f9cfb2d85a1d9d47fba9dfc7aa660a8ec20374daf4aa8ee605e7c097ae2a12512d
-EBUILD kim-api-2.1.3-r1.ebuild 398 BLAKE2B 55f05b6a719b35786e54f33091bb5c2c8fd89e57040da0c001b49193a5941c9edc732633a6858da4888395999e1dbbbcad46b2179561402cd50f2dd4307ec330 SHA512 c9bdf61a482e18cb52adf2b58ff531421492c0060ab3da448ca9c9711eb2bde04984c1abd5f610806aafefdaa228aa212cabd9241c30d0bd8896d142b617d93d
+DIST kim-api-2.2.1.txz 351144 BLAKE2B d8086904051633549e9fa5e3fd774cad625048a55864aa52840c4a03f8fca4c3e91746fac78a85449c31254a2ffd39bbb521bd119b2f0a79a9ce809aa4eb8bf5 SHA512 b2625dc41474849f281f266a1fa8a2b1738d2433031d2181bde36ac5ec050fcdec3925cb588b287a46c80c01c730be04352ca88a9ba71fc3b37c2da1c84ae650
+EBUILD kim-api-2.2.1.ebuild 390 BLAKE2B 7f22700f96c3a19ea90d539120c00e860e1707f369c1b4b008036140fb2d217e0d1bbb4ed83f8e2691ae3effb2ebd5e80e2349f5ad4f8adcb7348c624a6ee94c SHA512 bff1a2a94b3e7d00ed2608f5c153be7cefc06a106ef4d66a005a1c4eb0bfe774bd022bb13b21a964d7e9386292cc77aeba12758bc6b43de880355f48d64b7e8e
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-libs/kim-api/kim-api-2.1.3-r1.ebuild b/sci-libs/kim-api/kim-api-2.2.1.ebuild
index b1edca4f5a16..94107339ee17 100644
--- a/sci-libs/kim-api/kim-api-2.1.3-r1.ebuild
+++ b/sci-libs/kim-api/kim-api-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ SRC_URI="https://s3.openkim.org/${PN}/${P}.txz"
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="app-editors/vim-core"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index 289b2fc57399..9f0778058125 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,3 +1,3 @@
-DIST libecpint-1.0.2.tar.gz 1161801 BLAKE2B 98b9264055bc9dab86ad54921f65380bca6cf96a2e6000bc061998367b3eeaffe122fa03ed83c75deb568ee7cce49ff85b97909bd57ae057a189025421dee82e SHA512 adf9394628a39d1e07e4f02bf4fad1c3d19cbfd9a9aa123d6151dddb78c7ef2c2cab07bc7060dba1d5114756c03964c2bd237c82203a1efb38b9facaaa24c74a
-EBUILD libecpint-1.0.2.ebuild 614 BLAKE2B cfa9e63c58e931e386cd1fa89252621ae2056ec93a10e8b1dd0ca3c87c14a0973c69707844f26710cf90b5561b858d9ee87abbeb0c6cceee780ec787cb004978 SHA512 aef1b9a6f9ed45d329af61014925b8fc17336bdb12a66b283100856eab619cf4005a2b0974f021452c1f1c59c484d2076439138c1865a1a535f027ed3276b16d
+DIST libecpint-1.0.4.tar.gz 1313698 BLAKE2B 63f7ce2001ae9bdc975af083735f82fd03e133e880061d3c8659bf18d8236d09a7337049977cea6867a4e0e586d4112ccef6a8ee098903869111551364f614fb SHA512 ff38b598351e4499cd2d270a15e8c2dedcb0a6bc6aafcfc7a88ed8053199356e209bdb630713370aacbc3bba2a169050520405f7003feea7b064140d6d5337b6
+EBUILD libecpint-1.0.4.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.2.ebuild b/sci-libs/libecpint/libecpint-1.0.4.ebuild
index 40c0946f2990..47004ee7019c 100644
--- a/sci-libs/libecpint/libecpint-1.0.2.ebuild
+++ b/sci-libs/libecpint/libecpint-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,18 +9,18 @@ DESCRIPTION="Efficient evaluation of integrals over ab initio effective core pot
 HOMEPAGE="https://github.com/robashaw/libecpint"
 SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-libs/pugixml
+RDEPEND="dev-libs/pugixml"
+DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DLIBECPINT_BUILD_TESTS=$(usex test)
 	)
 	cmake_src_configure
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 375460a658e5..6319987d144f 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,5 +1,7 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
 AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c50415ded096ce08cf0cb88f70206c3e471cbdd2d619d61e3bd08aecfcb8a2fbf7deafdd773768e9cfb80ffcde0aaa05d4a96e3cacaf SHA512 f4c8fadce30f3ade704cc38b1646beefbc3676e9f68e06067e89617fe584b3f2a2b13615e5e8949c6a1ec4d88fcf4937922d8d47f498f1feefddb096b17df51b
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
+DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 EBUILD libgeotiff-1.5.1-r1.ebuild 1326 BLAKE2B 6049afbf19b1aaa323ca2403984f207de3c7830e9664b0b7ed774149c3a9976ac902f8aa545250fd8a344ed5a9b6c5b18e8092d864849d77647ebb3633b54d05 SHA512 f7a3143274f2ce1c692c53dc1359c0c1bfd347f9325f42bc975fb1f7afbe19de9620b26bea721a45602f3b4db06946032eb11267afa144519179d602fba1bb08
+EBUILD libgeotiff-1.6.0.ebuild 1280 BLAKE2B b170ade2d47ab4bfccf9fd88b2b3e49a901678a4278d0afd7e9db9f397b4a61cb11818585af23ff1e633efe7a53106453af486e1cd2ff367feafb087caf9e75a SHA512 0620077f80bbd090f0b05505ea535da74c92ce11f6ab0eb7e37fe447993a6689eb4ec8a2e82520ffe7a6f186889f3ac68266f5d8e07e28704a0cd4543d910063
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
new file mode 100644
index 000000000000..0826b31d2196
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
+SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc static-libs"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+DEPEND="
+	>=media-libs/tiff-3.9.1:0
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib
+	virtual/jpeg:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s:-O3::g" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-debug=$(usex debug) \
+		--with-jpeg="${EPREFIX}"/usr \
+		--with-zip="${EPREFIX}"/usr
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/api/. )
+
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 490011dc372c..6a760f8e4336 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,8 +1,5 @@
-AUX libqalculate-0.9.9-readline.patch 424 BLAKE2B be67a73b0ee7c01c059111261305450b1c6c1547062eee955f6dac2d22582a70df85a3feb8189b304ee388b2a8aee69a8a9ce7bb7408d5fc9957178b66f3dd0f SHA512 677589db5ce91c8092666f20d54e8f607a4ad06beaddbe8a1b11262d70eb2707cf70a608b797efa20b635e018da082585d74309e6506f78f931c09487b8c9aa2
-DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8fee163a79768a09ec5e7e5d329aa11ed9dafbf77f4ce194a96c2ac6a3b55a9c0d16755d5e106123cc2a5f931f6872d91 SHA512 c7692dcd91e0a7aea8184ca5366a3caf704b6e716c9e8552f4214ce7fc3157cf127daf7a063196383e4d5a99f8703486f2282c7fb01acafee5e1b3d8993de384
-DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
 DIST libqalculate-3.15.0.tar.gz 1747863 BLAKE2B eed4cf8f11546b80e9556cfdf09e48d8c4c29948e6bdc02b3f9efd9aa6dce8e6c5eecf440bf4b6243ddcdb59cb7176f1eb054a3ef73cc91444d86ed7645f3a37 SHA512 b8f2af83218a3f90326cb7f679b71cac328cf0591178ed718920cd491d682cf7341c702934b3a232bea5a67ec2d2e09b4321a7ac938c5bc1e221bee086ae4c36
-EBUILD libqalculate-0.9.9.ebuild 1442 BLAKE2B 642e3aef938dcc78f032a5a087ece871d08bd3bee90a8d709e1f56825fcacb048215b9ce4b92893fe68fc0f3659f9709fb5c335646b9ccf99d5d500009c4caa3 SHA512 c7738173ce5ba9290d6571f20089649b93133e2ac1d3ab84acf2bce312bf8dcb69ea7acdde2bce526a07df24312819da88dd24906406195091159bce509668ef
-EBUILD libqalculate-2.8.1.ebuild 1438 BLAKE2B 0550f2dc76b323b0f6d6a20fbef66a7d65011ffb4747c0e1dd812a752d75fe2cdf57ad37ad8080a3d9336a12918ba0937a3be39899461e32b40933855410e8c8 SHA512 990790716b50742317fbd56ed110b69d1573fb89d1fdf3f735087c7364f576c6af4fd882c67c2d4d69e867555656976e2a5ba7607a4a483136d4200a616800c4
-EBUILD libqalculate-3.15.0-r1.ebuild 1430 BLAKE2B a3d6f44135ec92a7580145908cd76ee5b6e82625164f679b73ec1b2d202c7584de298d2a3d3b346ef6e0fdf46eb3606c066a5a92ce5c022cc6950c26f083031b SHA512 f0007784f901a4ca786d7fb274337f4d8df3b954a96a8f59152551abb6d0fd21402066ceb64b12e90fc9bf7321b63c92be251a7bb41888ce80eac036d3051750
+DIST libqalculate-3.16.1.tar.gz 1756176 BLAKE2B b09e06a4d89249bb3e38a47ed47acc7598bc62e966673a1eb175641b1018021199dbbcd38266301ec8b2d3c55747378adfde3db4e25e58771be162905cb493dc SHA512 3cc7ba66493252015b9d33835188c236b10afdce5f23021a5e686609609265aed81d592815ee6a172c269a0f144a3203c954435fea8ddb82637453d5c98cd05a
+EBUILD libqalculate-3.15.0-r1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
+EBUILD libqalculate-3.16.1.ebuild 1430 BLAKE2B 5ad7454423b04634dba7f119e0626a16b0a1eb84b5652293ce60a2f42c6c89faddd599deb68ee8ccdd1efaebb49f492b960762d6b298057a94a4f30e062f06f5 SHA512 fa4967817bd224a292a93ff1b0c698180f9de41fc374c1c6f9dab2654f5705d21435d8fd49a1214cf47cc669106fa53f93b6c178846ed54e2cc2d7a393aa206f
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch b/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch
deleted file mode 100644
index ab2a5a0eb3ff..000000000000
--- a/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru libqalculate-0.9.9.orig/src/qalc.cc libqalculate-0.9.9/src/qalc.cc
---- libqalculate-0.9.9.orig/src/qalc.cc	2016-07-26 14:41:40.000000000 +0200
-+++ libqalculate-0.9.9/src/qalc.cc	2016-08-04 18:27:36.553906707 +0200
-@@ -3179,7 +3179,9 @@
- 		if(!file) {
- 			g_free(gstr_file);
- 			g_free(gstr_oldfile);
-+#ifdef HAVE_LIBREADLINE
- 			g_free(historyfile);
-+#endif
- 			first_time = true;
- 			set_saved_mode();
- 			return;
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
deleted file mode 100644
index 205d51b8dc7a..000000000000
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot readline static-libs"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	>=sci-libs/cln-1.2
-	sys-libs/zlib
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/wget
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-
-PATCHES=(
-	# https://github.com/Qalculate/libqalculate/issues/6
-	"${FILESDIR}"/${P}-readline.patch
-)
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF
-	# Required by make check
-	data/currencies.xml.in
-	data/datasets.xml.in
-	data/elements.xml.in
-	data/functions.xml.in
-	data/planets.xml.in
-	data/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
index 822797484de7..35672fd3c7e3 100644
--- a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild b/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
index 2cd5124b9489..94aa33f3f886 100644
--- a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.16.1.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
@@ -8,11 +8,11 @@ HOMEPAGE="https://qalculate.github.io/"
 SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline static-libs"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/gmp:0=
 	dev-libs/libxml2:2
 	dev-libs/mpfr:0=
@@ -20,33 +20,35 @@ COMMON_DEPEND="
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu:= )
 	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
 
 src_prepare() {
 	default
 
-	cat >po/POTFILES.skip <<-EOF
-	# Required by make check
-	data/currencies.xml.in
-	data/datasets.xml.in
-	data/elements.xml.in
-	data/functions.xml.in
-	data/planets.xml.in
-	data/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
 	EOF
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
 		$(use_with icu) \
 		$(use_with readline)
 }
@@ -57,8 +59,7 @@ src_install() {
 		DESTDIR="${D}" \
 		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
+	einstalldocs
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/libtifiles2/Manifest b/sci-libs/libtifiles2/Manifest
index 979598312f18..8f1c4f35b0e8 100644
--- a/sci-libs/libtifiles2/Manifest
+++ b/sci-libs/libtifiles2/Manifest
@@ -1,5 +1,3 @@
-DIST libtifiles2-1.1.6.tar.bz2 390447 BLAKE2B 182bd59aa5b45d2f86c64fb17b9ae9de6246cd6ffcd719069d7b94e67a5b5a2d674cbe0824f68a6492aa9844941bb74a59c2f81bea85a460f0463b962e81eb73 SHA512 abc40275e7af921a67b658c6b6aa8ec511e965a3e9e00fcdc676c2b85e1d95dbae0f118e127e0806950d26afde9949251e47eb85af04d8f8ecca777dc3afcd23
 DIST libtifiles2-1.1.7.tar.bz2 122454 BLAKE2B 1ae51ccde4a5a9127b015b6fa5ad4d446e56b473330a3d220c6a6b7cb333161e9e9d80cae7ac8985beb0e844ce21ffdc4713847d69986b6d7f5506a5a6b1545f SHA512 e2ef4de0ce8c78f0da4098ec618a7194f9b94a028f9cb54a0ea1c29c00028d7cf144a067d8aaf8010ad094378b6426d05621d530cfbfa05f793f6c1ed41fcaef
-EBUILD libtifiles2-1.1.6-r1.ebuild 968 BLAKE2B 8f64170d459619c9824c571cecb61f194b8c88a0860ac1f41c10e128e2a3b7f8a17c58c78037b7436ed231951d1053e22d2b35cf6483f8f0c9257e5a91c74a0a SHA512 1d90214dc84adcec0d76c2e9a8f5efb4d517abbba8f35a5ac33e30ca35fda7c4c584cbcb8054959bac05196d7b887796cb0be71e0a09348b7e939f5ed44ebfb2
 EBUILD libtifiles2-1.1.7.ebuild 902 BLAKE2B 3abac43d194cb3d05af02c4e65ab75293278e54b532ffaaefdcf590924327811a0d13bbe70b001d17dfae86588df6a146b381b3ec6729ab1e75c380efcc2c786 SHA512 023447c2ab16041bb8c638c17c26ae2ee504869b2d5bcc1a5e5b4b7538bcd8c7484ac79ff5da3495e4f752720479e93558a2659886e9d4b290905d7e75168326
 MISC metadata.xml 690 BLAKE2B 1133dcf45df0e6543185f2c100d8f4a5f96ff4a684c0d5e00260ac488b024424a6cf06733809ba4fadbd304c53871659aa762806f070852951f3db6cc2d65c20 SHA512 cf23ec955770b70eecd478cc2ddc421185d1dc150062c614387a74d040f01f502f0aecd3e28d3aa61e65c7ce89069db75e99286d9b25498410d83ea5b731b467
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild
deleted file mode 100644
index 6ccf9e28bc6a..000000000000
--- a/sci-libs/libtifiles2/libtifiles2-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library for TI calculator files"
-HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc nls static-libs"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	>=sci-libs/libticables2-1.3.3
-	>=sci-libs/libticonv-1.1.3
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
-
-src_prepare() {
-	cd src
-	sed -i -e "s|types\*.h|$(echo types*.h)|" Makefile.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable nls)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml docs/html/*
-}
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index bf2d51fad3a7..50fcc9c43adc 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,5 +1,7 @@
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
+DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
 EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
 EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
+EBUILD libxc-5.1.0.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-5.1.0.ebuild b/sci-libs/libxc/libxc-5.1.0.ebuild
new file mode 100644
index 000000000000..bade5f34f401
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index e092b7b3ebe9..6f2a6772672b 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,5 +1,5 @@
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
 DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e
 EBUILD lrslib-062.ebuild 1109 BLAKE2B 265335aaed9ae273357aa6aca2a594535e9525ef65e2bb916aa1d595eb1973f21b0df851429e800d0f9fc00a4ab76946a84d872d40da246910ec0dce6bc7e914 SHA512 b7ef45f744372e6e7523417a77cdd9a1b42eb24cd26b71b99a6fbc20e3f6bd14cd5c5ed2faae3a8de8a52f9c1a2e6f8afa5dc31487e61feafcf55971cb87a901
-EBUILD lrslib-071.ebuild 1040 BLAKE2B da219853f43a1e2904b77663bf748b65eaa9c6cfbc823951c6495dab44e7198ee1b8684720a5fd5b3157bc73d483c4366ff26f89a3332fb8d7908a374f6f79a7 SHA512 61a1464b23126c7971a7bcfff7117cc44f93dc8a4b1e7adcf979be85894fcdf76e11ad7435b9f9a561692eacce3542a96583fba7e0531c1eebedcd7e06257a4f
+EBUILD lrslib-071.ebuild 1039 BLAKE2B 4a94c591406d9e4eb5f64476327e09baf8653434bd836b8c95592c6179399d8231f3ecabb0b342e6770fecf886ef20f3bb534b0fa79501fe34a4f6e5b5749727 SHA512 c904206d02dac52865e156d08871e21b4f7cd91aef7e1d21aa7b76ec1cad4d34e06798b4d2983566e1e0acc5db9e2fe0fd29f6de535e7b29af9d211efb88458b
 MISC metadata.xml 769 BLAKE2B 5660de1ef577fce0595a5d28eac737e1454bb97ec47a1993cfc9047a505ebef1d1c3984a129e4367ba5dfb2f8bc5975bcb7b7332e268528d820f1ea3231dabbc SHA512 f604771858909c1fb3f4f4c47094e9d6b16c1294575026246008c927a4d99aae6a2bdad45d66fe87c8be68b5a5a23f6fdfa72ec26a00a2a48a2ae7fe64cfb57d
diff --git a/sci-libs/lrslib/lrslib-071.ebuild b/sci-libs/lrslib/lrslib-071.ebuild
index 1d033c0eef9f..dcee50eee912 100644
--- a/sci-libs/lrslib/lrslib-071.ebuild
+++ b/sci-libs/lrslib/lrslib-071.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="gmp mpi"
 
 RDEPEND="
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index a5aec541abbd..c7a36d9ebac7 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,3 +1,3 @@
-DIST matio-1.5.17.tar.gz 10066268 BLAKE2B 0852d1861bb4c43acd8a34d7114d29b7e15aa00e6f995d8516d22ff9420268cf7de7b82e08ee33978891bdfd02fcf3f8441aa1466e66e112a21f01abd6f3f0e0 SHA512 af8ff11c7c44fea9ea6886e381f49ef9186946f3def98ad9695f2d5d1df045c35e8f4ceac12a44be397f7bbd708b4803762b5ce54c45b60a9f446d551c04f5d2
-EBUILD matio-1.5.17.ebuild 964 BLAKE2B 75bcdba772c7aa2c951f942f31c7bc7dc89ffc25fe516d5dc5af505e0b8f5e4a4be001bd82081a476c88f7db174c1c9fa75de6bab19fc7e4e3f823cad7f28db1 SHA512 698c744736765b074707d6db5dbe1a60eee70f11e518c0afea55e97baf0bb624067300daea45d982cc331baa108fdd7a923b30097e80963d687815ae1d3a863e
+DIST matio-1.5.19.tar.gz 10108869 BLAKE2B db641bda8d68e203af765aa83ecf661e011995e242c4f91aacb4bcc8ba2b545c36a3eec3f4954b3d7ecc286e630acd15b34ec48b372063bfb8b892259fc49ec7 SHA512 c087944a7d87d78a7de662d7e19f5f81c55858cf5bf315c28d5a0f7544555b0816045e20bb0c83752eb3d54b589d9237a27cf3de98e3ebefcc7ea0af9311740e
+EBUILD matio-1.5.19.ebuild 966 BLAKE2B 7bfd290e52e38a2805caad4580b1c5400c2c7ab9df3081347e82a5e055337808a408a16f7395b88d2c7a00cdbeb7cdfaa639bc29ef6b3140c3e74aaafb2ae7c7 SHA512 047f6456e2954383b004cabdf8c4e20684188714fc65e266ca4c9cdcc4375273db6d5e1ee059660a6059752e3d48c5c035d73f0fa6c28debd272c1fe5ae28834
 MISC metadata.xml 591 BLAKE2B f3e23baf2a3e7bd304987be8296034faf78988c95b4d9fbb9eedc7e8cc6efa0c1479a4ed48ecc10d9b0aee6c92603f4436e8d6b34811b227e86a5f822f47adf3 SHA512 d6f20bbc3bff29f3d163909acb1aa6f3cc6557c5717c3ee9771ef17fbd14fe17836f26c2b2dc4defb4223cdeb5b978ef13c4d4a294a1ac11f0559e2518d58009
diff --git a/sci-libs/matio/matio-1.5.17.ebuild b/sci-libs/matio/matio-1.5.19.ebuild
index da6218a96d9f..adb63f7b65e3 100644
--- a/sci-libs/matio/matio-1.5.17.ebuild
+++ b/sci-libs/matio/matio-1.5.19.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://sourceforge.net/projects/matio/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-SLOT="0/9" # subslot = soname version
+SLOT="0/11" # subslot = soname version
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hdf5 sparse"
 
@@ -42,5 +42,5 @@ src_install() {
 	fi
 
 	# no static archives
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index dbc2f1aafd70..e89e5578fc8e 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1,4 +1,4 @@
-DIST nanoflann-1.2.3.tar.gz 1157793 BLAKE2B e6b3947c5c99689da5d3759e0217deca691bada8089cdd1e3cd41902b0db2533908fab1ff5474851064d3f2ab6a5a70429320bbf432a0381df4aec0139a6b2f4 SHA512 01d5226fb669c9ef21e1bd36bddb07c7bf8bbbf9798e90bfa7966de4ae01e05c669c33a73d37340c41c79fcab81c91c3991077d799a211985b2d0a2a365a8878
-EBUILD nanoflann-1.2.3.ebuild 756 BLAKE2B 204bbc4525b6fd29e23db6392600411011e7a1fac0c71d36e53b78f6073294fb63c183713842b93e129a1825c6bee76cba8087c4275af3fd1319772c1f236db3 SHA512 0d00c70727915b2bd08ff8358202e3c34dbac4f728ceda19ef4d2929c385c7048ff0f671f586f59ca14c4c746c2b75d60c659c86c4a105f59a96dae6efb50e43
-EBUILD nanoflann-9999.ebuild 756 BLAKE2B 204bbc4525b6fd29e23db6392600411011e7a1fac0c71d36e53b78f6073294fb63c183713842b93e129a1825c6bee76cba8087c4275af3fd1319772c1f236db3 SHA512 0d00c70727915b2bd08ff8358202e3c34dbac4f728ceda19ef4d2929c385c7048ff0f671f586f59ca14c4c746c2b75d60c659c86c4a105f59a96dae6efb50e43
+DIST nanoflann-1.3.2.tar.gz 685060 BLAKE2B 2dd1ed9ae3f766099d86b00e1c84a11d9162930dba91053746177ff39b7c84f770120734a235b25196620f637b94986106d364db300f51c873171e7805849b7c SHA512 937d3787df389efe530060cd2723130251e2ca7937b10f8d770c7b0d21ffd972e6da21b2b9e655c5740d57b4af8f76f0cc6d9ae39527c440be8863be0deaa7ed
+EBUILD nanoflann-1.3.2.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
+EBUILD nanoflann-9999.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
 MISC metadata.xml 686 BLAKE2B 508f3d4325543a5ac416b88524623ce4f70f67fe5d5409e73dd29d13d5770e2300250d6c6199822978bf59afffecec0cf65fa489a3d90ff3e351966be18e7d15 SHA512 d1d1537c6ad899475df91a307393fada1c593e84448c56e7b843a0eb1534725c7b0660a0f5c5feced6a6cf1bf5f25c997dc1339b3a96e7b2ef87d4f70c0a8c34
diff --git a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild b/sci-libs/nanoflann/nanoflann-1.3.2.ebuild
index 4db99558405a..0e91a4124d0e 100644
--- a/sci-libs/nanoflann/nanoflann-1.2.3.ebuild
+++ b/sci-libs/nanoflann/nanoflann-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
@@ -18,18 +18,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# do not compile examples
-	cmake_comment_add_subdirectory examples
-}
-
-src_test() {
-	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
 }
diff --git a/sci-libs/nanoflann/nanoflann-9999.ebuild b/sci-libs/nanoflann/nanoflann-9999.ebuild
index 4db99558405a..0e91a4124d0e 100644
--- a/sci-libs/nanoflann/nanoflann-9999.ebuild
+++ b/sci-libs/nanoflann/nanoflann-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ header-only library for Nearest Neighbor (NN) search wih KD-trees"
 HOMEPAGE="https://github.com/jlblancoc/nanoflann"
@@ -18,18 +18,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# do not compile examples
-	cmake_comment_add_subdirectory examples
-}
-
-src_test() {
-	"${CMAKE_MAKEFILE_GENERATOR}" -C "${BUILD_DIR}" -j1 test
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
 }
diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest
index 9b7d770b2ce6..647cf896842e 100644
--- a/sci-libs/nfft/Manifest
+++ b/sci-libs/nfft/Manifest
@@ -1,3 +1,3 @@
-DIST nfft-3.3.2.tar.gz 2821259 BLAKE2B b0029ecb0027a18de84f1a4db058101a26038547642c524125dec66bc6dc1da19873314ff6e4f483c401d39ee7c999cb9225de456be0928d55bca9fb1c1f6e69 SHA512 66bcd2439c9ba27063aa1db01c526a580c5c67938e2db332068ce20035ede1d8766e8f134a0e5dac5263aca14121573ca4f5a906b452c43f218636f5f6161c02
-EBUILD nfft-3.3.2.ebuild 1210 BLAKE2B 5324accc33d7acefc5f3e58e3f2ad5f3056c757ef456033110c07448b1c3804d31bc4ba0a2d78f4757f18af7afb4a1bb5fc70f215d3330f52521f0fc3b2c9c3f SHA512 18575547e097de5dac7c90c3b7e0094567094705e82f5ca34d5745636cd1100b6178d0f2e6b607ed62fdc2efdf45eb7af431a46dddccb7b57c2db592af2b5b98
+DIST nfft-3.5.2.tar.gz 5377870 BLAKE2B 5a9b79fd2db781f163f3e694e25096f9abfac67ae9e2f0614444e99160ac6ce150356b72130ba44f82c541120f8876723a06e989a5c125e1da1b85976b7ff500 SHA512 e5437b358f22807de2251527025accf326d77322e029cfc3df6ee733ccca4d020cbd3c045773735de0641618c71e5cc9b8f4df53becea3b7a7e27750f21fa64e
+EBUILD nfft-3.5.2.ebuild 1156 BLAKE2B 05598b4f826a66a98ad47833f50068b2f1d77b9203db8dc1abe44e4e0f0a08b1d39085916a0101bcd072a61376231802367f09259b76812ddca1a9cbd8bb7d89 SHA512 93b8eddfd7c41e50f2c4c1b373b486ea886dd8820ceb733f38230bfb9a0cc8388209cb1eeeac86dfb083ab4dcd5f80ec0c972b1528a491c6918e4312a7531891
 MISC metadata.xml 441 BLAKE2B c392cc2a2c0066e66c7d798829e10361811aa2ad350c4fe8fa61c5ee5bce261775e19141e4a4cdd9ef5411d88ce240d5f61b86a1c8c6690b68e020d8d34618a3 SHA512 72f45a8c112412d0a1db5265b29d4688263465d0039f3f178d7a44dbfb4c87336339c4517b5a948ba631248a27e0e727e92cb1617dbdfedf39910c0df44c6caa
diff --git a/sci-libs/nfft/nfft-3.3.2.ebuild b/sci-libs/nfft/nfft-3.5.2.ebuild
index 37901af7444f..f0ea656c7539 100644
--- a/sci-libs/nfft/nfft-3.3.2.ebuild
+++ b/sci-libs/nfft/nfft-3.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/NFFT/nfft/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc openmp static-libs"
+IUSE="doc openmp"
 
 RDEPEND="sci-libs/fftw:3.0[threads,openmp?]"
 DEPEND="${RDEPEND}"
@@ -34,16 +34,19 @@ pkg_pretend() {
 
 src_configure() {
 	econf \
-	    --enable-all \
+		--enable-all \
 		--enable-shared \
-		$(use_enable openmp) \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(use_enable openmp)
 }
 
 src_install() {
 	default
-	use doc || rm -r "${ED}/usr/share/doc/${P}/html" || die
 
-	# infft uses pkg-config to record its private dependencies
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/${P}/html || die
+	fi
+
+	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 5661e1888bb4..6577db37ff0d 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,5 +1,5 @@
 AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
 DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
-EBUILD octomap-1.9.5.ebuild 1690 BLAKE2B 6870c1c4024896a857df097d4c61620993b37aaaf4faed6167e79677407e61971bd74285dd69b1e1a73019ec402c17ab608a2617765a9845c4f673efd018f862 SHA512 edfee4f4e8e0a5c78c05c5b6e5dbb54c8a0a7e2b5311facfc091aceb0c5e97a87a704af9b13f0637ada6fc6d304106e0fadaebdc4aabacf6683f1f033a17dd68
+EBUILD octomap-1.9.5.ebuild 1689 BLAKE2B 169c1a5e542e61cf5a3c9dc0774cac2afd4dab5052d49058da0c6c8bc70be0a5a4d0165a2dc74d798b71d4eec60288cf884cb4df8e0585a973f335297e246d4f SHA512 9c6ed3429728027d951c4298aba8f6762a35efeba50575ab4dff6c5c49e752842f84ec71f66d1febbd506531c1f4ec96abe74bc17c58dad7f4066ea61b8f68e0
 EBUILD octomap-9999.ebuild 1975 BLAKE2B 63b34fd1c61e447e16c9e4b988e5b564d421cea9f15fad3a5e8579222c0f7f174e6c84167d7960c1e6e7d660aaa645ce88d92eba0ceb33c5254db3ef6bea7793 SHA512 018a25e757235bb8509c2e502bd87b286d484037aa4738e06014051675da58a24562580fc284276f18cbe2492779fa4214dd361aed49dbfa8170df6e81ea9f8d
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.5.ebuild
index 230100c81764..b38b3ab44bfe 100644
--- a/sci-libs/octomap/octomap-1.9.5.ebuild
+++ b/sci-libs/octomap/octomap-1.9.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
@@ -68,7 +68,7 @@ src_install() {
 		dodoc -r dynamicEDT3D/doc/html/*
 	fi
 
-  insinto /usr/share/ros_packages/${PN}
+	insinto /usr/share/ros_packages/${PN}
 	doins "${ED}/usr/share/${PN}/package.xml"
 
 	if use qt5; then
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index 79250076ebdc..605af978ee31 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,4 +1,4 @@
 AUX openlibm-0.7.2-make_inc.patch 1593 BLAKE2B 192e3c50401fe9c6a063c3cd80f8a13c9d4c1adc01d6ae4e6175787e1facf79e53d8d576cf7739690b737bfc7e6ede9e73deb60dc448c3d86d7dbf9e8c27c1c8 SHA512 f9529ab9439cf1010b8ec417476a1267a1317b7334271ac83bbaee3895a4ac577851de2a84c2778d9128b0d9d48c5867836f7a4f205da98af6b131fe78210fd4
-DIST openlibm-0.7.2.tar.gz 366285 BLAKE2B 0086d026e53c337e20dc895dad38157308b16392f590c8a2c2f7699f2bb8bd5bd0d1931672c2d31a320af0a5ad1cc2e10f2eeb953f30382cfcae5aaac0adc478 SHA512 25e5c28ef898d905ff589d24efb87a99f3772d59596ad5660afc7cafbcd709bca167e863aadc84b90b930add036d285db1332faa9adf1b73562abf1185b9ee5c
-EBUILD openlibm-0.7.2.ebuild 877 BLAKE2B a888b30dc5a5686ce38de477d76a60b9ca57604bb7758f7e807c6a1c6f4d765fb692856a0591325e7bd133ce6f9e49080f44ddc4c7b3bf6b0fe94041b157e58c SHA512 e9bbacc7a896e2c142e02a46025809b2abb1913938ea8602be8cc299a489775c8db8d173e78fc7d463e29e835f035d65b6708e2a7f05e6762b269619943f25ce
+DIST openlibm-0.7.3.tar.gz 366268 BLAKE2B 31cb50e64a3211770b1b91550382a2d4844af020a3e71dd2a7268f8faf3b3b4b54feedf4de19f27b7b74efa05961999d2b76416b1b615a554dc794cac782306f SHA512 433ec9ed5c0364b58fe1eff8760b64ad4203c7711fef02ed12d0070a34442b10c806fe6bccd81eadaa7758af2dd116c76bb769480c56e3320d548aff29d249a7
+EBUILD openlibm-0.7.3.ebuild 874 BLAKE2B f608bd9a7f4c3731803815f20d3aaddb13b7512f0c0da4ae2b3c8475c1001e554bfb7d99d3ff77912ae57a2bd1ba949901a86d1cb41e58f1b33c54fae6af99bb SHA512 1772b4af73f9e8b8cfeff2dcaac07418267604948ddb050352fd76fea7255c89c7f341d8eadf25efd664c9d0bbc1a52b3103465dd118df9634c2608617b8c1df
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/openlibm-0.7.2.ebuild b/sci-libs/openlibm/openlibm-0.7.3.ebuild
index 83cb64621d13..baa2bdfd1729 100644
--- a/sci-libs/openlibm/openlibm-0.7.2.ebuild
+++ b/sci-libs/openlibm/openlibm-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.7.2-make_inc.patch )
 src_prepare() {
 	default
 	sed -e "/^OLM_LIBS :=/s/^/#/" \
-	    -e "/install: /s/install-static//" \
+		-e "/install: /s/install-static//" \
 	-i Makefile || die
 }
 
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
new file mode 100644
index 000000000000..60f4bb189fd2
--- /dev/null
+++ b/sci-libs/rocFFT/Manifest
@@ -0,0 +1,3 @@
+DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176
+EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2
+MISC metadata.xml 585 BLAKE2B 2fbdf7e21c69e77f77246fee563ad7c809e6a8e4238a9289944278820d096143161ea5076e16dbe76aa911e0fa4f34f35ca55e8d03481dc28b27a6d37c9109b3 SHA512 473050a1aa0a75a00df4df9979af7b9f3634f5644b084a1d8bc1eec59ce040add37acc563f107220cd8563c8313af59532751558d6ad3ffe3dc7f36abf3094ca
diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
new file mode 100644
index 000000000000..6a00ab0d27c4
--- /dev/null
+++ b/sci-libs/rocFFT/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..eee74cd57dc0
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic check-reqs
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}"
+
+CHECKREQS_MEMORY="28G"
+
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s/PREFIX rocfft//" \
+		-e "/rocm_install_symlink_subdir/d" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
+		-i library/src/CMakeLists.txt || die
+
+	sed -e "/rocm_install_symlink_subdir/d" \
+		-e "$!N;s:PREFIX\n  rocfft:# PREFIX rocfft\n:;P;D" \
+		-i library/src/device/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
new file mode 100644
index 000000000000..8f9aefdbb778
--- /dev/null
+++ b/sci-libs/rocPRIM/Manifest
@@ -0,0 +1,3 @@
+DIST rocPRIM-4.0.0.tar.gz 285576 BLAKE2B 44f3542068dee48c0f2bb475f4d3fd74592fe27f4ca00a7b754014deaaa7187c4363d4b2e7fe13ff771b48d2885b848b9632ef71ce85e80e0946e4e5f13495d8 SHA512 c37fce4f16788d82379459af69b9f47f2bccb3b0e655e7314a23936cc99a474afb0092f240bd950341f1b02ce93d03abce0df7ce62ffcb5d577171ce870dd1d2
+EBUILD rocPRIM-4.0.0-r1.ebuild 1264 BLAKE2B eb3c16d117287c9a7c13b761b10af63e79b6f83d079f469319878c033bf690fed40ce0e73d29d06c2511fbc6e9a7cb87452d9019bb50e55a3a24b5b94dbe323f SHA512 69f4fb57bb026e85eebae3655a7f3f7f0ebc0155e6e503df93043cdceec8b1d5ec3a4bba4e217ea64def8be19314ddd7b4352ee6d4c8a003f9c447d25db3163a
+MISC metadata.xml 586 BLAKE2B 79a7455bbebce02029027a842a6c9add7bb4fb3305c8bff9cdfa143d0b3835ed421d960ba3dff89233717160349ad24da10b7a3a1820444fe94e0cffa5d1b079 SHA512 c73d6ee3a3bce1a9e66d0e57d31ad52f551949b3a8183af3109fe7f23796689cd6636e1280e5322c7e9721ca9fcba45bccb7a592de150e083b77e028c9fd688e
diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml
new file mode 100644
index 000000000000..3e0b6aad9ae7
--- /dev/null
+++ b/sci-libs/rocPRIM/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/rocPRIM</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocPRIM/rocPRIM-4.0.0-r1.ebuild b/sci-libs/rocPRIM/rocPRIM-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..880998e8b08c
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-4.0.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-util/hip-${PV}
+	>=dev-util/rocm-cmake-${PV}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+src_prepare() {
+	# "hcc" is depcreated, new platform ist "rocclr"
+	sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die
+
+	# Install according to FHS
+	sed -e "/PREFIX rocprim/d" \
+		-e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \
+		-e "/DESTINATION/s,rocprim/include,include," \
+		-e "/rocm_install_symlink_subdir(rocprim)/d" \
+		-i rocprim/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="gfx803;gfx900;gfx906;gfx908"
+		-DBUILD_TEST=OFF
+		-DBUILD_BENCHMARK=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
new file mode 100644
index 000000000000..cc5da9013360
--- /dev/null
+++ b/sci-libs/rocRAND/Manifest
@@ -0,0 +1,3 @@
+DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
+EBUILD rocRAND-4.0.0-r1.ebuild 1063 BLAKE2B 69823e3904b62ed811a7ea68c28b95c09e1059134e17fd62f006352e5870d2e3e9e111fbf8a1647cba517135ac46dcb829cabd98c91344bbfc1e38d7b996420a SHA512 06b4732ae433bc0996bd07fda884c7a302a4f33f92bde4b0c73eb684c8d793c3c9a0252e9961874e0fb4ab456ef584da7c47a98651fb704adf72f02e202b8c63
+MISC metadata.xml 586 BLAKE2B 72eee2fee63235c0e464a1aae761f0e862e2d7f6496d0530ab114435003188ed67cb3f0499afe5d11f2cc64019b09e2b2d8605a5a7a0d87d2477e858e3f284c8 SHA512 6dcc2e40f716b763586801119126d8e141f57be9900987733c858e1045a02833db80d8d9a538e96a47114b8f1d8404a2af17cd731b9ec7537efac88f2fa4a5ff
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
new file mode 100644
index 000000000000..77cd8b248d11
--- /dev/null
+++ b/sci-libs/rocRAND/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocRAND/rocRAND-4.0.0-r1.ebuild b/sci-libs/rocRAND/rocRAND-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..1a112d2a73d1
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-4.0.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-${PV}.tar.gz -> rocRAND-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}
+	=dev-util/rocm-cmake-$(ver_cut 1-2)*"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_prepare() {
+	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
+		-e "s:(hip|roc)rand/include:include/\1rand:" \
+		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=OFF
+	)
+
+	cmake_src_configure
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
new file mode 100644
index 000000000000..0450ae034681
--- /dev/null
+++ b/sci-libs/rocSPARSE/Manifest
@@ -0,0 +1,3 @@
+DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b
+EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
+MISC metadata.xml 588 BLAKE2B 31fa8e3f62668dcfceb07268b802f4fb7d4947e29922a13e21fc216e8e8d0a80c204e015bc892ff2ecaa974e4fb2a94e07229d43852b64979dc664a577ce5b41 SHA512 3685dc06581c36139790eb244f0fd6474cdba6e8949b41db4294dd4870d49a57fcea13d0ffb8fe89da47f81e4da161b236cf16e78de67a8ceba72a42f9da52a5
diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml
new file mode 100644
index 000000000000..73cc3d7be191
--- /dev/null
+++ b/sci-libs/rocSPARSE/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/rocSPARSE</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.0.0-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..14e2518eb4a7
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.0.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*
+	 =sci-libs/rocPRIM-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+rocSPARSE_V="0.1"
+
+BUILD_DIR="${S}/build/release"
+
+src_prepare() {
+	sed -e "s/PREFIX rocsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
+		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
+		-e "s:rocsparse/include:include/rocsparse:" \
+		-i "${S}/library/CMakeLists.txt" || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device to omit a sandbox violation
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
new file mode 100644
index 000000000000..b682dfc018b3
--- /dev/null
+++ b/sci-libs/rocThrust/Manifest
@@ -0,0 +1,4 @@
+AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b
+DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
+EBUILD rocThrust-4.0.0-r1.ebuild 1244 BLAKE2B 4f8019ccf296a915a305a405d3e80d2de348ac7717782671b76306882872a6e356bdbdb63316094ce8ccc8410fced42db56423b4d96f8d690ec6838d3721612e SHA512 40671932493ab5a2a2597a4181d03c666a9272ed881d053ecc8d8285aa8a5b68b9527b4fa0e29b6acff3f31fdfafd9cc060b9e098b16a12a7370eaa37542f5de
+MISC metadata.xml 548 BLAKE2B ae4848f909ba6a9e9695cdba7dd17fc2236b9234dff7c07d3f8356ced2f0c692788c2ec2bb922754180a1fd0af19cd38136685a00ce6e7de3247de96308b3327 SHA512 608b17dd7669411569fa066256463d8dafc15be2ce287b5229eb56d40da716d2abaeea55afec4a4759c6221f4a8042225a4abb30277d7670e9be6661a6c18aab
diff --git a/sci-libs/rocThrust/files/rocThrust-4.0-operator_new.patch b/sci-libs/rocThrust/files/rocThrust-4.0-operator_new.patch
new file mode 100644
index 000000000000..2b78fd0053ed
--- /dev/null
+++ b/sci-libs/rocThrust/files/rocThrust-4.0-operator_new.patch
@@ -0,0 +1,29 @@
+# Use copy assignment instead of copy constructor to avoid unavailability of placement new operator.
+# But more likely there is another hidden bug, since this syntax is actually correct.
+# There are still similar syntax remain in other headers, which may cause identical compilation error.
+
+# Suggested by Yuyi Wang <strawberry_str@hotmail.com>
+diff --color -uprN rocThrust-rocm-4.0.0.orig/thrust/system/hip/detail/uninitialized_copy.h rocThrust-rocm-4.0.0/thrust/system/hip/detail/uninitialized_copy.h
+--- rocThrust-rocm-4.0.0.orig/thrust/system/hip/detail/uninitialized_copy.h	2021-01-21 20:42:44.439246148 +0800
++++ rocThrust-rocm-4.0.0/thrust/system/hip/detail/uninitialized_copy.h	2021-01-21 21:13:20.926840762 +0800
+@@ -62,7 +62,7 @@ namespace __uninitialized_copy
+             InputType const& in  = raw_reference_cast(input[idx]);
+             OutputType&      out = raw_reference_cast(output[idx]);
+ 
+-            ::new(static_cast<void*>(&out)) OutputType(in);
++            out = in;
+         }
+     }; // struct functor
+ 
+diff --color -uprN rocThrust-rocm-4.0.0.orig/thrust/system/hip/detail/uninitialized_fill.h rocThrust-rocm-4.0.0/thrust/system/hip/detail/uninitialized_fill.h
+--- rocThrust-rocm-4.0.0.orig/thrust/system/hip/detail/uninitialized_fill.h	2021-01-21 20:42:44.439246148 +0800
++++ rocThrust-rocm-4.0.0/thrust/system/hip/detail/uninitialized_fill.h	2021-01-21 21:13:07.022489406 +0800
+@@ -59,7 +59,7 @@ namespace __uninitialized_fill
+         {
+             value_type& out = raw_reference_cast(items[idx]);
+ 
+-            ::new(static_cast<void*>(&out)) value_type(value);
++            out = value;
+         }
+     }; // struct functor
+ } // namespace __uninitialized_copy
diff --git a/sci-libs/rocThrust/metadata.xml b/sci-libs/rocThrust/metadata.xml
new file mode 100644
index 000000000000..b0a23ffc1e09
--- /dev/null
+++ b/sci-libs/rocThrust/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/rocThrust</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild b/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..4ca8a58bad69
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Thrust dependent software on AMD GPUs"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=dev-util/hip-${PV}
+	=sci-libs/rocPRIM-${PV}*"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+PATCHES="${FILESDIR}/rocThrust-4.0-operator_new.patch"
+
+src_prepare() {
+	sed -e "/PREFIX rocthrust/d" \
+		-e "/DESTINATION/s:rocthrust/include/thrust:include/rocthrust/thrust:" \
+		-e "/rocm_install_symlink_subdir(rocthrust)/d" \
+		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/rocthrust/:" -i thrust/CMakeLists.txt || die
+	sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
+		-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 0a2fd0ac7fa3..fd3d6c750a66 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,6 +1,8 @@
 AUX udunits-2.1.15-autotools.patch 1850 BLAKE2B dc1e48bff93de3764f488bd276b46fe7061399468c621ffb249d50218bceefb52d6e3d59284544173d9b4e340fa2d0d13c2fb04a850ad2bb8faf8f51df622f99 SHA512 bd4371d0ac9c54d2d4e8a3a0e908b38350bcb729c364de6da93da2fa580abd0f7e48cb3b902a67a9ab84fcff043dad554529cbfb5b26f48eb1f8ba87c43236db
 DIST udunits-2.1.24.tar.gz 1059344 BLAKE2B a28f13e886d4db875078ffee7577f4e17712987b0d87df586e037c1f9a0986ad206ea8bf648920269890d458a6b65250c896f4ea9ec2e8e7bfbe6e1692967530 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e
 DIST udunits-2.2.20.tar.gz 1002380 BLAKE2B 63bc2756b32aa620f390fa2b033192e8a519b4834d83ca93315ef94ec926814e01906476d7aa1dc8553505ca1a787e71ed358bccefd3c55f6141aa27247682a7 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737
+DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
 EBUILD udunits-2.1.24-r1.ebuild 982 BLAKE2B 5a66df0b348ed6fa1710ea9e0bcdbf86c417823069bc43c69c5770fdc9ec1eb2bac633e6b745f8a8e191ef5e1ed6acf9ca533ce8fc66610a693a50803b8255a7 SHA512 f010b9473546525158f03e4c01be1cee97cb975efd61e6c062e6bc637ded915ebe02e99c1c1d647b84102b52ee9e27188b976d74e64ad22a444a18c428335d79
 EBUILD udunits-2.2.20.ebuild 763 BLAKE2B 9d4e7a2b95eff615a11f95dcf4bf7634a7246b77c6ba210aab444d1ddee3e53369d4cdfb3af30383d2e7369362567aa1fddf6b4bf1502e77ec71290b0334f803 SHA512 0c5936d30b028be8f4f7e19b6c06000447e90df7f0e3e72c48c61e2c80bb5c49b74e2c8e4a85738ed4c6f3798d86a30ffe3aaf4b02fef9b2f0bd271d6eec800d
+EBUILD udunits-2.2.28.ebuild 610 BLAKE2B 67524600752caf186cfffb5189ef2c13002bba75ccad23f11fadef9a0ecf348a69b410dc6902d4296039ca29fb8491a76725656746dd8b1bc6d481666826bc0e SHA512 b01453a31fdd2cfe4dbfb9d4bb9354e5237ee1e64d314cf0a4270b326eee4a4d8373d0241f62835da669b0ef29e20dbabb27b47000bfb82c42e8cacf41e51b1f
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
new file mode 100644
index 000000000000..43ae140b3454
--- /dev/null
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2
+
+DESCRIPTION="Library for manipulating units of physical quantities"
+HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
+
+LICENSE="UCAR-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}