gentoo resync : 17.08.2021

48 files changed, 411 insertions, 751 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 55e881c8edcd..d8e4f96fb477 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 481523f1163d..5263338da090 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,5 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
 EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B 1fe0375dd7c2e12d9698301d64506dab980fc772e45113375cdd1b8de4760545c8530f1b9ae83b53aa25d9b85e8127e046c7e5cc77e4d485383eb4bb4bf5e8e1 SHA512 09bcd99b2d3cca9519cf6e7236f9eef292995aacde116f71539d3e54c016f74e0f3584079bcbfd44bd30820ed6b9cb76433fe19a5a82c5673db0015950ae8650
-EBUILD armadillo-10.3.0-r1.ebuild 3488 BLAKE2B ed411f9e1eb824ed40d7331be23250486c97fff5a13700eaef3dce410ca92ab90f8f6e8f2cb8b0d5c4903e0cc7fedc96d1f547e2fde888cff37c50bda0361daf SHA512 5731a22737ea7b24f44303c6467ea820b73823d56d80b9b81189715f017130b86323911e1462c2612da2c20334ab5052720657430da3283820d951f6cecf3e26
+EBUILD armadillo-10.3.0-r1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
 MISC metadata.xml 1455 BLAKE2B dd2a5e02b716e914005267eebf95de988339833b69e4fcd5f7f32d69beb9e04530aebbd4c338350c842f818ba10074debaa3f2a39300367ed65104f25a0bc924 SHA512 1ece1eaac64e507c4b7a706997a9dc70dc50b7930526b5c16336db5b3558c5066e6935064a2816c0f21455487bccf3a8d4a95d4b5f0e6fd9434a9cc1ae46fd50
diff --git a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
index b7abebcf9b1f..d85588ffb610 100644
--- a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 5923d4ad8be5..d928d6ae289e 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -2,5 +2,5 @@ AUX cfitsio-3.490-ldflags.patch 520 BLAKE2B 30943426915a9fe78756230ad82d700a605f
 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.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
-EBUILD cfitsio-3.490.ebuild 1686 BLAKE2B d0c6ae3ca97256014b099d06e1e6845cab85de45687dd0382885fd3ff546ae9de8c232a47c034aecd0dbdbdc47cd971c48530280ef302faf5ee9e7682cf67228 SHA512 875024f7b8fad89b808353c899fd28406877c8b5a013de903822967ae9729d8829d8ef0e18db45441425bc6c5c1ec4e1f8f505e35224d5c32b88b528fd9c8f0c
+EBUILD cfitsio-3.490.ebuild 1718 BLAKE2B 6b89bbad5bc1876148a9360d47931bc3a03a3475a7860a01c1a6ea8ecd87d117c8f10eeff492664c2c284877b7d613aec1e926b472840dd8023b15bd9b0bc17f SHA512 a046886cb8c0e6ede4581128323f1959d24c27713e45f3443a4bfda7fed80f4917f17071a06acf34c891abe07d089ea24f4774f5cb1448da348c823ade163a31
 MISC metadata.xml 735 BLAKE2B 86858521413eb8b7c4157eb8209d78ff3812b23455b11c1c34ab3c12bfc3c353da22b4a2406f875443a09917d9a62be7e6abb64bf68a52eab63c5e5471a0bd0a SHA512 a910acae21cb1bf47116b3b85a2c48f8327daaf146bb8c8d9d984b098f23b5885d6554750f9c555c1044c19d2a5f7e94f546f0a4b2cff407160215b9691bfde8
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
index d3052d10eec6..3df858d19d98 100644
--- a/sci-libs/cfitsio/cfitsio-3.490.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild
@@ -8,12 +8,12 @@ inherit fortran-2 multilib-minimal
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
 HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
+SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 BDEPEND="
@@ -25,8 +25,9 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
 	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
 "
+# Bug #803350
 DEPEND="${RDEPEND}
-	dev-lang/cfortran
+	<dev-lang/cfortran-20110621
 "
 
 PATCHES=(
diff --git a/sci-libs/fetk/Manifest b/sci-libs/fetk/Manifest
index 25efd87813dd..969da8212783 100644
--- a/sci-libs/fetk/Manifest
+++ b/sci-libs/fetk/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetk-1.5.ebuild 424 BLAKE2B 7efbd73198feb7684a41aa0d790e8882d5f0a644aafa0f7a34d70bc850eff9f2ab8cff5ffe7c235af3284f6dfaf3ef151258922e40ab03bdafdb56061c5726b1 SHA512 df722ecc3865e6fa594d76d784c595038d65c1733837e26a287de62d0554a5f7a808daa85d317f5dbd070eb52fa28621764114ef3e3cab28a034fd1b5b29c439
+EBUILD fetk-1.5.ebuild 391 BLAKE2B 76eeb228d4ef13181e481a122de8b48d80db354f53b7ec3a743ed1f6e2d4b536f5908361ab9adb4e777f0189b93dcc67fbf0375e7139fd6e56302515d48c7711 SHA512 c2afc567e61128d249fdfe9aec40c358138559e72ef088c386e50f03bc2bbca15aae7f1186d529494143e25cfc36929db6759f74614a23565dc2be7d21821218
 MISC metadata.xml 1202 BLAKE2B a72f06468eaccb003437ff4dcb95a9c6d9232e377407987b38f5861b7a5d40df40908ba6a74825c3bc1d0964e804e5e97b2f4f72956f1835268256ac8f8e13ae SHA512 b3df3f22c8757830cec30e5eeb248f104968b689f7a49524db0f2a5051540580347787a981415045b9661b17f54cdd2dbeb9771d0c710348888e27f1ca9450b1
diff --git a/sci-libs/fetk/fetk-1.5.ebuild b/sci-libs/fetk/fetk-1.5.ebuild
index 96d1ea80984f..0f930c60495b 100644
--- a/sci-libs/fetk/fetk-1.5.ebuild
+++ b/sci-libs/fetk/fetk-1.5.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="The Finite Element ToolKit - Meta package"
 HOMEPAGE="http://fetk.org/"
-SRC_URI=""
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE=""
 
 RDEPEND="
 	~dev-libs/maloc-${PV}
@@ -18,5 +16,4 @@ RDEPEND="
 	~sci-libs/gamer-${PV}
 	~sci-libs/mc-${PV}
 	~sci-libs/punc-${PV}
-	"
-DEPEND=""
+"
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index 0a60947a99ff..a30d051e4da5 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -2,6 +2,7 @@ AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f5
 AUX fflas-ffpack-2.4.3-fix-internal-linking.patch 2599 BLAKE2B f0bdb27bc8fdc62661c651f6d292774b5c130dadcec39116eceb65e09a771218a83eadb4986285477edb10c7b273629f9bf91cb43449f137f18310c347dae0a3 SHA512 5ab624546d52833fa5797890520771718ee89127149dc208f3e0cd4b1399741724576949b824539bc6612b625ce64a00a903ba3ac003d2c85104a1faf10f1434
 AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c3857385791a5c24c00ee2327192fd1c5dcb1a169ad97fa50d21124f054737dd6a1dd1c5c10377865b5b144b31eed728dedc89ea001 SHA512 8d6b3c9bd6637f1c3bf43ce722e96bd9e48b0e271cec1fb4ae72ab2e99ac7b436626385dd2e39781959248506c19474ac062c8ced2c63db80553150f8e7a0287
 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1
+AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3-r2.ebuild 2172 BLAKE2B 54ab4c5f568b867f628df6b2b3497f9b70e32f418cce3a7e775527687a8e466cb975cfb3b8447aa72610a26d13e2ed27c5441f95afdba39a7665c621df75a7f5 SHA512 abef19562794d717f84b171a5686dd9dfb62fc6fa62a017fa8a1e3de6f2b5bb250471da5fa501a6e4b3f1a9a52014dc32a3fa6c6cd9e06a32eb4f0b82033c8d9
+EBUILD fflas-ffpack-2.4.3-r2.ebuild 2246 BLAKE2B 0fead17a7af7d854fd5c594190e404d0ca1da9cd4bf4c2f94619d47b5c275aa0f97e64683e88d8c7dc3495c19fd3fc47b83abf51a98368e1c72a81304fc2524f SHA512 d68841bcdcf7da78ea18a5908089674c1d7cc17bcff1bd9372572ba91407b862d65926d4cf033b62d33af46a19a375f91c36b24f6676390216a00285109ec60d
 MISC metadata.xml 1491 BLAKE2B a26497a0f046e8103c7c5ac8ea835373d4c30d2ec2114fc75aff3cbf72155d492dd09b78ee0ef869ae9d717ff00cb84913f21f2b645e2108889fc873afaa1d88 SHA512 da5ec89287e1a22903fb283bc37caa99e90c56fc2163ef7cf7dafc657f72d69325f627c95371ceb8561a18fd95a1df40db4f8c762d5663f7cb2c2ad97e39563b
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index b97b581707a8..d13e3c0f530c 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
@@ -25,10 +25,11 @@ RDEPEND="${DEPEND}"
 
 # The no-test-echelon patch works around a test failure that may
 # eventually be fixed upstream. Gentoo bug 725446 and upstream
-# Github issue 282.
+# Github issue 282. Same for test-fgesv (bug 807100).
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
 	"${FILESDIR}/${P}-no-test-echelon.patch"
+	"${FILESDIR}/${P}-no-test-fgesv.patch"
 	"${FILESDIR}/${P}-fix-internal-linking.patch"
 	"${FILESDIR}/${P}-no-fabi-version.patch"
 )
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
new file mode 100644
index 000000000000..a995c0518566
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
@@ -0,0 +1,37 @@
+From 3f7a5f601e73491ac7c39cc848fa98fe6224978c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 16 Aug 2021 21:19:39 -0400
+Subject: [PATCH 1/1] tests/Makefile.am: disable test-fgesv.
+
+This test can fail on Gentoo, and has been reported upstream. In the
+meantime, having it fail on end users is no good, so we disable it.
+
+Gentoo-bug: https://bugs.gentoo.org/807100
+Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/341
+---
+ tests/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 62e92bc..83cf71f 100755
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -63,7 +63,6 @@ BASIC_TESTS =               \
+ 		test-io      \
+ 		test-maxdelayeddim \
+ 		test-solve \
+-		test-fgesv             \
+ 		test-simd \
+ 		test-fgemv \
+ 		test-nullspace \
+@@ -143,7 +142,6 @@ test_ftrtri_SOURCES            = test-ftrtri.C
+ #  test_fullranksubmatrix_SOURCES = test-fullranksubmatrix.C
+ #  test_invert_SOURCES            = test-invert.C
+ #  test_krylov_elim_SOURCES       = test-krylov-elim.C
+-test_fgesv_SOURCES             = test-fgesv.C
+ #  test_frobenius_SOURCES         = test-frobenius.C
+ test_nullspace_SOURCES = test-nullspace.C
+ test_fdot_SOURCES = test-fdot.C
+-- 
+2.31.1
+
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 20f7bb9c43ad..5782034ecb49 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -12,5 +12,5 @@ EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a3
 EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154b8e6b34e1eb9fa1a0adc3f2e5cd26e60f0333a19a456907f270baeab5b5c971d47b3be63626c55fa1122dd SHA512 502b3419bd6b3046733036cbe23d5b6aa277c32539c2a8819cb6b6b8a907cffa91eff81cdb75dfe7dfb5465871be4b49db8c7e631520689677c351933bf2b606
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
-EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B c08a6fb337c3a2a7fc9afe811926e076176f56a50fa7bf85c6b47a4237f10be8f3d7b4fca0d2a573313631c48e187836bc825a37bd2644322e921236e9f470f1 SHA512 b04d60c83377e2bd0bbfd51367b424377608f10f2716d9c5a465939f613d1d9936f6dddfab2760a8ea175032b1e76b89dbfbc67418ec8e71282f15dc97c07105
+EBUILD gdal-3.3.1.ebuild 7644 BLAKE2B be093150fd0555c837c3e17bd90bafac258a52f5519a456fe419ca9ad4108e997f525ed5f357da1ba051ebbf54b91f39552d778fdb32893603c2dc532c246159 SHA512 c9e4bddcde00af4d602d3734049900218d9a5fa0ba07d2a9b22b632bcf08b1b0d9743044bfe4a2d0947db290a48731be44bc7636b0b5eedbd07d9649ea39d606
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/gdal-3.3.1.ebuild b/sci-libs/gdal/gdal-3.3.1.ebuild
index a81cf8d3765a..bfcf9b5a7392 100644
--- a/sci-libs/gdal/gdal-3.3.1.ebuild
+++ b/sci-libs/gdal/gdal-3.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index d3f1ac5162b3..961901590784 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -3,5 +3,5 @@ DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142e
 DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
 EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
-EBUILD geos-3.9.1.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
+EBUILD geos-3.9.1.ebuild 1080 BLAKE2B 48c77ba041160de43d2205a14ad00f7f60d648350e989985ff5b22e0f3634c863ce15b7a631689ba3267c93030705f8216d09c04574d486ebbf14c7f638ba130 SHA512 de0981ff9381b5fca93fa304fe7c16ea02491878ce6e34a7642412d028c34c10315c346ba6c7fbea572f2d3338e52278c7a318746aff55c1435dbb4fa49239b9
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
index d3601008f05c..0f0e8c246b16 100644
--- a/sci-libs/geos/geos-3.9.1.ebuild
+++ b/sci-libs/geos/geos-3.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index d62cacb2dfd0..329cd709bd25 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -7,5 +7,5 @@ AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f6
 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
+EBUILD hdf-4.2.15.ebuild 1833 BLAKE2B 9c3235fb05bd4bf02938a7000c66e8346761c08afb7a8c2284fe9bea0cd21bc9fcdb280289140396b80c25d0e7637792655ba3ffad747cc2f66e10afcf1879c5 SHA512 a3274d47ffd795ec9404f07ad22d523da649c43717bf2b2285ad12a41a8c6f5df19c08114a928fc95b559870e61ce38e0ae1571f999b804d9fe37edeaa0d0cbd
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index b2ff7488868a..21cf98fc16d1 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index af8a49c6b596..f711c7a43aaa 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,7 +1,10 @@
+AUX hdf5-1.12.1-cmake_installdirs.patch 4313 BLAKE2B 78b894a3535c71dbd673e2061e09e1a57d57c1d65418ac87e51669e7cf8a77f023aac076686e978b89903fb0aa74f0511f779ceb149ab783e5624ec24bf5c6a6 SHA512 4a8fce1e3a5ae9d8cdca4fa377011fb7333de0b233e79c6eeed9a24154925eb8dededfe8cff4e28a7cedeb2fbfe194df1a5f18629d56de47b4ba3097824e6b7d
 AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8c3c4da0c373f88b3fdf21e1f89b169b747d49572239385228687cfc10380bdceb9ca6d1ac0d5f5154cb7a328f8a2d509fb28d SHA512 e43021ceb83909ab06ba378363c192aa0f1b34cc7c2b121f5000e215516dbdea1b825a53ac4023073bf4870a5c3452c22f5535391d95af45ad63a309e1ffa5a4
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2877 BLAKE2B 44bfd73391f6c5719dadf410494cd1b03a12fd1ce2dd356f6d1e9c7858ff2fdd0a8d180e5cdb5e25b65564190eeb64a23aedfb6e4a632568848043e594f3cdd9 SHA512 c7cb3134244caf0f6f872d8bb93042aecbdccbf8a639801eac90d293e774a9fefdf7f72022d0e025994c83f79e61b4eb029218cdf69e00667526e3b802870f3e
+DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
+EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
+EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch
new file mode 100644
index 000000000000..8c4dc34cb80c
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch
@@ -0,0 +1,103 @@
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -180,8 +180,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,13 @@
+   endif()
+ endif ()
+ 
++include (GNUInstallDirs)
++set (HDF5_INSTALL_BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
++set (HDF5_INSTALL_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
++set (HDF5_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DOCDIR}")
++set (HDF5_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set (HDF5_INSTALL_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++
+ #-----------------------------------------------------------------------------
+ # Instructions for use : Sub-Project Build
+ #
+--- a/fortran/src/CMakeLists.txt
++++ b/fortran/src/CMakeLists.txt
+@@ -537,8 +537,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/c++/src/CMakeLists.txt
++++ b/hl/c++/src/CMakeLists.txt
+@@ -91,8 +91,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/fortran/src/CMakeLists.txt
++++ b/hl/fortran/src/CMakeLists.txt
+@@ -324,8 +324,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/src/CMakeLists.txt
++++ b/hl/src/CMakeLists.txt
+@@ -123,8 +123,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1311,8 +1311,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+@@ -1419,7 +1419,7 @@
+ #  )
+   install (
+       DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
+-      DESTINATION ${HDF5_INSTALL_DATA_DIR}
++      DESTINATION ${HDF5_INSTALL_DOC_DIR}
+       COMPONENT Documents
+   )
+ 
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index 97cebb298aa6..b7aac2788497 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild
new file mode 100644
index 000000000000..c5ef043111b3
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib"
+
+REQUIRED_USE="
+	!unsupported? (
+		mpi? ( !cxx !threads )
+		threads? ( !cxx !fortran !hl )
+	)"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+	app-doc/doxygen
+	virtual/latex-base
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC="mpicc"
+		use fortran && export FC="mpif90"
+		append-libs -lmpi
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+		-DHDF5_BUILD_EXAMPLES=OFF
+		-DALLOW_UNSUPPORTED=$(usex unsupported)
+		-DBUILD_TESTING=$(usex test)
+		-DHDF5_BUILD_CPP_LIB=$(usex cxx)
+		-DHDF5_BUILD_DOC=$(usex doc)
+		-DHDF5_BUILD_FORTRAN=$(usex fortran)
+		-DHDF5_BUILD_HL_LIB=$(usex hl)
+		-DHDF5_ENABLE_CODESTACK=$(usex debug)
+		-DHDF5_ENABLE_PARALLEL=$(usex mpi)
+		-DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+		-DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+		-DHDF5_ENABLE_THREADSAFE=$(usex threads)
+		-DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: generate functioning example runners from their respective
+	# .in files - as of version 1.12.1 upstream only has it implemented
+	# for autoconf.
+	if use examples; then
+		# These are all useless outside the source tree
+		rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+		rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+		dodoc -r examples
+		if use cxx; then
+			docinto c++
+			dodoc -r c++/examples
+		fi
+		if use fortran; then
+			docinto fortran
+			dodoc -r fortran/examples
+		fi
+		if use hl; then
+			docinto hl
+			dodoc -r hl/examples
+			if use cxx; then
+				docinto hl/c++
+				dodoc -r hl/c++/examples
+			fi
+			if use fortran; then
+				docinto hl/fortran
+				dodoc -r hl/fortran/examples
+			fi
+		fi
+	fi
+}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 49dbb04861a8..0e08db2108bb 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -2,5 +2,5 @@ AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b SHA512 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
 EBUILD libgeotiff-1.6.0.ebuild 1263 BLAKE2B 501a0503040baacee952966b1a627e1cbb10d0ac266bf06ea0d57bf56d099e497d3802d96f5f29dd70432f0fd724a23cf5ea94ce00ab0c66b70279ebe85a9a7d SHA512 19963a11645ad5bc7ae9cc4eef2fd484502a5314fcc560a1dd954f09b7ec87522ef3fa03c1005eab8f46245b390cea8e02f8ba732144b7caa43dca3f52799a87
-EBUILD libgeotiff-1.7.0.ebuild 1268 BLAKE2B 374ebcdedbb6d70e95bad2c7157346906659c127f7c535a3488e322a2929ad7c17d1751fc3bb31dcb060377a17e35ccd95af623718b5592ed3f0195c28969881 SHA512 361ea2972ba1c80b17f0b080a1c7430a073586cd28d0585657b275d70f05644875253d96a4e5ab711b8d50a1c9a6bd8d51b148e7566134354bb82cebbe6c4b69
+EBUILD libgeotiff-1.7.0.ebuild 1275 BLAKE2B 7ffa6371041544cd85d748cf5884a38d2f60ee4c52e247f24df2f3fe0a600481865be33755442f483896b32fd2fdcb9684de55218101d534da4082aa3671a353 SHA512 599cc5e4701959b6e1bf3aae0ea90b9dfd421c1e3d9f32481222e72523dbeb0f867a0ee4e182064801ab8d1818368fa0f9f445e9371719ecb5061fbe78f5492a
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
index 746a584a921c..88ddc1dfab44 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc"
 
 BDEPEND="
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 064502007ec9..f543ed991198 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,5 @@
 AUX netcdf-4.7.4-big-endian-build.patch 1892 BLAKE2B 9209f042f86e4eb7d3c1359ff8c1c033eab2762aa6bf5b7a8f8e513ac52eddb2039c1728d77a2e038985a8612a04ba5654d27c872f92bcd54dde4237dc427288 SHA512 5d6cf04597897faed7ecdd4c8c182f3d22082569cbb726b25d8e922c853dbe4e7e8105c9470faaed50e254072f9411ebfc9aabc480858a0bd7fd8d77a9a2e87c
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
-EBUILD netcdf-4.7.4.ebuild 1539 BLAKE2B 0a4d13dcd179454a032f51a0abcfc21b77a7faa34dbbdeb9e26d815d4100c380c147ea1a39f929590aa896ee46c90eb7a706867db1b8b904b28aecb7e3cb2ad9 SHA512 5ad6b406b811bb58d167ec792965da5c2ed5f0ead5411e8dcc4ec6acf6880513c3b228867c7d5e2fd29050478e09422e9e4363690dce7dc0564b54624a4c2e94
+EBUILD netcdf-4.7.4.ebuild 1546 BLAKE2B 633f6501e4ad9d9cd64d573a02498e09f5b14b1a267581a8d9cefbdc66a888a4fc1df5891bfec098693fd969ae2de78fd9a5bf72c3d236a576960c9fa0688b29 SHA512 3714f027a2cc8d7e7ef542d7ad966982a300fdb41afdd8dae72650e7908abcbff9af67c316453c288063b9b1e2cbb9faf028bba2b7fc38d62db9e33e84aff065
 MISC metadata.xml 1064 BLAKE2B 8a9ba4e89005b0b5b383da9a680b3b072d49d77d72bcfc3f98e0eb4c958dac535ea9f4e8390aaa823ffe4dc879c18cc06163e6f6a109b689577bbf64ec645af1 SHA512 dced5b476f6561dbee9384deac52472cf3618b6c8e23e5e83c33e353714718aec2c84cf4ea069d3de2835f71e21f9aec786a2d317a8ebd9e1724506d56931efb
diff --git a/sci-libs/netcdf/netcdf-4.7.4.ebuild b/sci-libs/netcdf/netcdf-4.7.4.ebuild
index 428737d15aaa..a537ce445a22 100644
--- a/sci-libs/netcdf/netcdf-4.7.4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.7.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-c-${PV}"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/18"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 1110c86f5e08..51e8e5b7bc61 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -3,5 +3,5 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
-EBUILD ogdi-4.1.0.ebuild 1292 BLAKE2B 0afbdc5e6e7e21aecaaac7f1f94d4709f945e24c4bf7f624519e820704d3aed3e22b0f496137870892d125620f6f31d8865d6c4bb34373dca0da763a8db0debc SHA512 bad62a8b25c92ef7a2544a80cd3e54312d38aafe68b54415966b1288fca0e710faee7591bd06bbd6b8feb53d59be58507afee3bd015081e6746df0de18175af3
+EBUILD ogdi-4.1.0.ebuild 1299 BLAKE2B b0c013ce813035f657f2e4630b2ee664be67d84a45d04e5419c61a6e30b28a6801040f31ab4dd412a23bf52ec3277315c07e49c58fdc84830bf04d488494a24b SHA512 517d39b3e64d1964b0af9c208c6db6779dd6cc7652b5dd5374768aba7233d726a6ad74bc0cf6b5d6982047a6bff95708bbc5dc8b64ecfe94f47fbfd21514e993
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 8c064938d77e..8a821d13f953 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.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 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index dddcb4fb1f12..6c717e4aa917 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -4,7 +4,7 @@ DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924
 DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
-EBUILD proj-7.2.1.ebuild 1208 BLAKE2B bfb29e3237500f2550a7f81a1321308ff456228db5b194b809f87f5d37894fa42a1969c6ac2491f45f0f60231c96b67139f3cda7215c7b51ebc7cfd7d184bda9 SHA512 d74a2e1d47be556a9d16d14136405c2bd1d57ba0c9bc9090abb74e52d56af00c10f67568a85df2b20f56fcd46d59c68d3a5bd7f6ea112deeffb21526a5a18648
+EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
 EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
-EBUILD proj-8.1.0-r1.ebuild 1491 BLAKE2B 1a753a5b0a1d4374cd40289425a037c95b06e9d6787dc8a511939bfeca89cf395eda816c08416c651e410d5723da959681a4e304d804f6eac2e107a3aa73a834 SHA512 a7c8f68c240e3a5bedec60fbfa83c291e4dc13f84e90e63ac5eca6d3a586c33e59e774842a73c0370c35437d6e58a87e6fb9269acce6cd91f0d6c8c78f431528
+EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
 MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
index 11efd85db877..248dca09f028 100644
--- a/sci-libs/proj/proj-7.2.1.ebuild
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/proj/proj-8.1.0-r1.ebuild b/sci-libs/proj/proj-8.1.0-r1.ebuild
index 501de56a4e62..9898a2c4666a 100644
--- a/sci-libs/proj/proj-8.1.0-r1.ebuild
+++ b/sci-libs/proj/proj-8.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl europe test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index a10ef5197122..c1d233102234 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,17 +1,6 @@
-AUX 0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch 929 BLAKE2B 35e344c408d6ebe01760a421024e3cf8e0b0fd051ff5ab7992a8fe672e2066277001a1725dc9e6a1183620688bb38791c79313a371409ff6a59de176da7770b8 SHA512 fdb8561244582a63bfa356c8aae0f3bdc91d2e9e36bb11be7c8ac7be3b7f60f1ecb4c87b8d89810fc8576eed6ae5356a9d80c13fef0aa37062fe7b127d8530fa
-AUX 0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch 1000 BLAKE2B fa8a818b6eace5ae2d1d8d1da309e65b30b272cad3b2fbcaaedcb61070eff1f1b0db3b1594ddf6471b89361983f2685d49fbddbf0f33e7826bc2ce0db226ce89 SHA512 43a50f9df2b672838bef8e437b23987ca92bc7e7624f04bf2aa919bc5938e08fc1c6243e17d3c1c9e384176ef0d2d3aa0ba34e615d2316d7369520d9246a0d1d
-AUX 0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch 1135 BLAKE2B 8e86456585f07da2060f63411e4f665285665f86f78f11a1cf2a15e0d62c1d5efa33e619bec0cab9d61f854f82dd199960e214ec3378694db6e08067cb1d7929 SHA512 2a978e3f39e7b5bb8c5cb92d88b2c4b39d82ee8061cdbdd6b76aa8cfbd6d4918fd02cef440ec931c4599f7b2833ee942ebe8b51692d92450cbfdac65a14b24b5
-AUX 0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch 4692 BLAKE2B 9275336264e44d92bd7f02eba07b8f212626d37a07474dcc38bcfb24cf35750784420292e12120102673af8b42042621437dccdbd448ecf341d7883dbba56788 SHA512 32ef4f3c6f7ced7ac074594956c9d79bc4e8ed15ddeefeb3b14eca6ad1b53578dfba52cca16b3dc515290eb80c101a1452ef69379f245160d2f693397510a0d4
-AUX 0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch 1300 BLAKE2B 51623f11f92cf43252992ffa9d52d052b1370b674132232a02e33d9af5025aa195894e37eb0403e873b2112f2491b55dcf5a498da82333b474f8ed1d0c4e544a SHA512 371d9b6f41a019e985fb9876bdddf702771d1fac86a5bc14ef346344fad183788f4ba739bea59b47b673a5ac7df0c4f8fa0dbe8e24a5295bf1d9b92a52768659
-AUX 0006-configure.ac-remove-enable-debug-flag.patch 3510 BLAKE2B d908f6a1dd47b70d2731b9b645a9c6fb713c43cdcdd22bceeba57532f891a6beb9d0aa3efe4c7e5e1daf287f5f09ecd392fe48aa92c3bc3da18d884362746186 SHA512 b2629f6d90232dd0bd26eb55d14c844e218791d832038b13aa5f4b3836ae6b54aa27c32d9dc0002b3275d6cf01928da69b26fa56390fc3261f001afa05c74cdc
-AUX 0007-config.h.in-remove-QD_DEBUG-constant.patch 840 BLAKE2B 720f9992ec61c806f39837f31f68c35173708c50c14886bc39a286f5be513f49c7b663f60587af25bdc4f851409915da31300777e477d2b22b56f51d856262b4 SHA512 fda6efc3cbc5c868007653662fd0400351f0016725b62895fe5528495e6cb77ceb027755ff08c1475786511bf7a50e6e671612fd7643e3e247c4485182af0f0e
-AUX 0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch 1697 BLAKE2B f28e848cc3a6c6c513dc98c9e7d50027446d02c6ffe070a15de3cc56c77fb253a132836ac2d0eaed37cad09cc4cabbd8779806fcd89eaa70eecca09601973851 SHA512 f78205cbcd564f79fb1a1cc1002fc5bc1429428a4da7243c3894a5c33f7082376537f9f5edf33dce0192386354ee4a54885117c15a64856dd03a9ff116ef5293
-AUX 0009-configure.ac-don-t-set-CC-to-CXX.patch 1338 BLAKE2B 5c58663a9f51c9a05b78d3bfaa2584a3af53488e1afdf7f49edb2d5374b977bbb2cb62555f23ac6ea5c8bdff5682b3581051b2e6aefc4bc48dbcca0d99a8479b SHA512 27f3111aa7160eb1028f4bb40ebb002e5b7c2bb8e51b2dc6740fc37b25673274017d3e2cfffdc1de49e65cc148ede949e2eee914765ba8580db2efb2798e9cad
-AUX 0010-configure.ac-don-t-manually-search-for-compiler-name.patch 2523 BLAKE2B df5b8c919751ae74b70158cdeb715c83d3e57efa9497a81748cfcc10e77f557eee49f69383713dfc2cdd35239b6df8125c1dccd54d73953da0fc7a72d10acb52 SHA512 481d84a28cfbbd1f5768d0324d9a3c74326871c46d2e414d52a8c742e70aedbf6461f6b7dca567c3a2683baf1782248d9d942d766af3187094db7782049ccda7
-AUX 0011-qd-config.in-remove-REQ_CXXFLAGS.patch 751 BLAKE2B 95c283128d2218cde0a9f3baf1ce43d1aadf6a4cb47be830e2ee043a61988b32c9d8b1bdf025bd67f84c2ebe37aa2d04d3d60de7fde2177cdbd6ec78fa4b2718 SHA512 c36319dab08581730c8943b77cadfa93fb36f982aa6bf774909473c7dc27fd687c45d3e876e84b5c3d5fb3b49b1f93b58ea860d273dce56df0705028d7a04bd4
-AUX 0012-configure.ac-remove-the-enable-warnings-flag.patch 1544 BLAKE2B 54c316843f90676110ff41e37ac8968de871975b0d12debb9358edc446f742c1bd8914e1c681a3ab7f4050c28f4c63cce9521b3a79de6960b1f92a6132be3616 SHA512 42180e95744a0d0b6b577afe4deba95d171ea7d14d6ff3f189ad01f78667fcf4b2f81842f47b66e6ccb020beb0da0740b7cf67989835bd8871ec3cbb4817ddfb
 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-r1.ebuild 1835 BLAKE2B b0d5760fd7d5254cff90ccc55bc32e7f6835e4528a1d0bf68a4f85c391f4afc2c297be7090c4f7275bb9366742b9914b1d87721e7b44377188cc751b11fa2a00 SHA512 56b3c7c80523528a5c474b260abe5405a6309f3704332321fb3e0dd877f4b55540dabfa81202deb0dcaf27f4ca6924d7e06d02f92c94f5042275a2f5e626f95a
+DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c
 EBUILD qd-2.3.22.ebuild 1100 BLAKE2B 50c55e5d7b4bb1d1e8c0298619aad3ec1d7ba65084dd87f59105cd2be3a4e940ab71e03ecdbb3e3fd842d9604fc84df1c4c5b8ed30a9d5c8a1508be364aa7f5f SHA512 f86a94765cd174ec9d2573d79cb39e94c381d4d752ca13ea47d805336381284dd6382695c375e589899f627cf9bf2fb5b66688f82f598dcd3c5b9dd1461bac95
+EBUILD qd-2.3.23.ebuild 927 BLAKE2B ed541806090cadbd74ddd09f335b239862ed4d0b775a0c4d36f41a5ca34754586ab688d47263465a082e22b2ac4b649ec365ffe79215ec5835fceddbea6f3892 SHA512 7cc669c010d07388201bda2d999234883e75986a3c25d4690dad5274ff3b3dfc5afd341d46069089a0aa76a2951f7fcb33e1aadec27b7f4438fb6ac4cef4d3d2
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch b/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch
deleted file mode 100644
index 4fe4d49fa92b..000000000000
--- a/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a05e1577085507266908f40ff8e5246e10eb72d1 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 18:29:45 -0400
-Subject: [PATCH 01/12] configure.ac: update QD_PATCH_VERSION to 2.3.22.
-
-Autotools currently thinks that this is version 2.3.12, as can be seen
-when running
-
-  $ ./configure
-  configuring qd 2.3.12...
-
-We update QD_PATCH_VERSION within configure.ac to fix that.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2ca10c9..7485936 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,6 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
--define([QD_PATCH_VERSION], 12)
-+define([QD_PATCH_VERSION], 22)
- AC_PREREQ(2.60)
- AC_INIT(qd, 2.3.QD_PATCH_VERSION, dhbailey@lbl.gov)
- AC_CONFIG_SRCDIR([src/qd_real.cpp])
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch b/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch
deleted file mode 100644
index 956feb275117..000000000000
--- a/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0641c0b9dd87bfbef6a7b6e77cf4b264e3fa84d7 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 18:32:21 -0400
-Subject: [PATCH 02/12] configure.ac: replace AM_CONFIG_HEADER with
- AC_CONFIG_HEADERS.
-
-The AM_CONFIG_HEADER macro is obsolete, as evidenced by warnings like,
-
-  configure.ac:21: warning: 'AM_CONFIG_HEADER': this macro is obsolete.
-  configure.ac:21: You should use the 'AC_CONFIG_HEADERS' macro instead.
-
-This commit uses the suggested replacement.
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7485936..7b52a9e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,8 +18,8 @@ echo "configuring $PACKAGE $VERSION..."
- 
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE([nostdinc foreign])
--AM_CONFIG_HEADER([config.h])
--AM_CONFIG_HEADER([include/qd/qd_config.h])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_HEADERS([include/qd/qd_config.h])
- 
- AC_CANONICAL_HOST
- 
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch b/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch
deleted file mode 100644
index e436c04716db..000000000000
--- a/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a6ba0059c80849ef349b9d02e5972f89fcd59793 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 18:40:26 -0400
-Subject: [PATCH 03/12] configure.ac: replace AC_PROG_LIBTOOL with LT_INIT.
-
-The AC_PROG_LIBTOOL macro is obsolete, according to modern versions of
-autoconf:
-
-  configure.ac:316: warning: The macro `AC_PROG_LIBTOOL' is obsolete.
-  configure.ac:316: You should run autoupdate.
-
-Running autoupdate replaces it with a call to LT_INIT, which is what
-this commit does too. We have also removed a call AC_DISABLE_SHARED,
-which no longer affects anything; its removal is "harmless" since, at
-worst, it will cause some people to build shared libraries that they
-do not need.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7b52a9e..31b32f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -312,8 +312,7 @@ AC_SUBST(FFLAGS, $FCFLAGS)
- AC_CHECK_LIB(m,sqrt)
- 
- # libtool stuff
--AC_DISABLE_SHARED
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- # Output
- AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile 
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch b/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch
deleted file mode 100644
index aad1936b7017..000000000000
--- a/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 829c868c9655fa7dfd4a64a42476fe1eddadc792 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 18:47:12 -0400
-Subject: [PATCH 04/12] configure.ac: fix syntax of all AC_ARG_ENABLE calls.
-
-Currently, we find AC_ARG_ENABLE being called like
-
-  AC_ARG_ENABLE(enable_inline, ...
-
-where the corresponding argument should be --enable-inline. The
-autoconf documentation however suggests that this should be
-
-  AC_ARG_ENABLE([inline], ...
-
-so we update all of these calls accordingly. In the process, we update
-all of the corresponding AC_HELP_STRING instances, since that macro
-has been superseded by AS_HELP_STRING.
----
- configure.ac | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 31b32f5..1e91cd1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_CANONICAL_HOST
- 
- # Checks for arguments
- # --enable-inline
--AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
-+AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
- AC_MSG_CHECKING([if commonly used function is to be inlined])
- if test "$enable_inline" != "no"; then
-   enable_inline="yes"
-@@ -34,7 +34,7 @@ fi
- AC_MSG_RESULT($enable_inline)
- 
- # --enable-ieee-add
--AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
-+AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
- AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used])
- if test "$enable_ieee_add" = "yes"; then
-   AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.])
-@@ -44,7 +44,7 @@ fi
- AC_MSG_RESULT($enable_ieee_add)
- 
- # --enable-sloppy-mul
--AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy multiplication is to be used])
- if test "$enable_sloppy_mul" != "no"; then
-   enable_sloppy_mul="yes"
-@@ -53,7 +53,7 @@ fi
- AC_MSG_RESULT($enable_sloppy_mul)
- 
- # --enable-sloppy-div
--AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy division is to be used])
- if test "$enable_sloppy_div" != "no"; then
-   enable_sloppy_div="yes"
-@@ -63,7 +63,7 @@ AC_MSG_RESULT($enable_sloppy_div)
- 
- 
- # --enable-debug
--AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
-+AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
- AC_MSG_CHECKING([if debugging code is to be enabled])
- if test "$enable_debug" = "yes"; then
-   AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
-@@ -73,7 +73,7 @@ fi
- AC_MSG_RESULT($enable_debug)
- 
- # --enable-warnings
--AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
-+AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
- AC_MSG_CHECKING([if compiler warnings is to be enabled])
- if test "$enable_warnings" != "yes"; then
-   enable_warnings="no"
-@@ -149,7 +149,7 @@ if test "$enable_debug" = "yes"; then
- fi
- 
- # --enable-fma
--AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
-+AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
-   enable_fma="auto"
- fi
-@@ -248,7 +248,7 @@ if test "$FCFLAGS" = ""; then
-     FCFLAGS="-O2"
-   fi
- fi
--AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
-+AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
-   AC_LANG_PUSH(Fortran)
-   AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch b/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch
deleted file mode 100644
index cbd58a3af5f9..000000000000
--- a/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 12e53493a0413590d9dc0a0eaeeb4dfec71a1a8c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 18:52:30 -0400
-Subject: [PATCH 05/12] fortran/Makefile.am: fix underlinking of libqdmod and
- libqd_f_main.
-
-The libqdmod library needs to be linked to the just-built libqd, and
-then libqd_f_main needs to be linked to both the just-built libqd and
-the just-built libqdmod. Moreover, both of them need to be linked
-against whatever is in $FCLIBS.
-
-This commit adds two "_LIBADD" lines to fortran/Makefile.am to ensure
-that this happens. Their absence most likely only causes problems when
-the user has "--as-needed" in his LDFLAGS.
----
- fortran/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/fortran/Makefile.am b/fortran/Makefile.am
-index 1ab54f7..7a67c08 100644
---- a/fortran/Makefile.am
-+++ b/fortran/Makefile.am
-@@ -16,7 +16,9 @@ endif
- 
- lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
- libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
-+libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS)
- libqd_f_main_la_SOURCES = main.cpp
-+libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS)
- ddmod.lo: $(DDEXT) ddext.lo
- qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
- $(QDMOD): qdmod.lo $(DDMOD)
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch b/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch
deleted file mode 100644
index 151ec930e5aa..000000000000
--- a/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6aac051631b20f5cde990fb3eda8dae85ff29666 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:01:17 -0400
-Subject: [PATCH 06/12] configure.ac: remove --enable-debug flag.
-
-The --enable-debug flag only does two things at the moment:
-
-  1. It adds "-O" (as opposed to "-O2") to your CXXFLAGS and FCFLAGS.
-  2. It adds "-g" to your CXXFLAGS and FCFLAGS.
-
-When using gcc and gfortran, this is a convenient way to enable those
-debugging flags. However, those options are not guaranteed to be
-supported by other compilers. In the interest of simplicity and
-portability, this commit simply removes the flag.
-
-It would of course be possible to compile two test programs with
-CXXFLAGS="-g -O" and FCFLAGS="-g -O" to determine whether or not those
-flags are supported. That would solve half of the problem, but would
-be a no-op (that is, it would not enable any debugging features) on
-systems where the flags are not supported. That problem is more
-difficult to solve, and hints that it's best to leave specific
-compiler flags out of the build system whenever possible.
----
- configure.ac | 30 ++----------------------------
- 1 file changed, 2 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1e91cd1..108e58a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,16 +62,6 @@ fi
- AC_MSG_RESULT($enable_sloppy_div)
- 
- 
--# --enable-debug
--AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
--AC_MSG_CHECKING([if debugging code is to be enabled])
--if test "$enable_debug" = "yes"; then
--  AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
--else
--  enable_debug="no"
--fi
--AC_MSG_RESULT($enable_debug)
--
- # --enable-warnings
- AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
- AC_MSG_CHECKING([if compiler warnings is to be enabled])
-@@ -84,11 +74,7 @@ AC_MSG_RESULT($enable_warnings)
- # Checks for programs.
- AC_LANG(C++)
- if test "$CXXFLAGS" = ""; then
--  if test "$enable_debug" = "yes"; then
--    CXXFLAGS="-O"
--  else
--    CXXFLAGS="-O2"
--  fi
-+  CXXFLAGS="-O2"
- fi
- 
- # Set up compiler search list.  DUe to possible case insensitive filesystems, 
-@@ -144,10 +130,6 @@ if test "$enable_warnings" = "yes"; then
-   fi
- fi
- 
--if test "$enable_debug" = "yes"; then
--  CXXFLAGS="$CXXFLAGS -g"
--fi
--
- # --enable-fma
- AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
-@@ -242,11 +224,7 @@ AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standar
- 
- # Check for fortran-90 compiler
- if test "$FCFLAGS" = ""; then
--  if test "$enable_debug" = "yes"; then
--    FCFLAGS="-O"
--  else
--    FCFLAGS="-O2"
--  fi
-+  FCFLAGS="-O2"
- fi
- AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
-@@ -296,14 +274,10 @@ if test "$enable_fortran" != "no"; then
-   fi
-   AC_SUBST(REQ_FCFLAGS)
-   FCFLAGS="$FCFLAGS $REQ_FCFLAGS"
--  if test "$enable_debug" = "yes"; then
--    FCFLAGS="$FCFLAGS -g"
--  fi
-   AC_LANG_POP(Fortran)
- fi
- AM_CONDITIONAL(UPCASE_MODULE, [test "$module_case" = "uppercase"])
- AM_CONDITIONAL(HAVE_FORTRAN, [test "$enable_fortran" = "yes"])
--AM_CONDITIONAL(QD_DEBUG, [test "$enable_debug" = "yes"])
- 
- AC_SUBST(F77, $FC)
- AC_SUBST(FFLAGS, $FCFLAGS)
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch b/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch
deleted file mode 100644
index f3538b4953e6..000000000000
--- a/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0e7e6933467c76f97c4c1233558c3e1f8f17b52e Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:08:36 -0400
-Subject: [PATCH 07/12] config.h.in: remove QD_DEBUG constant.
-
-Having removed the --enable-debug flag from the configure script in an
-earlier commit, the constant QD_DEBUG will never be defined (or used,
-as it happens) in config.h. We remove it too.
----
- config.h.in | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/config.h.in b/config.h.in
-index a08fd0e..dcb4272 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -112,9 +112,6 @@
- /* Define this macro to be the copysign(x, y) function. */
- #undef QD_COPYSIGN
- 
--/* Define to 1 to enable debugging code. */
--#undef QD_DEBUG
--
- /* If fused multiply-add is available, define correct macro for using it. */
- #undef QD_FMA
- 
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch b/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch
deleted file mode 100644
index 5f560a816aec..000000000000
--- a/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc272f5407e10e84dc1d3e0013bc6d43ecedc5db Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:10:34 -0400
-Subject: [PATCH 08/12] configure.ac: don't assume that "-O2" is a valid
- compiler flag.
-
-Our configure script presently adds "-O2" to both CXXFLAGS and FCFLAGS
-when those variables are empty. If using gcc and gfortran, this
-enables some safe optimizations, but no checks are performed to ensure
-that the compiler actually understands "-O2". While we could compile
-some test programs to check, it may be simplest to leave the compiler
-flags up to the person (the user) who chooses the compilers themselves.
-
-Support for --enable-debug was removed in a recent commit for similar
-reasons.
----
- configure.ac | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 108e58a..823fa9e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,9 +73,6 @@ AC_MSG_RESULT($enable_warnings)
- 
- # Checks for programs.
- AC_LANG(C++)
--if test "$CXXFLAGS" = ""; then
--  CXXFLAGS="-O2"
--fi
- 
- # Set up compiler search list.  DUe to possible case insensitive filesystems, 
- # Cygwin and Apple systems sometimes gets confused between cc and CC.
-@@ -223,9 +220,7 @@ AC_DEFINE([QD_API], [], [Any special symbols needed for exporting APIs.])
- AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standard include files.])
- 
- # Check for fortran-90 compiler
--if test "$FCFLAGS" = ""; then
--  FCFLAGS="-O2"
--fi
-+
- AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
-   AC_LANG_PUSH(Fortran)
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch b/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch
deleted file mode 100644
index 14269ce2d75a..000000000000
--- a/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From eff1594d04f140d9e0a4c423a0685481a612c8ca Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:15:44 -0400
-Subject: [PATCH 09/12] configure.ac: don't set $CC to $CXX.
-
-The build system currently sets $CC to whatever $CXX that the
-configure script is able to find. This was harmless until now because
-C++ is a superset of C, so the C++ compiler should be able to compile
-any C code. But in the recently-released autoconf-2.71, the test
-program infrastructure no longer emits the
-
-  #ifdef __cplusplus
-  extern "C"
-  #endif
-
-in the same place it used to, which is breaking the test for
-name-mangling in the AC_FC_WRAPPERS macro. The macro thinks that it's
-compiling C code, but using a compiler that expects C++. While this may
-be fixable within autoconf, letting AC_PROG_CC detect the C compiler
-separately is both morally correct in this case and happens to solve the
-issue anyway.
-
-This fixes a build issue that was reported on Gentoo linux.
-
-Gentoo-bug: https://bugs.gentoo.org/775215
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 823fa9e..a657e8f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,9 +84,6 @@ case $host in
- esac
- 
- AC_PROG_CXX($cxx_list)
--if test "$CC" = ""; then
--  CC="$CXX";
--fi
- AC_PROG_CC
- 
- 
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch b/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch
deleted file mode 100644
index e8bef28db329..000000000000
--- a/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 18d508793abbfc4045af7c7c91f6d71bb5bb7ef1 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:31:36 -0400
-Subject: [PATCH 10/12] configure.ac: don't manually search for compiler
- names/flags.
-
-The AC_PROG_CXX macro is generally capable of finding the best C++
-compiler on the system these days, including the flags it needs.  This
-commit removes the hard-coded list of C++ compilers, and the manual
-computation of REQ_CXXFLAGS based on the name of the compiler.
-
-This serves another purpose: the qd-config program is capable of
-outputting an appropriate "-I" flag to allow consumers to use libqd
-when it is installed in a nonstandard location. At the moment, however,
-that "-I" flag is accompanied by whatever other REQ_CXXFLAGS were
-computed -- and many of those flags are invalid in the other context.
-By eliminating REQ_CXXFLAGS, we solve that problem too.
----
- configure.ac | 43 +------------------------------------------
- 1 file changed, 1 insertion(+), 42 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a657e8f..5ac7079 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,51 +73,10 @@ AC_MSG_RESULT($enable_warnings)
- 
- # Checks for programs.
- AC_LANG(C++)
--
--# Set up compiler search list.  DUe to possible case insensitive filesystems, 
--# Cygwin and Apple systems sometimes gets confused between cc and CC.
--# Try to use vendor compilers first, as they are often the fastest.
--case $host in 
--  *cygwin* | *mingw* ) cxx_list="" ;;
--  *apple* ) cxx_list="xlC_r xlC icpc pathCC c++ g++ gpp" ;;
--  * ) cxx_list="xlC_r xlC icpc pathCC pgCC cxx aCC CC cc++ FCC KCC RCC c++ g++ gpp" ;;
--esac
--
--AC_PROG_CXX($cxx_list)
-+AC_PROG_CXX
- AC_PROG_CC
- 
- 
--CXX_PROG_NAME=`basename $CXX`
--case $host in
--  powerpc*-*-*)
--    case "$CXX_PROG_NAME" in
--      xlC*) 
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict"
--      ;;
--    esac
--  ;;
--  i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*)
--    case "$CXX_PROG_NAME" in
--      icc|icpc|ecc)
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -mp"
--        if test "$enable_warnings" = "yes"; then
--          CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419"
--        fi
--      ;;
--    esac
--  ;;
--  alpha*-*-*)
--    case "$CXX_PROG_NAME" in
--      cxx) 
--        CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak"
--      ;;
--    esac
--  ;;
--esac
--
--AC_SUBST(REQ_CXXFLAGS)
--CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS"
--
- if test "$enable_warnings" = "yes"; then
-   if test "$GCC" = "yes"; then
-     CXXFLAGS="$CXXFLAGS -Wall"
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch b/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch
deleted file mode 100644
index 7c36b768d6e9..000000000000
--- a/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8d9e74e71cd2c0878c85b3559eeb66ec5020a99b Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:36:23 -0400
-Subject: [PATCH 11/12] qd-config.in: remove @REQ_CXXFLAGS@.
-
-We no longer compute REQ_CXXFLAGS in configure.ac, so this commit
-removes the empty variable from qd-config.in.
----
- qd-config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qd-config.in b/qd-config.in
-index 3abfcb7..56bc960 100644
---- a/qd-config.in
-+++ b/qd-config.in
-@@ -14,7 +14,7 @@ builddir="@abs_top_builddir@"
- build_CXXFLAGS="@CXXFLAGS@"
- build_LDFLAGS="@LDFLAGS@"
- CXX="@CXX@"
--CXXFLAGS="-I$includedir @REQ_CXXFLAGS@"
-+CXXFLAGS="-I$includedir"
- FC="@FC@"
- 
- LDFLAGS="-L$libdir -lqd @LIBS@"
--- 
-2.31.1
-
diff --git a/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch b/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch
deleted file mode 100644
index a7cb94077f84..000000000000
--- a/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b02e5c5403b1ac88b1fd606f3c1147330c47700c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 4 Aug 2021 19:38:31 -0400
-Subject: [PATCH 12/12] configure.ac: remove the --enable-warnings flag.
-
-This flag simply adds "-Wall" to $CXXFLAGS when it is enabled and the
-value of the $GCC variable is true. Given how easy it is to run
-
-  CXXFLAGS=-Wall ./configure
-
-(which uses standard knowledge) compared to
-
-  ./configure --enable-warnings
-
-(which does not), I don't think this flag warrants the extra complexity
-in configure.ac. This commit removes the option.
----
- configure.ac | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5ac7079..46640e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,27 +62,12 @@ fi
- AC_MSG_RESULT($enable_sloppy_div)
- 
- 
--# --enable-warnings
--AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
--AC_MSG_CHECKING([if compiler warnings is to be enabled])
--if test "$enable_warnings" != "yes"; then
--  enable_warnings="no"
--fi
--AC_MSG_RESULT($enable_warnings)
--
--
- # Checks for programs.
- AC_LANG(C++)
- AC_PROG_CXX
- AC_PROG_CC
- 
- 
--if test "$enable_warnings" = "yes"; then
--  if test "$GCC" = "yes"; then
--    CXXFLAGS="$CXXFLAGS -Wall"
--  fi
--fi
--
- # --enable-fma
- AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
--- 
-2.31.1
-
diff --git a/sci-libs/qd/qd-2.3.22-r1.ebuild b/sci-libs/qd/qd-2.3.22-r1.ebuild
deleted file mode 100644
index 3baf812eeb53..000000000000
--- a/sci-libs/qd/qd-2.3.22-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
-
-PATCHES=(
-	"${FILESDIR}/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch"
-	"${FILESDIR}/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch"
-	"${FILESDIR}/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch"
-	"${FILESDIR}/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch"
-	"${FILESDIR}/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch"
-	"${FILESDIR}/0006-configure.ac-remove-enable-debug-flag.patch"
-	"${FILESDIR}/0007-config.h.in-remove-QD_DEBUG-constant.patch"
-	"${FILESDIR}/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch"
-	"${FILESDIR}/0009-configure.ac-don-t-set-CC-to-CXX.patch"
-	"${FILESDIR}/0010-configure.ac-don-t-manually-search-for-compiler-name.patch"
-	"${FILESDIR}/0011-qd-config.in-remove-REQ_CXXFLAGS.patch"
-	"${FILESDIR}/0012-configure.ac-remove-the-enable-warnings-flag.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-ieee-add \
-		--disable-sloppy-mul \
-		--disable-sloppy-div \
-		--enable-inline \
-		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
-		$(use_enable fortran)
-}
-
-src_install() {
-	default
-
-	dosym qd_real.h /usr/include/qd/qd.h
-	dosym dd_real.h /usr/include/qd/dd.h
-
-	if ! use doc; then
-		rm "${ED}"/usr/share/doc/${PF}/*.pdf || die
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/qd/qd-2.3.23.ebuild b/sci-libs/qd/qd-2.3.23.ebuild
new file mode 100644
index 000000000000..d3c5bfd71d45
--- /dev/null
+++ b/sci-libs/qd/qd-2.3.23.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools fortran-2
+
+DESCRIPTION="Quad-double and double-double float arithmetics"
+HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
+SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-ieee-add \
+		--disable-sloppy-mul \
+		--disable-sloppy-div \
+		--enable-inline \
+		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	dosym qd_real.h /usr/include/qd/qd.h
+	dosym dd_real.h /usr/include/qd/dd.h
+
+	if ! use doc; then
+		rm "${ED}"/usr/share/doc/${PF}/*.pdf || die
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index df4217b8b2eb..e05981442e63 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,6 @@
-AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
-AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
+AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
+AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
 EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B 99ad2f1d5945c746ddf252c5e12983dad2eef6a99e9f1aecd1e0c3c80e8cf08924a84ddf78ef64851d6737ed4688cca7f11a920b465e3e1f5698a11221c744aa SHA512 6246e05702a13967279242bac9235840a000ab06ef3e02672c97fd1ebf5da7f75e127e3634b82ef14fd1f8d166ecb09e7057e1efb0f82b92f7fd1e57df8dd813
+EBUILD qrupdate-1.1.2-r2.ebuild 1275 BLAKE2B 09c9814bff69c65fc1e2e65cbdab782c42589bd73b9e8d4840cff5bb3d6b337af7ec2ffd00f166ecd2bc904bf3246bd64e1ab372c98f2d0a3b6fffd0aa525110 SHA512 6c35fbebab5841dc6388f0d259c008ae4a758cc50f67306d37491b8cea225f515abedf786cc7c196baefc47b33910e23816c98bc8f85fdfa023bde42fa906b4c
 MISC metadata.xml 331 BLAKE2B 7cb0302f290048b91c8777184229fa2f0af2647f5cd1d4f9f88f7afc0168b4c51a4ab01b08cfb695be567838f1a6025cf47e2e43df67d434cf676c47c537cc3e SHA512 59818fe84d5fc4b73f29b45e14152e52d7d4afeaef9200e862e2414213b8c05bd63119befabc3a68b67b0aced7e60ab0fe3f7e657966a58a44d751571c4828df
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
index 9c9ef9317342..1fdbd946e99e 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
@@ -1,7 +1,8 @@
-diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
---- qrupdate-1.1.1.orig/Makefile	2009-02-06 09:12:00.000000000 +0000
-+++ qrupdate-1.1.1/Makefile	2010-05-13 17:27:15.000000000 +0100
-@@ -32,22 +32,22 @@
+diff --git a/Makefile b/Makefile
+index f9dbe86..2b11b59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,22 +32,22 @@ help:
  	@echo "   make install - installs everything"
  
  lib:
@@ -32,10 +33,11 @@ diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
  install-staticlib:
 -	make -C src/ install-staticlib
 +	$(MAKE) -C src install-staticlib
-diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
---- qrupdate-1.1.1.orig/src/Makefile	2010-01-19 11:32:35.000000000 +0000
-+++ qrupdate-1.1.1/src/Makefile	2010-05-13 17:28:30.000000000 +0100
-@@ -34,6 +34,8 @@
+diff --git a/src/Makefile b/src/Makefile
+index 65ef49a..c338882 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -34,6 +34,8 @@ clup1up.f dlup1up.f slup1up.f zlup1up.f
  
  OBJS = $(SRC:%.f=%.o)
  
@@ -44,7 +46,7 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
  lib: ../libqrupdate.a
  
  ifeq ($(shell uname),Darwin)
-@@ -46,19 +48,22 @@
+@@ -46,19 +48,22 @@ solib: ../libqrupdate$(SOEXT)
  ../libqrupdate.a: $(OBJS)
  	ar -cr $@ $(OBJS)
  
@@ -73,10 +75,11 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
  
  install: install-shlib install-staticlib
  
-diff -Nur qrupdate-1.1.1.orig/test/Makefile qrupdate-1.1.1/test/Makefile
---- qrupdate-1.1.1.orig/test/Makefile	2010-02-11 08:25:37.000000000 +0000
-+++ qrupdate-1.1.1/test/Makefile	2010-05-13 17:15:51.000000000 +0100
-@@ -41,7 +41,7 @@
+diff --git a/test/Makefile b/test/Makefile
+index 45a843d..3be917f 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -41,7 +41,7 @@ utils.o: utils.f
  	$(FC) $(FFLAGS) -c $<
  
  ../libqrupdate.a:
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
index 0eee49ae68f4..67c5b8f007e1 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2010-02-07 15:58:01 +0100
-+++ src/Makefile	2010-02-07 16:02:18 +0100
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -65,14 +65,17 @@
  install-shlib: ../libqrupdate$(SOEXT) install-lib$(SOEXT)
  
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..3206fe22ce8e
--- /dev/null
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Library for updating of QR and Cholesky decompositions"
+HOMEPAGE="https://sourceforge.net/projects/qrupdate"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND="virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-Makefiles.patch
+	"${FILESDIR}"/${PN}-1.1.2-install.patch
+)
+
+src_prepare() {
+	default
+
+	# GCC 10 workaround
+	# bug #741524
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	sed -i Makeconf \
+		-e "s|gfortran|$(tc-getFC)|g" \
+		-e "s|FFLAGS=.*|FFLAGS=${FFLAGS}|" \
+		-e "s|BLAS=.*|BLAS=$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|LAPACK=.*|LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
+		-e "s|LIBDIR=lib|LIBDIR=$(get_libdir)|" \
+		|| die "Failed to set up Makeconf"
+}
+
+src_compile() {
+	emake solib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-shlib
+	dosym libqrupdate.so.$(ver_cut 1) /usr/$(get_libdir)/libqrupdate.so
+	dodoc README ChangeLog
+}