gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-mathematics
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
103 files changed, 862 insertions, 2535 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e52660d6b8c9..0e505abfbe53 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/agda-stdlib/Manifest b/sci-mathematics/agda-stdlib/Manifest
index 9830df0c822e..ec872f003d78 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,4 +1,4 @@
 AUX standard-library.agda-lib 55 BLAKE2B 057e933b07b291fd505f2e64f43b087c2aa4f4828ba2a03b5a53b9cac0f0fd0ab1f523c91efd6090e34e376dcc61d90bc5193063b6f07280c0eb2d688a07dedc SHA512 b1e2cbffe4b99157661fe6f4685580c7524890735db0a20ae1942e076b00d0df13624f587ea7584319e5665484da63beb3e0e5c77226bdbe02a4a80fa33a17b4
 DIST agda-stdlib-2.6.1.2.1.4.tar.gz 816654 BLAKE2B c8e6b6f86f32dd2e3d57da4a21066be4a441e71bc3a7cb96d8000f28c56cbb114a00e5df2777b00a8a9fc1a0f94b00bdf4b72eb46f0245ab482a41b6a9d772ee SHA512 90c05d54eaf1d7c78d00f73044afa1f3b4d99df622d40b3cea88fe280f0770ccaeddd787d8fb384c150123f592bb6a7ec24b842a9fcc2936f581d847928223ca
-EBUILD agda-stdlib-2.6.1.2.1.4.ebuild 2129 BLAKE2B 11076c1eb8fc55fb03ce65f8d2016da39eeaed2bfc0ed02a9aeec3266a000cee1a9be5a503af8df108f8ac36b1416ba9d6897e187554a5ef74d194171003f462 SHA512 8e63daeed5284581872533700ca043fd627fa39ec81962f92fa82083b907745d05c0049458af194cc0e5d838eddff6b3ab9c2b8aab4a9ac1be507ee23ab461e1
+EBUILD agda-stdlib-2.6.1.2.1.4.ebuild 2131 BLAKE2B 3aaf388befda982634876b99953c2e0693037ce9d97fbf3d35211c311a1cc9643ba764bd8818708f814d1ba39a943661e3ce04fde64af26db1512ee13ec6442c SHA512 3c9792873467d6bfe9f288e7cdd2869e9a2b71cf29d11361e7e27cd057bd7fa1530447acf953989f97a06a9d370bbe6aa1d7c7e6270d0034932ea107e2b84994
 MISC metadata.xml 471 BLAKE2B 308482ab94f16db0a4ef47ca204527f83bd1a3471d8d8152ab8f600cd6350fcdba8f1710e5daebac469392662843a9feea4cae66f1b8a79acbc9ed3234534e8c SHA512 853bc8aabc44e6dad3a607e6f2ab9ad20e278e7a6a309ad106ee807c3eb608066c11e42137442fd2f622881187801bff46f581e0383168a1483dc20923e74b59
diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
index 55a498c1f260..73afc2f8ee30 100644
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ src_compile() {
 	# datadir    = "/usr/share/agda-9999/ghc-7.6.1"
 	# it fails without the --css option like:
 	# /usr/share/agda-9999/ghc-7.4.1/Agda.css: copyFile: does not exist
-	local cssdir=$(egrep 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir    = \(.*\)@\1@')
+	local cssdir=$(grep -E 'datadir *=' "${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir    = \(.*\)@\1@')
 	agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" "${S}"/README.agda || die
 }
 
diff --git a/sci-mathematics/alectryon/Manifest b/sci-mathematics/alectryon/Manifest
index ea95fb20fdb8..1d7cea9d07b8 100644
--- a/sci-mathematics/alectryon/Manifest
+++ b/sci-mathematics/alectryon/Manifest
@@ -1,5 +1,5 @@
 AUX 50alectryon-gentoo.el 155 BLAKE2B 6a83a0b6e7116a85d00b20799004eaec08033845661a23368b3340320184f2ea65c6b23db61664dadf2f829cabeabd8933f7f9e31d0971fcf2a0181c6d8ae956 SHA512 65fb668f29ba4737fc374302536c3223a02d45816a79256e425e255f30c134b19c8e88ccd19c13954a562182ad072cd10de08cd5047ae17b1b72efcfdc78f00f
 AUX alectryon-1.4.0-setup.cfg-version.patch 402 BLAKE2B 3f9969714ad120457b6a0f52c0a7fd85b3b747a95648b5d2ed5ad49deec7e8277630d98ece242964135b55cc12273d1cee0b1385e690ff9bf9bdcf2339cef106 SHA512 fbda296d11fbc67457448450bf5c752eb4f835f03a4a8e97274ebeab0078fdc08240a5e91824256759b7510bb2aaa6bb9e13403163f821f629527bc068745378
 DIST alectryon-1.4.0.tar.gz 312436 BLAKE2B 7f1e58670fbba0b31a4e4bc6502dffa72931ae3495c38b53987406a05aac9d3d1a34d75c89b7b85a6122ee6a7ce30970f8cf3190a5916e416e56854313077d4c SHA512 1310a04c8584147b38af8edb19cc95bd71043f5d00f55cbf4d5649dad9eede5bd01dba6fb23b85acf7cb9e9619fd01e5f83d8d37064f0b43f706589b9ec8aeef
-EBUILD alectryon-1.4.0-r1.ebuild 1816 BLAKE2B 96a4e471c01b9d64eb4bea463dba13c50354a0026b9fbcd9cedf5894fe88aede3b7d0e83f4d1670557935b7d1e8823135d2f50c900473fbba92566bc2638a39a SHA512 f801eda13d130dc8c636897cab6aa52d4784b141f490928ed3541ffefd61915e2475ead17ce7c6fd6be96b688d552221f82e301fda0380509f970e3d3ae8ca83
+EBUILD alectryon-1.4.0-r1.ebuild 1770 BLAKE2B e85be58b3d6ab2c72fbf0c7af3799c011d704ecb041aa1750f623196133f9d351accfa6f6ae490722e315cb95f512bad2095f7fa6ab6051f8d3c3b6cca825abe SHA512 5864f64e31aba7d9621944f8a9007629796b6d633752c9d3b2b1db2a60162d63c258ce384f342cf469f4aabb908122893caf6c60362fdd082781d7622e632bb6
 MISC metadata.xml 977 BLAKE2B 929c655f60171ee97c50a711e5ddaa4f5b6e5c7a2ffa2a2e3ff69665fa46a894af8a353e73efa8e43ed18fa87440e77d6a0d2abe7ecf740dcffe315d9bcddffa SHA512 a88e5341ebe5a4f239e73dbe0d843c46bdcc0f24dfa99e554b57ec715455d2a0526b4a157d2a2a2854b6d7e500b921f81cc29b6ab3c54db8ed228d94807d33fd
diff --git a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
index a15045952615..f582047527ae 100644
--- a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
+++ b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
@@ -47,14 +47,14 @@ PATCHES=( "${FILESDIR}"/${P}-setup.cfg-version.patch )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	python_foreach_impl distutils-r1_python_compile
+	distutils-r1_src_compile
 
 	use doc && emake -C ./recipes/sphinx latexpdf
 	use emacs && elisp-compile ./etc/elisp/alectryon.el
 }
 
 src_install() {
-	python_foreach_impl distutils-r1_python_install
+	distutils-r1_src_install
 	einstalldocs
 
 	if use doc ; then
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index da5632ef448d..e82c207e3235 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,7 +1,7 @@
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
 DIST alt-ergo-2.4.1.tar.gz 2883046 BLAKE2B 6930080f7735f043e33d02b7fa0990c53992848796c0a5cf6ea4d7122eb6b9e5d6ac7ce420a4a19da35fa0ce5ff431bc228f2314a6f709f27a16bc7481bbacd5 SHA512 c3eee41d3c588ca89c2a1eebe9f10914ef647743b58fb562b682172cf6b6bdeb0920ebbba8a850820c0cb53bad0260f11b82fe71f00830ea9b33f5bb5d4fd048
 DIST alt-ergo-2.4.1_p20220407.tar.gz 2884310 BLAKE2B aaa31242de3ffe3f804de1e47fb740593812991e60eb583339ec0e1c56caa40b3c7f14108d068a1dbcbd7efc0d8fc96f1ba652a77c03170bddef90931a44c12c SHA512 4c353a359c92e121859f84455bb98bd80c0d33bb2001d6f2998a822e6b3dd65c9c56b0bdcaf93e52863afd8e999de6939d05859b5fc6de2ed9689c1d083bba0a
-EBUILD alt-ergo-2.3.0.ebuild 1207 BLAKE2B 395779b3fa2c360a9162ee18b5a8266f978ac96ac09e4da308efbb3f3eabc1cff770c2404dd1e2c0531d8b74b40b82e11331b5a5a69ef92bfe589ddcd7fbfa05 SHA512 d4611afe608836003b93f7e6942da711799116cffaed63ccbbbd1b36a8d8de638a5fee103d3cc751df8cb332e54e28bcaff72142b1be2a3fa1ba4bea1349b257
+EBUILD alt-ergo-2.3.0-r1.ebuild 1209 BLAKE2B 379490307e17faa69a1995f7aaac71d3ab3c22a366f08306a6f9ddec5ede1ff7ab92c07a581141df2862f001f2fd69b07ee1c0b221b71d4118ac8c7155cd3148 SHA512 c58c062c20566974bc5cb40e4a76a5497b5022b6d4bbcfefe09fdb184f7ad5b8b37edc3fbb9fe47e73d2ca1d293295d0e8bc3632c5b29f5f7dd1d0c5baeee5d5
 EBUILD alt-ergo-2.4.1-r2.ebuild 1003 BLAKE2B 5adc8d1899e50c29fe46cbd404ea52b543acec152a0445bc858903bf01976fe19ca27c1cb5fff78c4f0cd18656d1533b4ac1fad04c2873e5a45f9290b429b6a8 SHA512 2f7d5a3aa6706254fa55c80dedb1ec5022d57d39b38bdeeb9f19f75bcdb8428ff5857a57f5dcdd6b2aed0b8fb6f5f6c65a8d13776d6c988e1f202bad5bc62b49
 EBUILD alt-ergo-2.4.1_p20220407.ebuild 1074 BLAKE2B 2b7690d870434693abf896bdb0038cf75e75e7673160749996f79b50ecc1748fcb86cfb78893d90b86d1e748724f295917b0215969c5ff356656d6405bcfbec6 SHA512 e399595aef6ee46ba3c14a9d124d6132e1992ece2b4b695e3d9da5ba60186f8d2538cdb6af1e6fecdfee436693ce8137e400f3558ce9c80af46018a25616e867
 MISC metadata.xml 957 BLAKE2B 2ac1b5428ee88fa81b3898a351b770b9a3b4e91ad049e7ab2b5b62e3ddcef635e2f19f801ef1c067b51c2f30f513b40a82e968a314be10e7a5ff795df24dd6d5 SHA512 bcbe312badeb5f3d6c243d620ec5744ac6bf3c23e6bc7b6327c7a1a72b42f2cc68cd4326b065a3fca3c2a9c7c1670e2a84ca1ca2e7bf423a274025010a6735f4
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0-r1.ebuild
index bbe4688b7840..6dbe4ce6fc63 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="examples gtk +ocamlopt"
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	dev-ml/zarith:=
 	dev-ml/lablgtk:2=[sourceview,ocamlopt=]
-	dev-ml/camlzip
+	dev-ml/camlzip:=
 	sci-mathematics/psmt2-frontend
 	>=dev-ml/ocplib-simplex-0.4:=
 	>=dev-ml/menhir-20181006:=
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index ef1fb6eb506d..6e0e64f41bbd 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,14 +1,8 @@
 AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
-DIST CGAL-5.1-doc_html.tar.xz 50630976 BLAKE2B 559287263b189ec5ac4a0b3445e1cc5862471285f28caca40f48b25b64eaef3426c42a178e4cb4db69a1e324963a9af665e84ca8f44da8b55ebb344f18f56fdc SHA512 ada944d73d3e6465a14d87ee87d1cabaee2c4848622b5360c14d6a9b5ff5ba3e19859943ecb7595b0dec7e950f214aa47b6ab389c23dd5f2794fc21a9e3a17db
-DIST CGAL-5.1.tar.xz 22850692 BLAKE2B 42320e07e222c3f69febe7dc478c74ef6cde0de723ea2d84c891b6e598d02c38026e9246edd467cadea8d66e527000a9b4af296ab026dd42c7876acea9824ccb SHA512 41085eeb113cec0eede2e21df05c9d2530db5988b4f9d0379f8de7c655cab09266620eebe017e0141c0ccdbcbafe8c074fd5bec46a40aaba95aa7521732e4423
 DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc23b9b01995adbe2d5157d8a4d3d772f4e029f0f0ac5282cdb387e5e7b9191082154840e32cd503c97f56295a59419cf4 SHA512 4ffaa9b36c20e62a62bd77fb79d9d9d54cf2b20a1542aa1bef9f6d27f6d7c1412a5f843968ae400d42e8d4bc8ae1d7a16c197503d0fd43fc72592d73213c5c72
-DIST CGAL-5.2.1-doc_html.tar.xz 47740788 BLAKE2B 5b18210fdff768c3cc3fed5bcbe8f41c7fd89592120ba9dc540ae2d1e3952676f9bb86150dac2f3e185ba0f9e92fe3fc3a240ca42d3f20a76a76810b7d45a03c SHA512 d013c4aacd031040e55aebe6de15c7ad232ccf70ff5fedfeda12435a2929b57d81183d8cac9ad2130cd3e164901a26b73748d44139ea4eb77f3a1df7d583c05d
-DIST CGAL-5.2.1.tar.xz 23256952 BLAKE2B a6a720011dde4df80a6ec74e2ee4658cf3239aefcceafdfa764d42478b1c2a7b24da135dc22a74db9ea41c624bed6768c71a19d1f7f03aa541a17a6236184309 SHA512 b1eb40a6b3231bc707fdbc43325dd88655cb6faad5d001caf891f7f5f3890b316c439b762540afcf702f87442b2b96e4e30ae7c06a1bada8cca9ee76f1f83bd5
-DIST CGAL-5.2.2-doc_html.tar.xz 47748668 BLAKE2B 063c46cd3277411ccda7121cb181b9e9534e5f463404df5d4c9848e31ef0c1ae1739885b4eb6ecfcf63088ad57cd3601a2765a18c64204eaf808759be9bdc791 SHA512 2f763698fdf99156636e02c95fd677360daca5c0b51e6a2f92b7a226583760e9eb19ba8adb0451709407bb4582edaee4a2b529f60bd2c467324e9ce222f78647
-DIST CGAL-5.2.2.tar.xz 23260652 BLAKE2B b615d74e8fb9f93dece8d7e88051d6f7f010b8d93de92c540d7c7f4f10a9b99d3ab42ccffebf3ee4b92dcdef443b1a75008d7261ab1e8caa7514fe373a44f053 SHA512 e51a0c82dc39f3c1c5245570f6f5d443ee9056e8aa58d0aeccbe6419323be52528477c9b339a8a071336da432eeca2bbf5322c06a7d0e27ef31c7aeded68c7ec
 DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a
-EBUILD cgal-5.1-r2.ebuild 1676 BLAKE2B 0cf776ec3975dd081ea09e200ec920aee26a1735229ef80406a136a933fde69508e4d17a58b151cbe3dd9e0953aa70bdf7055b72d58d35d1f80db9ab39665d1f SHA512 8b024e072f13de1399341cef016babbde013a1c3a39b127347957759369cace58feda41e5bea3e09c74feac7280d8a802c4036556189f688aab3e76f532a68e3
-EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 48c4bce712df40a9d9f5a105c84724233c6e001b5a5017d37c129576a2c800c46f7ad08303e102916cda08c6906f301dac09db8613655a2924836b475de286ac SHA512 475a747f8a3a6cd040b902df9e2eac6b357c75b528857ed56808a3af00fc623d2f91295cc2aef99cd41d35da59a7fcba03195593d09291b6dd4ab67006427cd9
-EBUILD cgal-5.2.1-r2.ebuild 1701 BLAKE2B c3fe6d68ec09db9c182dda3851cb429d47eb085ff313b589d5db74e074df6b43b1497b71d00c4ba2f06f53f0933a346879760259d56102d5b79f73bb04c94ce5 SHA512 baaf085725a7a26e4e0b87f557b758ef8c977462cab0b6cad32d9784f5e6dc6b33b8681a4d74c14d2278d2b39b016211aee92a21113136c5906b3e5fec2dbd4d
-EBUILD cgal-5.2.2-r1.ebuild 1696 BLAKE2B bc92a6f33cb9fdfa12adadf9205ef6861a3ad9bbd71e5e1b392aefe10a93c8857320df5e31d756eb99aeb8996d4769f16fda1bd29dc53df665cf6837fa5fded1 SHA512 d1023cc35bdff8ad375de67d844de5052c23ab581089ee1929b1483ab237b7d58d59717a6c2cc84cdf2f3ab0e5c0d5052af21462c749abaab7d115f077374c6c
+DIST CGAL-5.4.1-doc_html.tar.xz 50436088 BLAKE2B 9f293349f054094ecdce7a04ca1f276c56e824b4c9edd7ef82b9c450e3bde5ae26c9e6d06c5feea370c345d2b419cd426427ce34f329ea9a88ad5fa5931a0446 SHA512 5167a0fb0e390ab72c7d6106bc7d34e4a6c927f9634b02f71b675f8456d17cdcbc4a5d944c5ebf5ba1d6b635f469ee474c484913b768bff8a7c8ba52669373e8
+DIST CGAL-5.4.1.tar.xz 24110884 BLAKE2B 2d01404333fdaa00d66028decbaa522d6767290e2f5be5c2b7d0323d16b9b44cd00fe58fb7d20cb02b2731893bc251bcdd4de7013107bc1d4c086e999bbf240d SHA512 751871952173c31b356284e12f3cd0840863dad51c8dad5eb8894f8285470d0e23b6b09d97d60c4ffe6eb93b14ff141a18e381eab07ea29cb48923e90f9b657b
+EBUILD cgal-5.2-r2.ebuild 1674 BLAKE2B 2c9ce25313006e087ab352fc8d296ef7b2d9aebb0d4c07341dbac914fc66ac15ee7802e36773e108286f4ca1f89a670efdc58a19ca0f1ee0b37fdfc57a01e914 SHA512 bec84e99aab09791d872dc2708d981e33d7170c1aa56a35a34b9119f53f4da34ba4d67fc6453e6c8b02b58b3d95cf7b672abe53eb93abdb80261fcd33afd152b
+EBUILD cgal-5.4.1.ebuild 1697 BLAKE2B 59864ae06e3af97aec9e129ee4752ed241f09409c0ebfa90f4b2695401295c4571e032e1125fddd588fef98a906be1b4a5a6dc649015bbfef48c65729e0f6c26 SHA512 c1e75ae5ebdce4d4001585984e9e952b96b53dc3a6a3e9a692faff633e9e833cd7ad235c2dbe3b03c61bd86fe522c5bfd245bb8aa0996c8769cdbfbb69e092a1
 MISC metadata.xml 1373 BLAKE2B 7e3ecb8f36476edb32f20a03775f01f916fa82ab2c7a6e0554066a4b47019d3a13350e442ba4f9e6f184eb7678707a683339f223d5c86e18c08e9de5b359218c SHA512 a99c724624e7cdd71c65424adef18966dc6a88bd8e56e38fa5ba0ad4c40010481548d6d7f3e51044f62597096fdbf9e52a361d3c71d0ab870753526df664f7d2
diff --git a/sci-mathematics/cgal/cgal-5.1-r2.ebuild b/sci-mathematics/cgal/cgal-5.1-r2.ebuild
deleted file mode 100644
index 37647b5559eb..000000000000
--- a/sci-mathematics/cgal/cgal-5.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=CGAL-${PV}
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="https://www.cgal.org/"
-SRC_URI="
-	https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0/14"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5"
-
-RDEPEND="
-	dev-cpp/eigen
-	dev-libs/boost:=[threads(+)]
-	dev-libs/mpfr:=
-	sys-libs/zlib
-	x11-libs/libX11:=
-	virtual/glu:=
-	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx(+)] )
-	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	# modules provided by dev-cpp/eigen
-	rm cmake/modules/FindEigen3.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
-		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
-		-DCGAL_HEADER_ONLY=OFF
-		-DWITH_LEDA=OFF
-		-DWITH_Eigen3=ON
-		-DWITH_ZLIB=ON
-		-DWITH_GMP=$(usex gmp)
-		-DWITH_GMPXX=$(usex gmp)
-		-DWITH_MPFI=$(usex mpfi)
-		-DWITH_NTL=$(usex ntl)
-		-DWITH_CGAL_Qt5=$(usex qt5)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
-	cmake_src_install
-	if use examples; then
-		dodoc -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-5.2-r2.ebuild b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
index 75a0a7bbadd8..739a6e67534d 100644
--- a/sci-mathematics/cgal/cgal-5.2-r2.ebuild
+++ b/sci-mathematics/cgal/cgal-5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild b/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
deleted file mode 100644
index 81dbb6147e6e..000000000000
--- a/sci-mathematics/cgal/cgal-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P=CGAL-${PV}
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="https://www.cgal.org/"
-SRC_URI="
-	https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0/14"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5 shared"
-
-RDEPEND="
-	dev-cpp/eigen
-	dev-libs/boost:=[threads(+)]
-	dev-libs/mpfr:=
-	sys-libs/zlib
-	x11-libs/libX11:=
-	virtual/glu:=
-	virtual/opengl:=
-	gmp? ( dev-libs/gmp:=[cxx(+)] )
-	mpfi? ( sci-libs/mpfi )
-	ntl? ( dev-libs/ntl:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	# modules provided by dev-cpp/eigen
-	rm cmake/modules/FindEigen3.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
-		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
-		-DCGAL_HEADER_ONLY=$(usex shared OFF ON)
-		-DWITH_LEDA=OFF
-		-DWITH_Eigen3=ON
-		-DWITH_ZLIB=ON
-		-DWITH_GMP=$(usex gmp)
-		-DWITH_GMPXX=$(usex gmp)
-		-DWITH_MPFI=$(usex mpfi)
-		-DWITH_NTL=$(usex ntl)
-		-DWITH_CGAL_Qt5=$(usex qt5)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
-	cmake_src_install
-	if use examples; then
-		dodoc -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-5.2.2-r1.ebuild b/sci-mathematics/cgal/cgal-5.4.1.ebuild
index 599cffa47c6b..100c964916d0 100644
--- a/sci-mathematics/cgal/cgal-5.2.2-r1.ebuild
+++ b/sci-mathematics/cgal/cgal-5.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi ntl qt5 shared"
+IUSE="doc examples +gmp mpfi ntl qt5 +shared"
 
 RDEPEND="
 	dev-cpp/eigen
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 18b6c753679e..936cb98e23b6 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -3,9 +3,11 @@ DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
 DIST coq-8.15.0.tar.gz 7215106 BLAKE2B 512fde593f6e7fb8b410b5debf5a78bc5d0d181ed7207c00669fc33fa39c2d7e57860f3afbcfc9defd2093115242ad176a5451d9bb309483ba2172e2b0521d02 SHA512 be6c799b6635875255f7288b9bae5f9108660308f299823155d41353e96fbed4e41e1fc8896fe9653c095da740a80dbf5a1add6b28d279eb7b65365eeaff54ab
 DIST coq-8.15.1.tar.gz 7221470 BLAKE2B 6783ceb1ae6bcc7107b7bd1b61ab4566da9e24b8c87966cf1b64004fa19b92a5324d317f3002f30dd4c724bc5b27109c507dfb8e3ee64a9ace28bdb83b0a25e2 SHA512 8ae7bde19b4c098c0fad4206a349c50c7fc2537cbeae68e03d38020fd73f15df46e248b1e7cbbf297c1ccf44f9dd62b1179148588fcb5d397e30141cca954a3c
+DIST coq-8.15.2.tar.gz 7222794 BLAKE2B 2f187982a56cb0a512af838ee321b245f9a44b0c32f5413aafcef8e5b7f933e9b05ba521c3e681a6c6973ca2b7ec5965a8b69b2febb978ce7cf246755187f656 SHA512 6a5487912dedb6e54145bf3f177a091cffe13429ba2f73db7c1cc241fe10e86340c968e19cefba7d680facce55f4e914cbd16a317264b109a6f9a01ec822a8c5
 EBUILD coq-8.11.2-r1.ebuild 1845 BLAKE2B 2d6bbe0787ce45b4e5130d3e9d3ec61f527fc72f2f9dfef15180ca3dbc1f46f34e7cd847c580df16a8affa97e9430e1fd045a14c4dd3bd02bc52c67d1211c55f SHA512 b39833afcbb6e33a7917f949258e91a1a11229ed68427644f80ce84a00b7254a17d8e6e41c6d778184e54c6d8928ff62cc840eee77239feea5cbc12dd3731972
 EBUILD coq-8.12.0-r2.ebuild 1847 BLAKE2B 57496afca08cfde63635e873dc6d59d32356daa211d8a140820e07398f54bb38c114ac5ae5ad7ad101a6514117dc469783d3964aae18b27a54b18330087e5f49 SHA512 84fee1004970f88cfccc28717d75fad765dbe8b27ac7dae964e5729e47727f846ac69417bb5c585a68668396896c52a5f8421dbf77e73065d8ac7b9793f4900f
 EBUILD coq-8.13.0-r1.ebuild 1821 BLAKE2B 785a17783ee06916fa171449aebc1e54437f878656862e3cec93f1499097e80b57994e37dc597ff571dbe5d45fc19b984e1d10baf8b0b61e2a7c8cfd6b851d35 SHA512 e35a981b036d089afe934a9bcfc96da2d965fa17b8c90e38b8fe2194f9aaf1b693ceead2b26e77c1e4ee4ae23124bcba9aafdb6f17c5fa5ba0fa955b16c1fda5
 EBUILD coq-8.15.0-r2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
 EBUILD coq-8.15.1.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
+EBUILD coq-8.15.2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.15.2.ebuild b/sci-mathematics/coq/coq-8.15.2.ebuild
new file mode 100644
index 000000000000..fc4bad973709
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.15.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+inherit desktop dune
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk debug +ocamlopt"
+RESTRICT="test"  # fails
+
+RDEPEND="
+	dev-ml/zarith:=
+	|| (
+		dev-ml/num
+		<dev-lang/ocaml-4.09.0[ocamlopt?]
+	)
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-java/antlr-4.7:4
+		dev-python/antlr4-python3-runtime
+		dev-python/beautifulsoup4
+		dev-python/pexpect
+		dev-python/sphinx_rtd_theme
+		dev-python/sphinxcontrib-bibtex
+		dev-tex/latexmk
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+		media-fonts/freefont
+	)
+"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+
+src_configure() {
+	local myconf=(
+		-prefix /usr
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-docdir /usr/share/doc/${PF}
+		-datadir /usr/share/coq
+		-configdir /etc/xdg/${PN}
+		-with-doc $(usex doc)
+	)
+
+	use debug && myconf+=( -debug )
+	use ocamlopt || myconf+=( -byte-only )
+
+	if use gtk ; then
+		if use ocamlopt ; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+
+	echo "Configure options: ${myconf[@]}"
+	sh ./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" world
+}
+
+src_test() {
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" check
+}
+
+src_install() {
+	local sym
+	local syms=( coq-core coqide-server )
+
+	emake STRIP="true" VERBOSE=1 COQ_USE_DUNE="" DESTDIR="${D}" install-library
+	dune-install coq-core coqide-server
+
+	if use gtk ; then
+		dune-install coqide
+		make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+		syms+=( coqide )
+	fi
+
+	use doc && emake DESTDIR="${D}" install-doc-all
+	einstalldocs
+
+	# Dune installs into /usr/<libdir>/ocaml/<coq> but
+	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
+	for sym in ${syms[@]} ; do
+		dosym $(ocamlc -where)/${sym} /usr/$(get_libdir)/${sym}
+	done
+}
diff --git a/sci-mathematics/dunshire/Manifest b/sci-mathematics/dunshire/Manifest
index 0bb2fb9ed574..3004973e77e2 100644
--- a/sci-mathematics/dunshire/Manifest
+++ b/sci-mathematics/dunshire/Manifest
@@ -1,3 +1,3 @@
 DIST dunshire-0.1.1.tar.gz 300878 BLAKE2B b0ed57e535313fbc653fdc7c8fd32fb98382db71dfe419e315f4b82fc4630e47757d74b9105e846b2eefaa7dcd93b12886eee341b11d0e8b562a52e480478e9a SHA512 5cdf8125d7fc1f76a483009392360e9e9088f9b58ca3f123d14e366421e831e4e7c8e17d367ba0430fb3cd61873cae7a004c903ff5417bfc9adecb7831681081
-EBUILD dunshire-0.1.1-r1.ebuild 958 BLAKE2B 7412f18b9bdc9202e9a21a5c3679f66b3ca620b451be8902100c145265e666d31eb38594fc0856e870071d56a3067dbc5b5af9302e589cb82e36bcbb63db9f09 SHA512 e6697066c2fe6aaaf9752836f317f924ccebd7cd7d277928709697ab3f496d1fc8201081effb156f4ba85ec2b12baedd97ee1f38ea7fc003ef1d776ba14bc113
+EBUILD dunshire-0.1.1-r2.ebuild 959 BLAKE2B 890078e136879bdc9d5559bc1267955d2bf8d6cda525901d3dde7cf4518a9bcbfee66f9dce09a82a569f11d51cd9c3d1f053242e136c14efb59a61e4ed321d37 SHA512 b99e002fef2fed07bfdaa199b714681c50e2394b19ae3aa4c55225cbc1cb9eedc96347f2cc0950a8a1158d4f944e274554f513f1193cd24d66c9ea0e6676c639
 MISC metadata.xml 329 BLAKE2B e9cf64a4fd7f360e350a97ca0a9efe8e64ce485f2b025e456271c8e3d8bbf3f6950750a157eaa66e0639a800285351f84abd07789697acfbaf5422b9cb725ec6 SHA512 f8f757c9f662dfba3c0717720a7d2fe6e2c2bea517d6811cf9785d39cef92714c0ddddf3c56eecb6be37fc97fcd6ebdeba0412108b41ffc0c9cdde34c3e8a74a
diff --git a/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild b/sci-mathematics/dunshire/dunshire-0.1.1-r2.ebuild
index b8f5fb37cda4..a365b4c4e53c 100644
--- a/sci-mathematics/dunshire/dunshire-0.1.1-r1.ebuild
+++ b/sci-mathematics/dunshire/dunshire-0.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index bdab40575f4b..44aeeeddbf67 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,6 +1,8 @@
 AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d53dd97044487413567e172235260fc238e6a4ad89225788726bdff94f36b699acda45c86025c23be04b895c1857d836a321113 SHA512 a364c4606fb9321443991d1356f9fb7b2c7fb946ad46760e6e1b1172acc1399f19fabd1eec4dbf8e75e1e61be5d8bfa88ac056ccff47d60f4d50fdff6e31193b
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
+DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
 EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
 EBUILD flint-2.8.4.ebuild 1527 BLAKE2B c74158618cb85471fda7e7a26b438f0d68ade93f0633ed34c65424488bb1b14b13dd7639ea599531099d87fb631474c26103d0c3e87233a589bb432c4c504399 SHA512 453b1404a1a99c8681d061b5373f50fb469122e45a1dd5c91be264f7714c8aeb5ffdca9c0d5e88d9c0c884c953b08ac094c680c012187f1bdece23f890514c87
+EBUILD flint-2.8.5.ebuild 1646 BLAKE2B 5b3d7c1b59f785be7edc541b780ed8993a1b06746f0b3b779173586bad765a396739087375cc4ce3df712afd8c94b2e5d86c4b32650c5ceead998a3817a7e186 SHA512 aa1e0e6ca27a895d8d5cba76fed384c2914cd5c2ef4d89120c728dfcfb6a7f50dc7a93685fcf442983bce25143fdc3cab346ece094cb37927abf0a0dcbf99356
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.8.5.ebuild b/sci-mathematics/flint/flint-2.8.5.ebuild
new file mode 100644
index 000000000000..ade006fabbd2
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.8.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ninja doesn't like "-lcblas" so using make.
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/wbhart/flint2/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/16"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-tex/latexmk
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )
+	virtual/cblas"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/flint2-${PV}"
+
+src_prepare() {
+	# https://github.com/wbhart/flint2/issues/1140
+	rm test/t-sdiv_qrnnd.c || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+		-DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		-DCBLAS_LIBRARIES="-lcblas"
+	)
+
+	cmake_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 73956e16102f..245a51fd6236 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,6 +1,6 @@
 AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef
-DIST fricas-1.3.6-full.tar.bz2 10422732 BLAKE2B c406907bbd8be66104db0ba52cfb49740a54daa53cbcb5949c4a4f090c7c978e8a5d345988544d4e93219be8c66a4c50b586ce4d99f32f8d020b1f015fe94b76 SHA512 5732a9645a15886a14b5778c3b2bd813462693e67ef2cd807742b325edd1ac4c3edbd671e25cc568c20e0a01b82d09defdac0b9eb7e355355461316be29d631c
 DIST fricas-1.3.7-full.tar.bz2 38008318 BLAKE2B 079a0e2739c0f28c7fb76681e9562802cd7d6f16a0a0bcd8310bb11a6678b2aeabca9cc8effdf81d9464742bf4a20d07845f870717326afbd87feb48fe408493 SHA512 fd3742eb56c279adcdbae62a8eb5843781d0da4318f1b6e55310a9ac243c712b24fef214414c8d656b222be890ec4d9d30ad243b77b8eeaeea95e0ae3dda890a
-EBUILD fricas-1.3.6.ebuild 2382 BLAKE2B 4ba66ac739fc94f37debc949d6fdb57f838ae664e1a832e8dd24fe14b0cc2457b9e0f6b835cdc92e9f4588c244099adf3b7c7a424d86d27b9354f09c60ead144 SHA512 0799eb9e8ce77b1c75d93fc38c0dddbfd63c93744b7bc1bb376145b556bf78e3b0e73d17f5e04cb8657c979188b211c113768d6def8eb3632d449226fdb39282
+DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb
 EBUILD fricas-1.3.7.ebuild 2447 BLAKE2B a4c1076388669c9111d3b69b6ffd22912e9b8b7d5804476bfde79640adcc9f120ced193681adf9da61a0415f71cb50744358b8028d75ae956fce96984ddecb51 SHA512 1bc746d4b70581438919a80981fb4d7188672913f764dc86b32122d033dd87baa7266a422a442826aeae463247ccb661ed0cfddaf72ddeafd6b54f732684c526
+EBUILD fricas-1.3.8.ebuild 2438 BLAKE2B c9e54be9e363b91a4e20771653ff8896757adfc3395f4ebb5ee53b111236b1bf0b56bf351661d685d8951d07c2dd520c5fecde612f4e76a897256d29508022ff SHA512 a48ef90d0d288db16105d9addd72c25f741e9a58a2ed9a2904a15886e7c8f3a8f5b2bccb2da5f27d6a11722fea209f20d8ceb0ef611c89ef274093bf0e353654
 MISC metadata.xml 1062 BLAKE2B 06f8df085a48986321da6e195d8c13463929b5f49ee55ee683846e5a2a3281dd722a06339e4550cbf1d928b05fdf41b6a623777aa858146d81fac178700f7c15 SHA512 9848d78cf0ac1db0258213a48f47caf3380e1b2b64be8c3e33ae8d3b53543ba81ebd7eb0e470559bc97a14571cb4e82721d83ff50b9f01129933385eacf5e0ad
diff --git a/sci-mathematics/fricas/fricas-1.3.6.ebuild b/sci-mathematics/fricas/fricas-1.3.8.ebuild
index e71afee95ae3..2d11d0c22808 100644
--- a/sci-mathematics/fricas/fricas-1.3.6.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.8.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit multilib elisp-common
+EAPI=8
+inherit elisp-common
 
 DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://fricas.sourceforge.net/"
+HOMEPAGE="http://fricas.sourceforge.net/
+	https://github.com/fricas/fricas
+	https://fricas.github.io/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
@@ -85,7 +87,7 @@ src_test() {
 
 src_install() {
 	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
+	dodoc README.rst FAQ
 
 	if use emacs; then
 		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index be44defa4cde..e6e2c2e1d8c2 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -5,11 +5,8 @@ AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
 DIST gimps-30.7.9.linux32.tar.gz 5966449 BLAKE2B b31b93417857d338e5e7454e1466bd881422fef51ce0cecb9f7991f7dd19526fcfc01283e0ed871859e32aa4672492fe222bdacd2e06b55ef8401a2169c1846a SHA512 0491f7ec80953b8a86c75b6cc58532130dd51c6abd28617c87208da22a1fb4a1d2f4bea15bf6bd5de3a6706f5b8dcaa5a4cf7bcd39a47f5db0ee4ec74c41cfbd
 DIST gimps-30.7.9.linux64.tar.gz 7100830 BLAKE2B 8ebae083d26309f7c624e38c943e3bb0c7fe40a538840970dc222ed33ba5eaa9a5c0767b822682921eaae27f839c1eca5c0204b2c135748002e5d072744afe25 SHA512 5e6f3fbcc50b9b91fda7b286392bb17e58fd8d55a8386f27e206c63c560993da9713513d5eb4355e8e934f2e8703b39fc96f3c6f01058b729330f3526d37479b
-DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
-DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
-DIST p95v305b2.linux32.tar.gz 5695951 BLAKE2B d97f5b553e0a0563d51a08049c08fe31231e2689cfe6ec979b832603bace334755e947be2d7a106d4f4b807070568746f2cdabf869c5c4c6e125155c332b10bf SHA512 b5caa642e742438f10b5ee89d27213834755051679fe0d4d452e446b2f7628c8a874227971473d4319b8841f47a0bb32e7de9731d8b45e808356efb11922716e
-DIST p95v305b2.linux64.tar.gz 7165963 BLAKE2B 3ae20e8e29273650e94ff8774f973240c6b57d7a54e1674e7f741a9d366d3fdad98bb91b8e2abfcf7e1df6319476aa116e921171f2b585a568ee7d5038635531 SHA512 5fe250f7dcc35767fd5f4529219351095d1076f631528d80fa09498e27fa211abc621ef070548c398402143bec5e1d6e6e974155f50eb9f42af0ca179e4e03a8
-EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
-EBUILD gimps-30.5.2.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
+DIST gimps-30.8.15.linux32.tar.gz 6029035 BLAKE2B 4b84ebd89d45d5f0d0de28539ea8bc5bfb0f7383f39bb02ac00d51ba46897bba222db6215578e38fb939f541dae2569f431547caa51825dcdc6845e7e62f028b SHA512 b0a30d2d629d0f08dd2838be9dbe669c7f8f3d9f50ccfedc94c453a994cba9972440182e05d8e3b74b258e6e60cff53f6521e73a7ebdb34a45701a81d8b3f671
+DIST gimps-30.8.15.linux64.tar.gz 7211031 BLAKE2B 1d0291adb255099b9c8b44e2f650831755822ab850c2ebaa86dbe9728da619a4f9c22e3e5736a70ca3657818e2748caf32a23243347c048b9d57ecc8f7b3cf42 SHA512 6034dca7644bab85da3fdb194755a076778b37dfaa0a944ee5e64915e1196b61bd5f0a291a40118648c3a81faef3ac3026230709312d2de154260c3cf736a166
 EBUILD gimps-30.7.9.ebuild 1928 BLAKE2B 8dabf8f54eb82e875380668b6ebe6f971db1cd3443d80ed9bd668204b5a19c91e997b68cfcc86ab6e9339bc24a696b6015a21bcdb83c7bea09893902596b31d5 SHA512 f22996f1a27b8941881a0fcbb2b09219f73967bf80708e6c9a55a1407ed57a180b26a53878989ec70ee05d604d29980616988e0ff1aab4323444d62b638f8e65
+EBUILD gimps-30.8.15.ebuild 1930 BLAKE2B 89102fc275d061607159a6e358105944c88ec526c0a00c4fdea1813656ccb42aa0faa48db182c6b22e64159cbe6bbd67f994845ae5f13f46801bb965fea1b0a7 SHA512 b2bf140602852c2b5bb6a6298fdf31a90ddd06ff5230ea8ab0e846e341e078efc288211f8076991413634ae383c5ffc0ba83e1a752eeb9f712f1da14ab22b874
 MISC metadata.xml 560 BLAKE2B 01b265f54acd4ad1c9e1d23043d4ce2020fd41843a0efb09003046ea835989393df9935edcc3320eff43d552e47c2bb5afc688ddb96e9e6088c1e1c3a38fca64 SHA512 ba744b0b86d81acf54ed31c70e19be7ee315b6976b29cf0a40e79a7a227b8f68f4262ac2eecd696ddf051dd13de2019dae5df43706ca629bceca738e0e501175
diff --git a/sci-mathematics/gimps/gimps-30.3.6.ebuild b/sci-mathematics/gimps/gimps-30.3.6.ebuild
deleted file mode 100644
index 849d8cb06863..000000000000
--- a/sci-mathematics/gimps/gimps-30.3.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="The Great Internet Mersenne Prime Search"
-HOMEPAGE="https://www.mersenne.org/"
-
-# The author has finally caved in to the pressure of putting the build
-# number in the package name. Some dark magic necessary to get to the
-# package name
-
-MY_PV=$(ver_rs 2 'b' )
-
-SRC_URI="
-	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
-	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
-
-SLOT="0"
-LICENSE="GIMPS"
-RESTRICT="mirror bindist"
-KEYWORDS="-* amd64 x86"
-
-# Since there are no statically linked binaries for this version of mprime,
-# and no static binaries for amd64 in general, we use the dynamically linked
-# ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
-
-DEPEND=""
-RDEPEND="net-misc/curl
-	>=dev-libs/gmp-6.1.2"
-
-S="${WORKDIR}"
-I="/opt/gimps"
-
-QA_PREBUILT="opt/gimps/mprime"
-
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
-
-src_install() {
-	dodir ${I}
-	keepdir /var/lib/gimps
-	pax-mark m mprime
-	cp mprime "${D}/${I}" || die
-	fperms a-w "${I}/mprime"
-	fowners root:0 "${I}"
-	fowners root:0 "${I}/mprime"
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
-	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	echo
-	einfo "GIMPS data files were not removed."
-	einfo "Remove them manually from /var/lib/gimps/"
-	echo
-}
diff --git a/sci-mathematics/gimps/gimps-30.5.2.ebuild b/sci-mathematics/gimps/gimps-30.8.15.ebuild
index 7a7160c336ab..59f75793b412 100644
--- a/sci-mathematics/gimps/gimps-30.5.2.ebuild
+++ b/sci-mathematics/gimps/gimps-30.8.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils readme.gentoo-r1 systemd tmpfiles
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://www.mersenne.org/"
 MY_PV=$(ver_rs 2 'b' )
 
 SRC_URI="
-	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
-	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )
+	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz -> ${P}.linux64.tar.gz )
+	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz -> ${P}.linux32.tar.gz )
 	"
 
 SLOT="0"
@@ -27,7 +27,7 @@ KEYWORDS="-* ~amd64 ~x86"
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
 # ones and try to cover the .so deps with the packages listed in RDEPEND.
-# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+# libgmp.so.10.4.1 is bundled within the .tar.gz, but we use the system one.
 
 DEPEND=""
 RDEPEND="net-misc/curl
@@ -38,7 +38,7 @@ OPTINSTALLDIR="/opt/gimps"
 
 QA_PREBUILT="opt/gimps/mprime"
 
-DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+DOCS=( license.txt readme.txt stress.txt undoc.txt whatsnew.txt )
 
 src_install() {
 	dodir ${OPTINSTALLDIR}
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index e2291573007b..a71178aa13bc 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -5,5 +5,5 @@ DIST ginac-1.8.0.tar.bz2 1124136 BLAKE2B 087c286f621ca5502c54c1765d948f0549a6066
 DIST ginac-1.8.2.tar.bz2 1142428 BLAKE2B 9322ac30cd73c5290b68503a277c43751728a8d774655398038023d87796e35b8d98dff968a14faf162969877ef335b383adfb3fe695dda1357fb0208cba424a SHA512 fc471cdc12b3c2597e4deb65dcca83fc9050c8a2d07a19baf605b060efe9facc9b9ffe824676c8489bdebb6f125f1052f313394d95cc2a91c29b00a45cbc403a
 EBUILD ginac-1.7.11.ebuild 1474 BLAKE2B 80960c7c7d3b8aa3196c3bb606abca7d174e02ab3e7048ce267ac74b37ad4dde177581274c081e81237f9fc366eb3c64a29239a3f13ca352dad5db1e87ade20a SHA512 2ace30976f57eb93dca8b6a4dbf851b9ac5bcdfdc09ad6dc0838358a55784e04168266e5281eab8d4096c699bc8c02b44f600a1c80d7d11be3d590c8b7d19f0c
 EBUILD ginac-1.8.0.ebuild 1476 BLAKE2B 704301ca488a748b37464da91ae3cf8a8d477f037dd9146f8acf8f7214ffefcf6a26d722c3a3f6bb749ab6b7a51c341e96bfa61dfc58b8621847f228b47b979b SHA512 4c6f9049db3ccc23838c7ad3d390fb238b3012595259ee3cf1b55aa68aadb769bc4d6ff15b7b9e6f2771b41f9ecc0e5c00a28534050a87639877871a7ce1b903
-EBUILD ginac-1.8.2.ebuild 1510 BLAKE2B af4995c494ecbf1c58e04dc30bd37fd7b4ff100aaf5333b7e175db34bc0490d57a9186910277892421a8c9897862e3ece3c882311ec4d346d77b20b20cde5609 SHA512 9bb693918483556504570f7b75b14d3801373c4ca37851fd30d6cb1471f9526807e6af190a115e9ae14af0724b77c65d563b70ec111456fe901fe2ea4c3f25cc
+EBUILD ginac-1.8.2.ebuild 1508 BLAKE2B c6f89505e4b56d8048fcfc2873e539f739d6899aba36c3fd8618994e6867b83521459e3c3cc6f36f8d3e4a967f12956f0de230ce7f6308781ad31edf8456f9e1 SHA512 60ec49acd2cbc8e92d673469422e1dc1f0f7baeea2885b89a4ae43bee50f766aa65b913918baebc01f1eafe87ec6484d9f386203956d154ed5412cc80d97cd0e
 MISC metadata.xml 686 BLAKE2B ff4b88d20512b55b99aba22f7f87da2dbde32d4348bce69ffc1ee4488e41c0ec8cb062fedd72794d12671111be8a9df4e8be3dacf3d3379de7c82d18df3a97e8 SHA512 bae9dd2c19bd5e5bc84a3640d9548066cf95053c599a57259633b4a6960b2ea4039ebab692086b94553cffc1478de100754bc82a7157fc78871b9084ee9391e8
diff --git a/sci-mathematics/ginac/ginac-1.8.2.ebuild b/sci-mathematics/ginac/ginac-1.8.2.ebuild
index 9d6757bca841..ebe6bcd72790 100644
--- a/sci-mathematics/ginac/ginac-1.8.2.ebuild
+++ b/sci-mathematics/ginac/ginac-1.8.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ginac.de/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 6abce55f281d..521532654ec6 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -2,6 +2,6 @@ AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
-EBUILD gmp-ecm-7.0.4-r4.ebuild 2011 BLAKE2B 384a95201168380077786279ed6813f1b369fb81e87bb5392824b3704eddcd70789b56891d1ecc65da47bda2fc68006c4d28d7fe4844f8a75d0fb12ef8656569 SHA512 51dd9ad9e6ac27be94c1839ef4ea61f5b300d714fea9b144dec57b354f1412dc4977c83d399723493984d829fa92f4892d58f20325c470119760026de2b1acb8
-EBUILD gmp-ecm-7.0.5.ebuild 1628 BLAKE2B 3e1630ddb1589e75dc51caa0cfb4611e3f1358079cf175e289f4e647bcb84a779e68791d0ee35d28404b5a18fbc1c04cd5b7c7f78f332983c7b5fd533dc2dcf1 SHA512 6351f92edf8d40e31b4a7b099c4306236c93a4a1b81aba4fe8f642ce246fb27400c49c3261d03c823a03f18c73cf8aaa6bc0ff0b6846c4a6d9f659fd531f65a1
+EBUILD gmp-ecm-7.0.4-r4.ebuild 2112 BLAKE2B 39830814297dce141346272456a9eb7af0ee7022f5e51721d613ed599939005c75c5d3a9454eb08c8686f053e6ae119a44cd65841bfa31368e9a6d7fd67b90cf SHA512 b8061d07de7ee3821746be174d88137e6cbf37f0e63947701fc52e957ae16f2e5595fdf6cbb452757c67fd5b2d666d7ff3e6afb6ff3adad01d7523efd615c695
+EBUILD gmp-ecm-7.0.5.ebuild 1742 BLAKE2B 8d69e17c25af030d62380ea5fe76a922ee74bf4426608c5b9bdfc132e6a932cb1d4ae3617963943f5f14edfcb55a054466794f51b088747de97b62e23dc01f29 SHA512 77bbe8a9e3c83271aee921a89e43e00a31a33a482150bf3bfe268d1235059f8146bab56bb5c1d05920a401a8310f75e673981c425d5bb2d737ab2fed8eee3dbb
 MISC metadata.xml 727 BLAKE2B 9362e7772528adeb4ed10d53bb319cdd3e1a73959c8bc0d59d1ed589b9d854790acd10887cf8e09a4be009e2c2b6ce994508c9227d6e7c1d51c82b666e8db33e SHA512 6782da887f25301a029726237583a52ca3509ebbf8a0920e16ae1828723d8653108967639813cca7300bedd694469447b34b76a05e3382dc9b7cce74cf86ea83
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index a3e4c57b7900..404d71631f44 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_PN="ecm"
 MY_P="${MY_PN}-${PV}"
@@ -27,7 +27,11 @@ PATCHES=(
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare(){
@@ -37,7 +41,7 @@ src_prepare(){
 	# create a sample with the assembly code needed
 	# Quote around # are needed because the files will be processed by M4.
 	cat <<-EOF > "${T}/sample.asm"
-	
+
 	\`#'if defined(__linux__) && defined(__ELF__)
 	.section .note.GNU-stack,"",%progbits
 	\`#'endif
@@ -64,6 +68,7 @@ src_compile() {
 		emake ecm-params && emake clean && emake
 	fi
 }
+
 src_configure() {
 	econf \
 		--enable-shared \
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
index bf4ba87d79a1..42feb39cf26a 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5.ebuild
@@ -30,7 +30,11 @@ BDEPEND="dev-libs/libxslt
 S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_compile() {
diff --git a/sci-mathematics/gretl/Manifest b/sci-mathematics/gretl/Manifest
index f33142542155..5e70696113f3 100644
--- a/sci-mathematics/gretl/Manifest
+++ b/sci-mathematics/gretl/Manifest
@@ -1,5 +1,5 @@
 AUX 50gretl-gentoo.el 473 BLAKE2B 4c855e4b79629828ba9f3c187550c64d26b93b6547ed8505d8485ade63d0963d04bf7f3de4b8a0b0d679657e93d2d08ff036d9a2ef1b02ec85936f872cc3aa86 SHA512 dff2fd680e295ba8cd722092d5ffe8cb36cd9b79f2ed2be69c8adaa5e414a456abb40c0ec70a6fc0d6b9fb09bf936e3c6ef6804f87bde62d86d3692c34ec595e
 AUX gretl-2001d-appdatadir.patch 246 BLAKE2B b225500d78564d018c54e4e9dcdd166c9c7f779c3d23a716d119cd968f05712bc38154702fb9cf53ad7de42000f75f584f89cffbc098706f01f89b2adc814136 SHA512 2e725e15732ea975b6085be9f84790a07d0d481b1aad0a876a07bf1de06a393ba8ff71f272ed601539458cb9a4a8af41bbc4185ef847ca99cba64aca0897b3f1
 DIST gretl-2021d.tar.xz 13256260 BLAKE2B ba4ae04317e3bd4c9ae064718ceee7b8c6afceaa263c1adcfb7fa5fe8bb74c9abc7f7847666a95f1035c36c553ce8ab80a002f488348e3e02fd321c5dd53d5d8 SHA512 17d5ba473208a5e810329b88c3e6b8421af73d6e1a172547c393143cd8419e2ff6cd07b9c741f0d6e65796fee64f4c71b7f5ccf0c81a67936c4d16f1fd0d7edb
-EBUILD gretl-2021d.ebuild 2842 BLAKE2B 264da0a632af19d6fe06c56acb0585c65174cd8fd2485a65ce7bb6022fd0a630ad802d104b0e28103258d337d8efdf47235b6a41bc43aaea2f97c2d684438750 SHA512 55f86e565ee4f9876feb766e982e5f2fb564d112c610d4de073344d931ff9ea145c810add0088f39c0f7ce9cd638a69888b6d9bb0fdfb84af5777111be0d5b21
+EBUILD gretl-2021d.ebuild 2911 BLAKE2B c87ae98caffd2fc25d179bff72b5d423704da9d77242c042dd35d5d741159fbb30978d8412fca6fa06ed25ff40e117714ea766ab5f168c6ecd5eb12130119aa5 SHA512 aa8b5dbabda8f67b015d23663cf13de5cf96f8e137ac246daa984403a23240b9f85c41f73f8a67661c649fc9c2fd16566d47cb1f7056a5588d6b5769760184be
 MISC metadata.xml 1199 BLAKE2B d400c41ccef93836c264ca3df2f66ef62ebd228f67dbe43c544aa33bf35b9fc23ed5bd0d38d4ba1e45e27465553ef6f4549b22739c7b385b9cb606bfb4f56ee3 SHA512 860e2aa571e650c80318fa4b1e2d6032e300cd1b7fd0fe9a69dd39d81bda51e05cfc9954e274d8cd6cbc9c2bacf87a9fcc9ad0fd38d66542ef30771158b5f4a3
diff --git a/sci-mathematics/gretl/gretl-2021d.ebuild b/sci-mathematics/gretl/gretl-2021d.ebuild
index dcc6aca2cfbe..957d8f5cb180 100644
--- a/sci-mathematics/gretl/gretl-2021d.ebuild
+++ b/sci-mathematics/gretl/gretl-2021d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,9 +54,11 @@ PATCHES=(
 DOCS=( README ChangeLog CompatLog )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use openmp && tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 1eb4c5ec373f..520e2692a609 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1,3 +1,4 @@
 DIST lcalc-2.0.5.tar.xz 830360 BLAKE2B 4a282de8548bc0b3d95fe079362ea98dd1397a1f0f7c4c61c6d2df8c5f95b9638aa628a25b138e6037520c69e56bfab635872115139caf3270d473e01276b980 SHA512 d3b7fa25dd3c2a8f88671076dfb5ab5e933be7feff24bbd160c92a476953f5553f9fb58f72c36b9c668929385084918fc3396e1a0bcc55de12ea8cb647c53929
 EBUILD lcalc-2.0.5-r1.ebuild 925 BLAKE2B 98e8909c3bf87fe2446ced959d9a9f57d7ada72e81d40393d4b0e0488a5cf0ef6cbc0ae215ca61c0b5293bb309257cb7af682fe2013b99b17fa732bec5e6ae0e SHA512 10df01062ba4b5e27be0e69603350bc7361ca17f9a2468f3da8a550b81f8637afec065d2a9e42dc147afb562053c8b0c1eab57e269b6c88ebf928b8b9f5f7821
+EBUILD lcalc-2.0.5-r2.ebuild 1004 BLAKE2B 0031433a7ea5552239336d240347ca4b80a3ec1d2365ba8d784013bf768ee82ab7bfc9398c63bfd8e7246c49e9aa973995797568ae40b819dd0b31a5defb3cfb SHA512 32f6b8753a198006fe5165127c0e28de2212077f03ec8c66e93c76c10fea258b6f1cd693c7a05965f1a8097ce52a1be895b65f7bad374d6b33682948c593824e
 MISC metadata.xml 1165 BLAKE2B 77544a05687fad32c18cb8d840d8de4291cae4135976bd741bbfd57a015956d5104026b99b1aec934d6a260501d89cd947e052a2ac85e35d2c93f7fc08224ac1 SHA512 cce822c8b50d97a7f8405634f565c3fbe147732db57bd66cccbaad2c2eda23076b76d0dfa442d462d55625a5dff06dde9bdf5e6ab4a9c9417d2f69972cc87add
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..640cc2e5b59b
--- /dev/null
+++ b/sci-mathematics/lcalc/lcalc-2.0.5-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command-line utility and library for L-function computations"
+HOMEPAGE="https://gitlab.com/sagemath/lcalc"
+SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e192/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+# The subslot is the libLfunction soname major version
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+# Omit USE=mpfr for now because it's broken upstream:
+#
+#   https://gitlab.com/sagemath/lcalc/-/issues/7
+#
+IUSE="+double double-double quad-double pari"
+REQUIRED_USE="^^ ( double double-double quad-double )"
+
+BDEPEND="dev-util/gengetopt"
+DEPEND="double-double? ( sci-libs/qd:= )
+	quad-double? ( sci-libs/qd:= )
+	pari? ( sci-mathematics/pari:= )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with pari) \
+		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index 1d8093150e1e..d1e531ce735f 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,11 +1,9 @@
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
-DIST lean-3.39.1.tar.gz 1878481 BLAKE2B b3d1760594751418d6ebb7754d733e8fdebc5e0eba25e8d4993280325ec9d40e9083af155d388d52b5edfff2e9dffbeff91caa68ccb76500dcd88ebac2af4444 SHA512 5839eb7b5f7cd2d93ab603f1a5121e0a6b55850686677f103c16ec2157dc19479f1909ea056b54e41331c28fd59a4a825741384fa431473924381b72640a04dd
-DIST lean-3.41.0.tar.gz 1905966 BLAKE2B 1921ba4a975ed8fc6001695151bb366341e0895989a570bb7fbef1e719685945d0b7c51ed0716ff29daaf81af24ce2e289cab41b251c686a286cd94a0cf708f8 SHA512 855a56812ba5dc7cf431490957570d0fcbc4760faa1602095e708ddcc4e5a3c6aeac42133c210375d4538d97c8ae90df3ab3c7e7840e8896b8d0db439e925fbf
-DIST lean-3.42.0.tar.gz 1908134 BLAKE2B 7b6403786cc1a3a2b974f8df4c2bf2921e4e374ead4290a0e263c8464a9c009fd2f62e7cf5bdbc5087d0c9bb4c57f798b9d1a4b8ee2d66152714ec2af649e196 SHA512 2f1fc1bf3aff7fa806e1cd4647380d6896d98a9191f2035d5a37cc35938de42b243188984aa2fced37bdbee3b2c3c6ef25d27bf2428bf9a0307cc3237c80560f
 DIST lean-3.42.1.tar.gz 1908398 BLAKE2B 7a83269deb3dc7ee60bf7a09b36df332355d9caf575b8435345956697121e95e1fb44cada1237e44bab04a56af4fb40c0d01e49f4cb3e4896e616f2bc58bf9ef SHA512 ab266e385e3026ce3219eef6ef171e243576e291fb26cef3d97ca4cc5190988e3bd6fe93c37a1192b8d2eec0ae7620131826ee1073a038f5a024e706953242d1
-EBUILD lean-3.39.1.ebuild 1759 BLAKE2B 794af95d6ef36aa5172c60e599c882de1586de2f4efc733d815b86e07bb85c9d1684a56aad6921bd0bc536de962176f0d6fb3b77d2869e74861d91ed509f10a6 SHA512 b81ce77ab0e62e6203b645faadd33ee78bfcdabcf3565bb91cdc3e6cb50d7936628ec029ad1ed349aabd4ab6de910bf5540e7b71f3fd8c6a251f672d0ce55a33
-EBUILD lean-3.41.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
-EBUILD lean-3.42.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+DIST lean-3.43.0.tar.gz 1909158 BLAKE2B 587995afb123e6c74a730f9709a001bab6b2ac82471dcf8b1219dda782853fcdb9735d16038b95a7950f6530dd3cf1e0b13e4d1044d723d3662217951b809928 SHA512 25cbad94b869bb39edaf9ed2478ffc298b130f22cb4db7c116212546583d670079ddde1b524a33499d00ac43fc82b6928e6801c83d613597aae255db9c45d9f3
+DIST lean-3.44.1.tar.gz 1911708 BLAKE2B 33dc94fb1f1eac2684b7a37fda3545ad6d4f6d703e7914c44b9a05fb57e55d4b9bef484ff1f6608f9bb0fe453ca28b7fa5c74e6bce135df06fb25ad6d9d3a37b SHA512 69ffd1a8519b476dd1879bfe2f8f8f4268a5490f11b581ee1e583382e6f03f947d958e8b5ee8ceead562945a406ee2dc9b0ae2da6f29f03a38828eadab88a4f8
 EBUILD lean-3.42.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.43.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.44.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
 EBUILD lean-3.9999.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
 MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/lean-3.39.1.ebuild b/sci-mathematics/lean/lean-3.39.1.ebuild
deleted file mode 100644
index d8b241bcd34b..000000000000
--- a/sci-mathematics/lean/lean-3.39.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CMAKE_IN_SOURCE_BUILD="ON"
-
-inherit cmake readme.gentoo-r1
-
-DESCRIPTION="The Lean Theorem Prover"
-HOMEPAGE="https://leanprover-community.github.io/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leanprover-community/lean.git"
-else
-	SRC_URI="https://github.com/leanprover-community/lean/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-S="${WORKDIR}/lean-${PV}/src"
-
-LICENSE="Apache-2.0"
-SLOT="0/${MAJOR}"
-IUSE="debug +threads"
-
-RDEPEND="dev-libs/gmp:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-CMakeLists-fix_flags.patch" )
-
-src_configure() {
-	local CMAKE_BUILD_TYPE
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	else
-		CMAKE_BUILD_TYPE="Release"
-	fi
-
-	local mycmakeargs=(
-		-DALPHA=ON
-		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=ON  # bug 833900
-		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
-		-DMULTI_THREAD=$(usex threads)
-		-DUSE_GITHASH=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Disable problematic "style_check" cpplint test,
-		# this also removes the python test dependency
-		--exclude-regex style_check
-	)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS="You probably want to use lean with mathlib, you can either:
-	- Do not install mathlib globally and use local versions
-	- Use leanproject from sci-mathematics/mathlib-tools
-		$ leanproject global-install
-	- Use leanpkg and compile mathlib (which will take some time)
-		$ leanpkg install https://github.com/leanprover-community/mathlib"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-mathematics/lean/lean-3.41.0.ebuild b/sci-mathematics/lean/lean-3.43.0.ebuild
index 5d8ee8eecd4b..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.41.0.ebuild
+++ b/sci-mathematics/lean/lean-3.43.0.ebuild
diff --git a/sci-mathematics/lean/lean-3.42.0.ebuild b/sci-mathematics/lean/lean-3.44.1.ebuild
index 5d8ee8eecd4b..5d8ee8eecd4b 100644
--- a/sci-mathematics/lean/lean-3.42.0.ebuild
+++ b/sci-mathematics/lean/lean-3.44.1.ebuild
diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest
index fa009c4ca36f..193f4a53423c 100644
--- a/sci-mathematics/lpsolve/Manifest
+++ b/sci-mathematics/lpsolve/Manifest
@@ -1,3 +1,3 @@
 DIST lpsolve-5.5.2.0.tar.xz 737000 BLAKE2B 912690a7e4ed5fd5d475f322f5c168554fb3d47281545f42d2383ccbe72b3cb0036f72878c94899889972e266e9cf6ad73e59ac1e822deae753ae5b31a00c9b8 SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6
-EBUILD lpsolve-5.5.2.0.ebuild 673 BLAKE2B 80ffa341ae18ab0e9bb370f3ef63816f95b5f2de0b3f8ecccf1babede155033e08d0971bacf2d8963165ca008ab2a361b98dad689f25ceac775dfa30448eae26 SHA512 bb307541ad2e5ec0739aea8d66cc94e920afe49cc2be225ea3be6912b2678050f89304bdadae987bc8f34d94ddd0a5ae00713811a0d691b861d9fb96b58c7eae
+EBUILD lpsolve-5.5.2.0-r1.ebuild 507 BLAKE2B cca83886d7b227c7d3190bb67449ad5fdd526a7ef83b93f0750d010b3c5d68e6fbcd99d150cff7b8a16c4cfabaacecc4edebe78738eb2daf8f7da77f2d85b514 SHA512 f7472951fa2fe4997c5de1375eaad6ea4a0902618e328d150ae52feee664d51464170dbcba0316ee0836c388459359b7646e718f7028dfa58d6b11520ac78280
 MISC metadata.xml 463 BLAKE2B f175dce49b24cb9d330a39f29ab07fa821c098aa0f74ed122b51c91bc8cc50e9eb6c60f3267cdab3c523427c25bc1ef6f70f1b34580829c8fa3266b4cbda6265 SHA512 49f10a80ef197ffaff9be05ec05c0a76a9d3c571e88d2c15148f93ffdbd79c280682801a57c11d61a3b230c38434699612ca1448d40d721e59234ffc8fae857e
diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0-r1.ebuild
index 3a153685d29b..4bfa870fa6cb 100644
--- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
+++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Mixed Integer Linear Programming (MILP) solver"
 HOMEPAGE="https://sourceforge.net/projects/lpsolve/"
@@ -10,21 +10,11 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
 
 DEPEND="sci-libs/colamd"
 RDEPEND="${DEPEND}"
 
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
 src_install() {
 	default
-
-	# required because it does not provide .pc file
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 0bf09530fe11..b62415d9c3a9 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,7 +1,7 @@
 DIST normaliz-3.1.3.tar.gz 3075453 BLAKE2B 0860b466dfa5335a58a496c21f7567e7e4682b07c73e36dbbd947eb65500e03758577d32355adb02fa4e271ca2f49bc5cb0449e26f1bdd11eab2dd5dbafd8f17 SHA512 c7fb1620e758dc59de88f0d7c55f50db0f67be772a00af27205e478f30c3836b7cf012a16a8adfdee3f0367d3adb4e3f887dc7d03793a7ca1601968ddb1946ce
 DIST normaliz-3.8.10.tar.gz 5086191 BLAKE2B b40de665718dc1cee8a7246ccfb9b8496bdfa0754408f0260421352f1b4776133047ed1a5e8e0f044bdc15dde63a9f7d9ea1721773f36ecdccce3a8575493772 SHA512 8755011b1305b571d6bef7b6200e01bb56dbadce3f67de022fae0ef42c69c095b1f7cd2a2a432282098277ee39aa17caeffda15c806b28a6060a737930d5b82c
 DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c
-EBUILD normaliz-3.1.3-r1.ebuild 1662 BLAKE2B d819f3709adb1af4b60efaab9c122158e49a3b6dffc418ab2a2d35655b95bf3a6e0421bdc57ec8ad9a957a59ef3a217dab725bfb8441ec46a71c2a8d4720b382 SHA512 4f19213464518951abec233ba53ac2f5a60d683ffa59a7fc81bdeece1361182f2d7cd0f517ec259c3b130776eb9acdd200d01fe8de9b59fc4945bec75e319ed5
-EBUILD normaliz-3.8.10-r1.ebuild 1129 BLAKE2B c10dec79da1c8199c49ca50ce4bb23c2c3c9460fbc412da1aca8055e79a4931787d8511a71c27c39beb1b4b9504a116ffc55790f6b0eac84b37c4a6335df5f2d SHA512 92e2cab1733ff1a5d7d301ed488b8fa4b92cf4a5ecb5c6cc1cda0dad3f1a0ddd1e867e615f1b781e7782fb549acb9e44dc75ceda70636e05731f455921d5ffba
-EBUILD normaliz-3.9.3.ebuild 1485 BLAKE2B 86345d201f397916cc0e6afebc84a2dd64b283e5fcb7b3ef4e9217a20331217c684674f630b6ac5499d484c2c998dbb95e995ebd92c14ddcf66777cdc84d1f7a SHA512 96368f73fe01b8969550d5d8f2eb296a68c78cf317a16decc3539a085710cbdfdfc386de04950213c664cd566e48de8001b01f697b4950286043bdd627b0ce82
+EBUILD normaliz-3.1.3-r1.ebuild 1711 BLAKE2B 8f7159ac11a2f308a4cd2a28d6b3df243c8676be084990eff73a5ffbb149d0b8de60f39e7c2b75a5de6bf64ae3de23dcade8d4ce90386ff439896697f2e8cdd7 SHA512 3be22fee4b36bfa98dd5e62ee65961465cec62f245524edfb73eeba7faa5d3fc988523058de8ad282987c42439dcc9df1d0a65728cb7c51cb5da7a9c94ee7793
+EBUILD normaliz-3.8.10-r1.ebuild 1245 BLAKE2B 2cb18e96f5eb8090883093469462bcd56edd5bdeedce9b09cdd81ce28841e60207529876af8876ea4656016f556c35f9a438fde98b5d0c0af49b2ed61d23f238 SHA512 e517bdb1d7feaa45182a0fa8738518214632d400b71d9bc1b50b81731ac8b866d44f7867879b7d58ccb73221e5e96266761042ed20b7d789074f658c8a61f3de
+EBUILD normaliz-3.9.3.ebuild 1601 BLAKE2B 27883f7806c170852b3d7bd61f09849820ab57a76e352dbf2a357bc6c9e352aff2b1585c35cec8866d54dc68d6c66011df3b822931c16bcb98dec787fb7db217 SHA512 0aff7c4a86a9b41f4267e0d854388bb8c82b5b08ad60ee103bb4ae3a8675c810627cc9bb480e2f82084e0fe55b0d17002dcef69723db0a09a98023b344d5d52b
 MISC metadata.xml 823 BLAKE2B e6ac647e395713b5589b2dd6655bdde020fdb4113067f83d503497e0e5ec916b04d2742227ea16f1dda4551c1275b2d0e684e3dab4cb331fc4d42597ea2bc004 SHA512 3f242ea780a29900dfda6b7a0372a87d38ebd11184e1eed976653bc3712e54c2cf5897f07c7f2d0aa50a1af6364fb797c2c4e78cb9c3fa4344370cab4dbe4abb
diff --git a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
index bc18fd6a3868..a2d3890c2854 100644
--- a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,15 +26,20 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MYP}
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_prepare() {
 	./bootstrap.sh || die
 	default
 }
 
 src_configure() {
-	if use openmp && ! tc-has-openmp ; then
-		die "You requested openmp, but your toolchain does not support it."
-	fi
 	econf $(use_enable openmp)
 }
 
diff --git a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
index 74f541639c16..d696ca7b9817 100644
--- a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,12 @@ DEPEND="
 "
 # Only a boost header is needed -> not RDEPEND
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
index 7b7436eeb4e9..9fa89e9d001b 100644
--- a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
@@ -24,8 +24,12 @@ DEPEND="
 "
 # Only a boost header is needed -> not RDEPEND
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index 6ac4509a7545..ecc2022defe5 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,5 +1,5 @@
 AUX num-utils-0.5-r2-Makefile.patch 1498 BLAKE2B dd113fae4449a4d40d5e2c4aba77e4442dd120b3ead0160963910f3b9c6ed9f14578e3795ea6ba5947bc591eeadf04154e5df2482dbae7c76dba0ec2e8699292 SHA512 a59169a419a8ee5529e28f67b67c231f27da10715ed5e876f2ed8c971e8b12870897c3759f12574f1de82e832947336f788e2b1a060cf594439722f98f43fbd5
 DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561
 DIST num-utils_0.5-15.debian.tar.xz 17436 BLAKE2B 099e22a67b359072789106581c6d3b4fe006eb0064ad70578c0cf07388d1b9a677eb418d8d79ae59d6a9e0f3bff93e3159448e36c965f314c6bc559f5af70921 SHA512 5cbcf0d984e2c87fc16932bbd3e952a2b38c1272e00b55839d42ffaf28e0a8b0f5e4340ae01124ef34507ec4a144df0a48fa2af087f876cef39fdc5ba20ce0d1
-EBUILD num-utils-0.5-r2.ebuild 1202 BLAKE2B 57737675f383834ff0e3c0e897f74c8a6d7ca5f710af62bbd53a5dee80908361289252fe43489b1917192b96370484aedf383971a626089297f3ec2b381f0667 SHA512 46042e90a8b587947b3722eba43284e4731947181389606e74ff529d4804ab38c1c5b33c6246d112f987f02af56673ea48f26e6b3d0cde8d4e0ac39633e62a87
+EBUILD num-utils-0.5-r2.ebuild 1198 BLAKE2B 97d4727a651235294e87b664dbe0ac8ad52dd93d368b4538229a8d53523f7a35e4d69c5634311060f41d04a3871281c9a9c715a3783190957ff029cde0162d08 SHA512 7be69d56592478dc6f1c1ed0818e281f86ad1a5db44ffa95000ecf670cba2b25ff15d160d77e9d20adeb57b33cd2aabf3019686666c84456715d182a77c30c18
 MISC metadata.xml 270 BLAKE2B 4a5eb6dd2d9b902f13d543c859532c69cadc4595acd36675d25ff9ff204757f274327f87aa1bd7ddb1f040d5b028f52f614828b6794c19f60cc08dca04185af6 SHA512 cff77e4b0c454fc9c32b427b012585f4b1ab12dc2ca19ef669b43b0c64eb0ad6ffdc07a04c0c3e4eef8ce621f3a90c701bdd824cbc6e828aa62f6450f40ac1c6
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
index c8dc82f9031f..0562c712af64 100644
--- a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
+++ b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 arm ppc x86"
 
 # pod2man
 BDEPEND="dev-lang/perl"
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index def3e7cb3c01..45e96c8c373f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -8,6 +8,6 @@ DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd31
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.1.0.tar.gz 34187598 BLAKE2B da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58 SHA512 042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0-r2.ebuild 5995 BLAKE2B ed94a76a9ce898c58add76c3470062115ed26263dbe61b49c4c480908e2034f2903d54884ef873b1e4b8ca9c251250555fe0f4bfd27034786edfcca6bbd57ddd SHA512 789710b0a71797ef2dbf536959d03bae3da5ba569601e9b91f2e0054f560af78b1ae6c4d8d8c52533eb88b7dffaab8e24f6f3f0d94c626d9edc6df194b50c27e
+EBUILD octave-6.4.0-r3.ebuild 6036 BLAKE2B 2f2e6152d47193f7dd89fd7bf2f544540959f39485e12041a71e528ea75eb18c2e3c0f9d090936c043b2051dfb01ebfe9cdb1775d9f40acd28b2cc552eeaf622 SHA512 e562f678d76d7f419ed818eff5b504dd57bf4d789ce7773d307c922f934675e3a1bbb61d0463c66fca43912d4baaecacf87d6f6c083122c4d8d7c51d02281be1
 EBUILD octave-7.1.0.ebuild 5920 BLAKE2B dd66f57ea2f1c1b61f6837e1964a79deeb35ad81fd42e40ebd2f9f20256f9f4b490e0b2f1d637ec32c561658dbbe045af9f315636ea6e14d29c4155b76ceca95 SHA512 adef7ac2c481acf24be8cb30369745ee0a24dccf21667ed00b0706e4ed6734c9500242cb4aa3b12c56662855993fe6e51dac185b19072663ea6ea0ee7386fcc2
 MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
diff --git a/sci-mathematics/octave/octave-6.4.0-r2.ebuild b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index fc956ca314bf..0b54c76a4ce2 100644
--- a/sci-mathematics/octave/octave-6.4.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
@@ -78,8 +78,9 @@ RDEPEND="
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	sundials? ( >=sci-libs/sundials-4:0= )
+	sundials? ( <sci-libs/sundials-6.2.0:= )
 	X? ( x11-libs/libX11:0= )"
+# bug #846968 for sundials < dep
 DEPEND="${RDEPEND}
 	dev-util/gperf
 	virtual/pkgconfig
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index aed51250bfd8..dca63455ee69 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -4,8 +4,7 @@ AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eed
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
-DIST pari-2.13.3.tar.gz 4768312 BLAKE2B e6df23d3929ef1549009eb82c628cc2b9f1f3a446b2c2b246e157b93859006c3f4526c6fef4b975be87b9c6c011e179c169b4f237981c2ca1e02df0adbc4c00a SHA512 16cc20e44bc9b408798a86ffc31f8096e5adc01e0b8f7620e3d03201d71ddbe1d1bfecb22ab69c5b03270e9e97657042de29bb2055173b0d4cf169ec4373972b
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-EBUILD pari-2.13.3.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
-EBUILD pari-2.13.4.ebuild 3424 BLAKE2B 36ae63d5c05de92b91df55ccac68b205061828de8198ad64530c1d9193a78b89a9d9740d8f709e3cc9e39bb11015edf257134f878323e208ed1e68ae917750b6 SHA512 e8475e888ceb29c08ec17aaebcc615ceffbccd3ade0f95fec17c5c1703167bad46c24576b4b05bf859f99d5b6cbff7b089c972b72f111cdaa82bf98cc78fd785
+EBUILD pari-2.13.4-r1.ebuild 3282 BLAKE2B c509b6a41a501e54e5004110c49b83c6811d49883d089be2a1b077376b15dde11bcd13749a7544482db577ef1830b3c3ce26a30c9cc4eb824d5db4b1bafed099 SHA512 0c4e271e1486c58686f060589a6c331e48b3501f448665d9aee9a1cae027172ce585da1320a87e141db714fb9f8c54679be72c34ae365b930f0f041edd43b350
+EBUILD pari-2.13.4.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.3.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
index 2b6dd7c50043..0f105d54107a 100644
--- a/sci-mathematics/pari/pari-2.13.3.ebuild
+++ b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
@@ -88,11 +88,7 @@ src_configure() {
 }
 
 src_compile() {
-	local mymake=""
-	use hppa && \
-		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
-	emake ${mymake} gp
+	emake gp
 
 	if use doc; then
 		# To prevent sandbox violations by metafont
diff --git a/sci-mathematics/pari/pari-2.13.4.ebuild b/sci-mathematics/pari/pari-2.13.4.ebuild
index 59258dadea5d..2b6dd7c50043 100644
--- a/sci-mathematics/pari/pari-2.13.4.ebuild
+++ b/sci-mathematics/pari/pari-2.13.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index a3ef98efd069..4fe5486055d7 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -1,16 +1,8 @@
-AUX petsc-3.13.0-do_not_run_mpiexec.patch 2822 BLAKE2B 6c8e8185c693fdc720c0d8ea803cecff2d4b29ae71e3251e06e3460e05b301b709f30032f9a473f065c3e2a9a7b488241cb0d63ddaebdcdf275513af50257ddc SHA512 c2ea68fd59feed34ea6b7afdcbfe24e27e44d844ed6f077c52b81a20676dabb4613c9add6b33edea7d46f0c1a55993bd020d342092aa15e0f46020cc6bc51609
-AUX petsc-3.13.0-fix_sandbox_violation.patch 1022 BLAKE2B 4883be2a38becba88dd1ceafffae46b775f75a59ce990c2d92808a52fb27e5ab89a14e355599009466be0af58680076e15ae74d82cd243b3bfe867fa90f4f05a SHA512 afd6e4ade2a53941d0211baa78e179de9c8bfead15c4c245d25623cee99fb1c0821d154e58428b3c431654d770689afdec1c2bd631f2fa8eedd99d3c7186656c
-AUX petsc-3.13.0-make_hypre_configure.patch 4055 BLAKE2B e3bc831665fbe2c9a724a13420d1ce7557b7a1a6fcd7537271a6e48622f29f71f72257d649bcbef4aa4f287a804407cdb80579797eb54cfa994ef85d5bcb617f SHA512 47e4971596342c160fc54e1bc6d9fa739ae4bf6a9e3f89659992a3548de0beacdc7ac34a900117c1ee43b6bfaa81e8a58f1c45acea072be612ece3b5d18d7f86
 AUX petsc-3.16.0-fix_sandbox_violation.patch 717 BLAKE2B 9bef08265c058433cf903cc33739e9a1a2dc19f6ee77d92f2884c8a3fbdabe6585e9afa663a2a9ecf622d2e5c688ee0e931249e2e053213e3f0991070a0dd352 SHA512 3c8b490f8f6f0a4ceff8dbafdcc835174549cfe397753a7855995543c51dc5629c576b3af76c0ef527a62b2475dd5e6f059036048619f4ca83146879682835b9
 AUX petsc-3.7.0-disable-rpath.patch 909 BLAKE2B b9b6064886d6c10b382982778398cb7fa254242e5ed0dfb86dd4cd6c094dc51eecfd625f6de5c2779bfc5b3beda351ac44145c69ac246d814a728d7565da8086 SHA512 8241c593d903615feb175bfe8213792ace739a18ac5f4c1d1890155ccea7de30b5ef5d97e2fa3b043e9a1e520e022abedeb038d0b4db671f89045e04edc65a68
-DIST petsc-3.13.1.tar.gz 35097687 BLAKE2B fccf64fd3694deffdd0dc561069ffa7e9342fe279b5c9123edeb011df931874083839d27b7b9a0c63faea6487b104b54fd4ce68a88a074c82de91e8baaf270b0 SHA512 41c3138a6ae6c1f2d9077b464c6aeda96287e5a76849582b8f432e2ee93d2594a78ba2181eac0054a77b6165692be5f1a057049313f2be9743d4246383dfdc77
-DIST petsc-3.14.6.tar.gz 39719179 BLAKE2B d3047baf87c67eb64ef02c0c54d6313ea06f091b377b3cdf6dcf6d96c7d68cec5958a007ddd84b52a3ab39bfc0adf146307fa1785a10f39386393371186a3fba SHA512 9766e164446ac5a69b8bf761a0e8a235b1a2b85ed9c96a7fd59e668ae4cceb9d9559a38b175b4aa9747e78d7b44d0018a3c02748dcd3d783d28f861f8382d44c
-DIST petsc-3.15.0.tar.gz 15976488 BLAKE2B babfbeb05321c9cb2f7d70ef8ffca974a016eae73ca1a3359d9a8d38aa5aa90ff34571169a5711627d738b93f89fdee3d0a0ff1bd0e51cb7300bbb9b0a8675cb SHA512 d1565823d8a5ce5e1c2c576bbe1b4ebf467cef20bbd8e0cf6c303c6c2af2bf902b66c79468f4e125496f9242be4bd6ac162535ee30252cfb902c0d906a6f27c0
 DIST petsc-3.16.0-fftw-without-mpi.patch.bz2 5824 BLAKE2B 59615b1bbaf8ca1da92d7d193a45a2dd434f762cd741d711d4f408183a201a276ac3c968a3e7d740d19212120271701bce52bb7b0f4e311268f40915c81f9dcb SHA512 8e07dfe56a9150ce9a3a5ab8012657875ef84e6e7daa60560bbdd9062078c876a826057f3f3eaf1697ce046a82756ee6eb6a8b819eb51245367c9d5c8a72ee8e
 DIST petsc-3.16.0.tar.gz 16748960 BLAKE2B 87f9fdb79a9c44e5f476fa4746ad0cbe72f3eda9f6039f2e4743105626701d7c8d6c010fdb9d89becf8619288d0b7a60c8bc4e2fc0793eac5b39030b02c04fd9 SHA512 5280032fb4ec4d058733788bb0ae674e7400565e204133bd10ed88a2965230ec7adeaca2d498267ce661377ca7e6f9d948992206b1d679587606cb422c004655
-EBUILD petsc-3.13.1.ebuild 5477 BLAKE2B e9a396d53021669d05fab78e68b4ee29430b544eb3f3999f39d38c2e266bf487bc33375057cccd61cc693e5689cdac90ce656a0463df9426b84398dc69997203 SHA512 406f1d98dcfbed81df31f4f0bee38af47b35668f2982d7cbe97ebe4616754731c3a74bec5f823c3a89daa859f4d41d1cbef2da74ba8b5ffa260d16b2ce1139c4
-EBUILD petsc-3.14.6.ebuild 5369 BLAKE2B a76974285807ac4b8375099e1ca771e5a7f9c1fb8d14d369572a4d650a16a04f1bf2d074d144667c2c5b65e9bbd49fa2543bdbf97bc09d734326d37d194a12bb SHA512 408deb64b90ebe17671c8f2b75eac0c5d4ed27964acb92c09028200647016083ac01e323faf4e163c269b611e5952e79e223022bc81d557eadf690d83933f949
-EBUILD petsc-3.15.0-r1.ebuild 5577 BLAKE2B 5b4cc59ba4c239f9990d3944c2b92c940c8b1f5bdd6e21d426c21d049c8b6a05ac42a1e7ac023d75d8d0ce5fac4c6a905224e7a55137fa9d8c9124537a15ef2d SHA512 9ae481f8b2d5860a4346d4c62f07b3a7a0c89b17849983680aa5c728ad5ceaaaafa647495c7e4d4658b2a69b36d6795f1c14b46d3af8967b1d0238c79f812754
-EBUILD petsc-3.15.0.ebuild 5291 BLAKE2B 54b3b5e1dd217cde21729e55fc82b0879de9d79976c8b2c3d32aefd8c18303b91073abe50226aeffe65e8cedb78dcd21bc7a267e3959941706b144c37fcf2c16 SHA512 4639f9551500799f835c47fd8f1bc521ab624db664de50ce70436d85827c0cd11d2d01556e1238484a769af1e913c773996aa06c3824050947f1a5292e3fb8aa
-EBUILD petsc-3.16.0.ebuild 5425 BLAKE2B 1eac71bf09d22ef0b5b5d88d6215a08fb125e27e30823fe414e3cfa743d7b21b87b11ac9863df81db0fd9354c5ef4024f72b2f632a96f079423ef76951cc4f92 SHA512 4924b6cb7013d2ca25e86111a5c7263c682bd78ea25386f76f89a81127d45139317536beecfabbc52c1b71a93f2a9c19a4f3873eaeed188f9dd939870fe7dd31
+DIST petsc-3.17.1.tar.gz 17082265 BLAKE2B de1bfe45f93e18e32181499e59912df9225c8e24d75f52e641e552fd43e4d5be48d549d284365b173aa93e51603f5b7740eaac0557ff8c7c96b370f4683257f6 SHA512 8c81cc148b1a899a55e54a013d61519ec7b44f98f7ae30c3f8d0e83ba285b23f4b4d9e2cd483c531d337bc41887e4079b727ba73676b1b653910140291e93575
+EBUILD petsc-3.16.0-r1.ebuild 5427 BLAKE2B 9fe488d1f477469b422fcc535709b64b0fc5cac6a7f46e1c77b1f4a55af8658d07ddad9eb38d994b19deb0c4266216b18cd8c0035dc142fa13b13e0854837703 SHA512 20e80e39d81346e9c4d342a8010da080abdea56dfa4408dd10f1ae3a688a198244b6dd1a9731812d7fbdb21d0bfd0a32573c305e66208c0d23b2e538135033dc
+EBUILD petsc-3.17.1-r1.ebuild 5403 BLAKE2B 4e792da75e973ca1dd850c84a5441d0a509f911a4267d9f6ee4dfb778647b7a75b0ce512ff68332f546a38b0d5781c44bda4766df7e5900559a097a5d22c5ff5 SHA512 9989ef401f8f4e19331a117625a4a3099f306a6f19ad53ebc6d14658f5961f8a6b0b961ab3e87db4270713b68fde96d723dca8dc12af1916fad3ef3bf0e8dff7
 MISC metadata.xml 1179 BLAKE2B 90cac3d6419ed0cdec7da36616a778e13c6a4ada73f21fece52451fef33e42385a36017235dac0a03d48502064e52ad9f1c8155ee379feb9ac1176318020796d SHA512 4f24c102b8e0b088475e00af33255540986501d16fb0eb4a0dc67a334237c1cde964370eeed1b6e27e8c5433bc64079bfcdc80ecc9d19b71b36148f7689764d4
diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch b/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch
deleted file mode 100644
index 4c46658dec71..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/config/BuildSystem/config/packages/MPI.py b/config/BuildSystem/config/packages/MPI.py
-index 7e424e71..ee502bd2 100644
---- a/config/BuildSystem/config/packages/MPI.py
-+++ b/config/BuildSystem/config/packages/MPI.py
-@@ -210,28 +210,11 @@ shared libraries and run with --known-mpi-shared-libraries=1')
-           raise RuntimeError('Could not locate MPIEXEC - please specify --with-mpiexec option')
-       # Support for spaces and () in executable names; also needs to handle optional arguments at the end
-       # TODO: This support for spaces and () should be moved to core BuildSystem
--      self.mpiexec = self.mpiexec.replace(' ', '\\ ').replace('(', '\\(').replace(')', '\\)').replace('\ -',' -')
--      if (hasattr(self, 'ompi_major_version') and int(self.ompi_major_version) >= 3):
--        (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -help all', checkCommand = noCheck, timeout = 60, log = self.log, threads = 1)
--        if out.find('--oversubscribe') >=0:
--          self.mpiexec = self.mpiexec + ' --oversubscribe'
-+      self.mpiexec = self.mpiexec + ' --oversubscribe'
- 
-     # using mpiexec environmental variables make sure mpiexec matches the MPI libraries and save the variables for testing in PetscInitialize()
-     # the variable HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE is not currently used. PetscInitialize() can check the existence of the environmental variable to
-     # determine if the program has been started with the correct mpiexec (will only be set for parallel runs so not clear how to check appropriately)
--    (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -n 1 printenv', checkCommand = noCheck, timeout = 60, threads = 1, log = self.log)
--    if ret:
--      self.logWrite('Unable to run '+self.mpiexec+' with option "-n 1 printenv"\nThis could be ok, some MPI implementations such as SGI produce a non-zero status with non-MPI programs\n'+out+err)
--    else:
--      if out.find('MPIR_CVAR_CH3') > -1:
--        if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPIR_CVAR_CH3')
--      elif  out.find('MPIR_CVAR_CH3') > -1:
--        if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPICH')
--      elif out.find('OMPI_COMM_WORLD_SIZE') > -1:
--        if hasattr(self,'mpich_numversion'): raise RuntimeError("Your libraries are from MPICH but it appears your mpiexec is from OpenMPI");
--        self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'OMP')
- 
-     self.addMakeMacro('MPIEXEC', self.mpiexec)
-     self.mpiexec = self.mpiexec + ' -n 1'
diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch
deleted file mode 100644
index c0dfd53a0112..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/config/PETSc/options/installDir.py b/config/PETSc/options/installDir.py
-index 860faf0f..87898811 100755
---- a/config/PETSc/options/installDir.py
-+++ b/config/PETSc/options/installDir.py
-@@ -40,13 +40,6 @@ class Configure(config.base.Configure):
-       self.dir = os.path.abspath(os.path.expanduser(self.framework.argDB['prefix']))
-       self.petscDir = self.dir
-       self.petscArch = ''
--      try:
--        os.makedirs(os.path.join(self.dir,'PETScTestDirectory'))
--        os.rmdir(os.path.join(self.dir,'PETScTestDirectory'))
--      except Exception as e:
--        self.logPrint('Error trying to to test write permissions on directory '+str(e))
--        self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs'
--        self.installSudo = 'sudo '
-     else:
-       self.dir = os.path.abspath(os.path.join(self.petscdir.dir, self.arch.arch))
-       self.petscDir = self.petscdir.dir
diff --git a/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch b/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch
deleted file mode 100644
index 1453fd519e81..000000000000
--- a/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/config/packages/hypre.py
-index 4d915c31..1b05a1ee 100644
---- a/config/BuildSystem/config/packages/hypre.py
-+++ b/config/BuildSystem/config/packages/hypre.py
-@@ -5,10 +5,6 @@ class Configure(config.package.GNUPackage):
-   def __init__(self, framework):
-     config.package.GNUPackage.__init__(self, framework)
-     #self.version         = '2.18.2'
--    self.minversion      = '2.14'
--    self.versionname     = 'HYPRE_RELEASE_VERSION'
--    self.versioninclude  = 'HYPRE_config.h'
--    self.requiresversion = 1
-     #self.gitcommit       = 'v'+self.version
-     self.gitcommit       = '93baaa8c9' # v2.18.2+valgrind-fix
-     self.download        = ['git://https://github.com/hypre-space/hypre','https://github.com/hypre-space/hypre/archive/'+self.gitcommit+'.tar.gz']
-diff --git a/include/petsc/private/petschypre.h b/include/petsc/private/petschypre.h
-index 81ca7136..b403e70e 100644
---- a/include/petsc/private/petschypre.h
-+++ b/include/petsc/private/petschypre.h
-@@ -6,12 +6,6 @@
- #include <HYPRE_config.h>
- #include <HYPRE_utilities.h>
- 
--/* from version 2.16 on, HYPRE_BigInt is 64 bit for 64bit installations
--   and 32 bit for 32bit installations -> not the best name for a variable */
--#if PETSC_PKG_HYPRE_VERSION_LT(2,16,0)
--typedef PetscInt HYPRE_BigInt;
--#endif
--
- /*
-   With scalar type == real, HYPRE_Complex == PetscScalar;
-   With scalar type == complex,  HYPRE_Complex is double __complex__ while PetscScalar may be std::complex<double>
-diff --git a/src/mat/impls/hypre/mhypre.c b/src/mat/impls/hypre/mhypre.c
-index 0f7470e6..cce3e2b0 100644
---- a/src/mat/impls/hypre/mhypre.c
-+++ b/src/mat/impls/hypre/mhypre.c
-@@ -15,10 +15,6 @@
- #include <_hypre_parcsr_ls.h>
- #include <_hypre_sstruct_ls.h>
- 
--#if PETSC_PKG_HYPRE_VERSION_LT(2,18,0)
--#define  hypre_ParCSRMatrixClone(A,B) hypre_ParCSRMatrixCompleteClone(A)
--#endif
--
- static PetscErrorCode MatHYPRE_CreateFromMat(Mat,Mat_HYPRE*);
- static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat,Mat,HYPRE_IJMatrix);
- static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat,HYPRE_IJMatrix);
-@@ -63,7 +59,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat
-         nnz_o[i] = 0;
-       }
-     }
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-     { /* If we don't do this, the columns of the matrix will be all zeros! */
-       hypre_AuxParCSRMatrix *aux_matrix;
-       aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij);
-@@ -73,9 +68,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat
-       aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij);
-       hypre_AuxParCSRMatrixNeedAux(aux_matrix) = 1;
-     }
--#else
--    PetscStackCallStandard(HYPRE_IJMatrixSetDiagOffdSizes,(ij,nnz_d,nnz_o));
--#endif
-     ierr = PetscFree(nnz_d);CHKERRQ(ierr);
-     ierr = PetscFree(nnz_o);CHKERRQ(ierr);
-   }
-@@ -233,11 +225,7 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij)
-   /* need to shift the diag column indices (hdiag->j) back to global numbering since hypre is expecting this */
-   hjj = hdiag->j;
-   pjj = pdiag->j;
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-   for (i=0; i<pdiag->nz; i++) hjj[i] = pjj[i];
--#else
--  for (i=0; i<pdiag->nz; i++) hjj[i] = cstart + pjj[i];
--#endif
-   ierr = PetscArraycpy(hdiag->data,pdiag->a,pdiag->nz);CHKERRQ(ierr);
-   if (sameint) {
-     ierr = PetscArraycpy(hoffd->i,poffd->i,pA->A->rmap->n + 1);CHKERRQ(ierr);
-@@ -247,12 +235,8 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij)
- 
-   /* need to move the offd column indices (hoffd->j) back to global numbering since hypre is expecting this
-      If we hacked a hypre a bit more we might be able to avoid this step */
--#if PETSC_PKG_HYPRE_VERSION_GE(2,16,0)
-   PetscStackCallStandard(hypre_CSRMatrixBigInitialize,(hoffd));
-   jj  = (PetscInt*) hoffd->big_j;
--#else
--  jj  = (PetscInt*) hoffd->j;
--#endif
-   pjj = poffd->j;
-   for (i=0; i<poffd->nz; i++) jj[i] = garray[pjj[i]];
- 
diff --git a/sci-mathematics/petsc/petsc-3.13.1.ebuild b/sci-mathematics/petsc/petsc-3.13.1.ebuild
deleted file mode 100644
index 23e1117a52c6..000000000000
--- a/sci-mathematics/petsc/petsc-3.13.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="https://www.mcs.anl.gov/petsc/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="afterimage boost complex-scalars cxx debug doc fftw
-	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
-
-# hypre and superlu curretly exclude each other due to missing linking to hypre
-# if both are enabled
-REQUIRED_USE="
-	afterimage? ( X )
-	complex-scalars? ( !hypre !superlu )
-	hdf5? ( mpi )
-	hypre? ( cxx mpi !superlu )
-	mumps? ( mpi scotch )
-	scotch? ( mpi )
-	superlu? ( !hypre )
-"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	afterimage? ( media-libs/libafterimage )
-	boost? ( dev-libs/boost )
-	fftw? ( sci-libs/fftw:3.0[mpi?] )
-	hdf5? ( sci-libs/hdf5[mpi?] )
-	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
-	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
-	scotch? ( sci-libs/scotch[mpi?] )
-	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
-	superlu? ( >=sci-libs/superlu-5 )
-	X? ( x11-libs/libX11 )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
-	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
-	"${FILESDIR}"/${PN}-3.13.0-make_hypre_configure.patch
-	"${FILESDIR}"/${PN}-3.13.0-do_not_run_mpiexec.patch
-)
-
-# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
-petsc_enable() {
-	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
-}
-# add external library:
-# petsc_with use_flag libname libdir
-# petsc_with use_flag libname include linking_libs
-petsc_with() {
-	local myuse p=${2:-${1}}
-	if use ${1}; then
-		myuse="--with-${p}=1"
-		if [[ $# -ge 4 ]]; then
-			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
-			shift 3
-			myuse="${myuse} --with-${p}-lib=$@"
-		else
-			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
-		fi
-	else
-		myuse="--with-${p}=0"
-	fi
-	echo ${myuse}
-}
-
-# select between configure options depending on use flag
-petsc_select() {
-	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
-}
-
-src_configure() {
-	# bug 548498
-	# PETSc runs mpi processes during configure that result in a sandbox
-	# violation by trying to open /proc/mtrr rw. This is not easy to
-	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
-	# which is used by libmpi.so.
-	addpredict /proc/mtrr
-	# if mpi is built with knem support it needs /dev/knem too
-	addpredict /dev/knem
-
-	# configureMPITypes with openmpi-2* insists on accessing the scaling
-	# governor rw.
-	addpredict /sys/devices/system/cpu/
-
-	# bug 771711
-	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
-	addpredict /dev/nvidiactl
-
-	# bug 810841
-	addpredict /dev/kfd
-
-	local mylang
-	local myopt
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	# environmental variables expected by petsc during build
-
-	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-	fi
-
-	# C Support on CXX builds is enabled if possible i.e. when not using
-	# complex scalars (no complex type for both available at the same time)
-
-	econf \
-		scrollOutput=1 \
-		FFLAGS="${FFLAGS} -fPIC" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
-		--with-shared-libraries \
-		--with-single-library \
-		--with-clanguage=${mylang} \
-		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
-		--with-petsc-arch=${PETSC_ARCH} \
-		--with-precision=double \
-		--with-gnu-compilers \
-		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
-		$(petsc_enable debug debugging) \
-		$(petsc_enable mpi) \
-		$(petsc_select mpi cc mpicc $(tc-getCC)) \
-		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
-		$(petsc_enable fortran) \
-		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
-		$(petsc_enable mpi mpi-compilers) \
-		$(petsc_select complex-scalars scalar-type complex real) \
-		--with-windows-graphics=0 \
-		--with-matlab=0 \
-		--with-cmake:BOOL=1 \
-		$(petsc_enable threads pthread) \
-		$(petsc_with afterimage afterimage \
-			/usr/include/libAfterImage -lAfterImage) \
-		$(use_with hdf5) \
-		$(petsc_with hypre hypre \
-			/usr/include/hypre -lHYPRE) \
-		$(use_with sparse suitesparse) \
-		$(petsc_with superlu superlu \
-			/usr/include/superlu -lsuperlu) \
-		$(use_with X x) \
-		$(use_with X x11) \
-		$(petsc_with scotch ptscotch \
-			/usr/include/scotch \
-		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
-		$(petsc_with mumps scalapack \
-			/usr/include/scalapack -lscalapack) \
-		$(use_with mumps mumps \
-			/usr/include \
-			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
-		--with-imagemagick=0 \
-		--with-python=0 \
-		$(use_with boost) \
-		$(use_with fftw)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99petsc <<- EOF
-		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
-	EOF
-	doenvd 99petsc
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*.html docs/changes docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/petsc/petsc-3.14.6.ebuild b/sci-mathematics/petsc/petsc-3.14.6.ebuild
deleted file mode 100644
index 5bd50a9d32fe..000000000000
--- a/sci-mathematics/petsc/petsc-3.14.6.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="https://www.mcs.anl.gov/petsc/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="afterimage boost complex-scalars cxx debug doc fftw
-	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
-
-# hypre and superlu curretly exclude each other due to missing linking to hypre
-# if both are enabled
-REQUIRED_USE="
-	afterimage? ( X )
-	complex-scalars? ( !hypre !superlu )
-	hdf5? ( mpi )
-	hypre? ( cxx mpi !superlu )
-	mumps? ( mpi scotch )
-	scotch? ( mpi )
-	superlu? ( !hypre )
-"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	afterimage? ( media-libs/libafterimage )
-	boost? ( dev-libs/boost )
-	fftw? ( sci-libs/fftw:3.0[mpi?] )
-	hdf5? ( sci-libs/hdf5[mpi?] )
-	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
-	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
-	scotch? ( sci-libs/scotch[mpi?] )
-	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
-	superlu? ( >=sci-libs/superlu-5 )
-	X? ( x11-libs/libX11 )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
-	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
-)
-
-# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
-petsc_enable() {
-	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
-}
-# add external library:
-# petsc_with use_flag libname libdir
-# petsc_with use_flag libname include linking_libs
-petsc_with() {
-	local myuse p=${2:-${1}}
-	if use ${1}; then
-		myuse="--with-${p}=1"
-		if [[ $# -ge 4 ]]; then
-			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
-			shift 3
-			myuse="${myuse} --with-${p}-lib=$@"
-		else
-			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
-		fi
-	else
-		myuse="--with-${p}=0"
-	fi
-	echo ${myuse}
-}
-
-# select between configure options depending on use flag
-petsc_select() {
-	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
-}
-
-src_configure() {
-	# bug 548498
-	# PETSc runs mpi processes during configure that result in a sandbox
-	# violation by trying to open /proc/mtrr rw. This is not easy to
-	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
-	# which is used by libmpi.so.
-	addpredict /proc/mtrr
-	# if mpi is built with knem support it needs /dev/knem too
-	addpredict /dev/knem
-
-	# configureMPITypes with openmpi-2* insists on accessing the scaling
-	# governor rw.
-	addpredict /sys/devices/system/cpu/
-
-	# bug 771711
-	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
-	addpredict /dev/nvidiactl
-
-	# bug 810841
-	addpredict /dev/kfd
-
-	local mylang
-	local myopt
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	# environmental variables expected by petsc during build
-
-	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-	fi
-
-	# C Support on CXX builds is enabled if possible i.e. when not using
-	# complex scalars (no complex type for both available at the same time)
-
-	econf \
-		scrollOutput=1 \
-		FFLAGS="${FFLAGS} -fPIC" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
-		--with-shared-libraries \
-		--with-single-library \
-		--with-clanguage=${mylang} \
-		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
-		--with-petsc-arch=${PETSC_ARCH} \
-		--with-precision=double \
-		--with-gnu-compilers \
-		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
-		$(petsc_enable debug debugging) \
-		$(petsc_enable mpi) \
-		$(petsc_select mpi cc mpicc $(tc-getCC)) \
-		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
-		$(petsc_enable fortran) \
-		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
-		$(petsc_enable mpi mpi-compilers) \
-		$(petsc_select complex-scalars scalar-type complex real) \
-		--with-windows-graphics=0 \
-		--with-matlab=0 \
-		--with-cmake:BOOL=1 \
-		$(petsc_enable threads pthread) \
-		$(petsc_with afterimage afterimage \
-			/usr/include/libAfterImage -lAfterImage) \
-		$(use_with hdf5) \
-		$(petsc_with hypre hypre \
-			/usr/include/hypre -lHYPRE) \
-		$(use_with sparse suitesparse) \
-		$(petsc_with superlu superlu \
-			/usr/include/superlu -lsuperlu) \
-		$(use_with X x) \
-		$(use_with X x11) \
-		$(petsc_with scotch ptscotch \
-			/usr/include/scotch \
-		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
-		$(petsc_with mumps scalapack \
-			/usr/include/scalapack -lscalapack) \
-		$(use_with mumps mumps \
-			/usr/include \
-			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
-		--with-imagemagick=0 \
-		--with-python=0 \
-		$(use_with boost) \
-		$(use_with fftw)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99petsc <<- EOF
-		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
-	EOF
-	doenvd 99petsc
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*.html docs/changes docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/petsc/petsc-3.15.0.ebuild b/sci-mathematics/petsc/petsc-3.15.0.ebuild
deleted file mode 100644
index 8286baab9803..000000000000
--- a/sci-mathematics/petsc/petsc-3.15.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="https://www.mcs.anl.gov/petsc/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="afterimage boost complex-scalars cxx debug fftw
-	fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X"
-
-# hypre and superlu curretly exclude each other due to missing linking to hypre
-# if both are enabled
-REQUIRED_USE="
-	afterimage? ( X )
-	complex-scalars? ( !hypre !superlu )
-	hdf5? ( mpi )
-	hypre? ( cxx mpi !superlu )
-	mumps? ( mpi scotch )
-	scotch? ( mpi )
-	superlu? ( !hypre )
-"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	afterimage? ( media-libs/libafterimage )
-	boost? ( dev-libs/boost )
-	fftw? ( sci-libs/fftw:3.0[mpi?] )
-	hdf5? ( sci-libs/hdf5[mpi?] )
-	hypre? ( >=sci-libs/hypre-2.18.0[mpi?] )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
-	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
-	scotch? ( sci-libs/scotch[mpi?] )
-	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
-	superlu? ( >=sci-libs/superlu-5 )
-	X? ( x11-libs/libX11 )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-	sys-apps/which
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch
-	"${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch
-)
-
-# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
-petsc_enable() {
-	use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
-}
-# add external library:
-# petsc_with use_flag libname libdir
-# petsc_with use_flag libname include linking_libs
-petsc_with() {
-	local myuse p=${2:-${1}}
-	if use ${1}; then
-		myuse="--with-${p}=1"
-		if [[ $# -ge 4 ]]; then
-			myuse="${myuse} --with-${p}-include=${EPREFIX}${3}"
-			shift 3
-			myuse="${myuse} --with-${p}-lib=$@"
-		else
-			myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
-		fi
-	else
-		myuse="--with-${p}=0"
-	fi
-	echo ${myuse}
-}
-
-# select between configure options depending on use flag
-petsc_select() {
-	use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
-}
-
-src_configure() {
-	# bug 548498
-	# PETSc runs mpi processes during configure that result in a sandbox
-	# violation by trying to open /proc/mtrr rw. This is not easy to
-	# mitigate because it happens in libpciaccess.so called by libhwloc.so,
-	# which is used by libmpi.so.
-	addpredict /proc/mtrr
-	# if mpi is built with knem support it needs /dev/knem too
-	addpredict /dev/knem
-
-	# configureMPITypes with openmpi-2* insists on accessing the scaling
-	# governor rw.
-	addpredict /sys/devices/system/cpu/
-
-	# bug 771711
-	# configureMPIEXEC and  configureMPITypes access /dev/nvidiactl
-	addpredict /dev/nvidiactl
-
-	# bug 810841
-	addpredict /dev/kfd
-
-	local mylang
-	local myopt
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	# environmental variables expected by petsc during build
-
-	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-	fi
-
-	# C Support on CXX builds is enabled if possible i.e. when not using
-	# complex scalars (no complex type for both available at the same time)
-
-	econf \
-		scrollOutput=1 \
-		FFLAGS="${FFLAGS} -fPIC" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
-		--with-shared-libraries \
-		--with-single-library \
-		--with-clanguage=${mylang} \
-		$(use cxx && ! use complex-scalars && echo "with-c-support=1") \
-		--with-petsc-arch=${PETSC_ARCH} \
-		--with-precision=double \
-		--with-gnu-compilers \
-		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
-		$(petsc_enable debug debugging) \
-		$(petsc_enable mpi) \
-		$(petsc_select mpi cc mpicc $(tc-getCC)) \
-		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
-		$(petsc_enable fortran) \
-		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
-		$(petsc_enable mpi mpi-compilers) \
-		$(petsc_select complex-scalars scalar-type complex real) \
-		--with-windows-graphics=0 \
-		--with-matlab=0 \
-		--with-cmake:BOOL=1 \
-		$(petsc_enable threads pthread) \
-		$(petsc_with afterimage afterimage \
-			/usr/include/libAfterImage -lAfterImage) \
-		$(use_with hdf5) \
-		$(petsc_with hypre hypre \
-			/usr/include/hypre -lHYPRE) \
-		$(use_with sparse suitesparse) \
-		$(petsc_with superlu superlu \
-			/usr/include/superlu -lsuperlu) \
-		$(use_with X x) \
-		$(use_with X x11) \
-		$(petsc_with scotch ptscotch \
-			/usr/include/scotch \
-		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
-		$(petsc_with mumps scalapack \
-			/usr/include/scalapack -lscalapack) \
-		$(use_with mumps mumps \
-			/usr/include \
-			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
-		--with-imagemagick=0 \
-		--with-python=0 \
-		$(use_with boost) \
-		$(use_with fftw)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99petsc <<- EOF
-		PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib
-	EOF
-	doenvd 99petsc
-}
diff --git a/sci-mathematics/petsc/petsc-3.16.0.ebuild b/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
index f39f87d8c281..efe8f2be01e6 100644
--- a/sci-mathematics/petsc/petsc-3.16.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,7 +171,7 @@ src_configure() {
 		[-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
 		$(petsc_with mumps scalapack \
 			/usr/include/scalapack -lscalapack) \
-		$(use_with mumps mumps \
+		$(petsc_with mumps mumps \
 			/usr/include \
 			[-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
 		--with-imagemagick=0 \
diff --git a/sci-mathematics/petsc/petsc-3.15.0-r1.ebuild b/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
index 5da94f15ff16..5b316ba60986 100644
--- a/sci-mathematics/petsc/petsc-3.15.0-r1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="afterimage boost complex-scalars cxx debug fftw
+IUSE="afterimage boost complex-scalars debug fftw
 fortran hdf5 hypre int64 mpi metis mumps scotch superlu threads X"
 
 # readd sparse when suitesparse-5.6.0 is in tree
@@ -30,7 +30,7 @@ RDEPEND="
 	hdf5? ( sci-libs/hdf5[mpi?] )
 	hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] )
 	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
+	mpi? ( virtual/mpi[fortran?] )
 	mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack )
 	scotch? ( sci-libs/scotch[int64?,mpi?] )
 	superlu? ( >=sci-libs/superlu-5 )
@@ -52,14 +52,14 @@ REQUIRED_USE="
 	afterimage? ( X )
 	complex-scalars? ( !hypre !superlu )
 	hdf5? ( mpi )
-	hypre? ( cxx mpi !superlu )
+	hypre? ( mpi !superlu )
 	mumps? ( mpi scotch )
 	scotch? ( mpi )
 	superlu? ( !hypre )
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-3.7.0-disable-rpath.patch"
-	"${FILESDIR}/${PN}-3.13.0-fix_sandbox_violation.patch"
+	"${FILESDIR}"/${PN}-3.16.0-fix_sandbox_violation.patch
 )
 
 # petsc uses --with-blah=1 and --with-blah=0 to en/disable options
@@ -112,16 +112,14 @@ src_configure() {
 	# bug 810841
 	addpredict /dev/kfd
 
-	local mylang
 	local myopt
 
-	use cxx && mylang="cxx" || mylang="c"
 	use debug && myopt="debug" || myopt="opt"
 
 	# environmental variables expected by petsc during build
 
 	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
+	export PETSC_ARCH="linux-gnu-c-${myopt}"
 
 	if use debug; then
 		strip-flags
@@ -147,7 +145,6 @@ src_configure() {
 		RANLIB="${RANLIB}" \
 		--prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \
 		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \
-		--with-clanguage="${mylang}" \
 		--with-cmake:BOOL=1 \
 		--with-gnu-compilers \
 		--with-imagemagick=0 \
@@ -171,13 +168,12 @@ src_configure() {
 		$(petsc_with superlu superlu /usr/include/superlu -lsuperlu) \
 		$(petsc_with scotch ptscotch /usr/include/scotch [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \
 		$(petsc_with mumps scalapack /usr/include/scalapack -lscalapack) \
-		$(use cxx && ! use complex-scalars && echo "--with-c-support=1") \
+		$(petsc_with mumps mumps /usr/include [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
 		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
 		$(use int64 && echo "--with-index-size=64") \
 		$(use_with boost) \
 		$(use_with fftw) \
 		$(use_with hdf5) \
-		$(use_with mumps mumps /usr/include [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \
 		$(use_with X x) \
 		$(use_with X x11)
 }
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index 9bcc048a7412..c9b7be6c6acc 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,3 +1,5 @@
 DIST planarity-3.0.1.1.tar.gz 456236 BLAKE2B 60040c8e205dbd9eb67667c6554836a9545bab74ccfb51e319edb191425f1b74403916e7887d06cb2d570eb17694338819ee5fd9828d6636ebecbade8915cdfa SHA512 50d2b6905d20252a6d482aae15984673972508540416a3e9396ff67923bf3bfb5668ef00309d42e540e5c8dd3ac4636ef54da2e5ee334075e87d2f3af6488035
+DIST planarity-3.0.2.0.tar.gz 462194 BLAKE2B 7927b04cb7c9839637fe13228da50cee581ef7fd7fdaaa9ff2dc62348ba10c7f42ba88a75801034fedc973cf86fca6396ba2fb0b1f71407d850b73b8a9fc4fd0 SHA512 dbbc97cd9cf0a5497fbca76f3b0741d3bcfca110c7022150750e73179a0a0441428c854479831395b8f6340d0554b1c0e7cf7eaa63f7fe40d2a59365488c7013
 EBUILD planarity-3.0.1.1.ebuild 495 BLAKE2B 5d6efacc1d86e54c2654d652215e1316fb38c3a26815c8263062d59c9c58462fdb96975136818186bf33688159a5499a7d4c8ad39573e0f2f10c9be40c96402a SHA512 1e09d7570c132e2bc3c9afef16cbcda9eac31d24f41c389580d741dc4212055c509db617f2028fdabdbda18af75c34ba13927ff19d865e8bf3755843ef7b3580
+EBUILD planarity-3.0.2.0.ebuild 505 BLAKE2B 8c6e8b4d24d4a7209a3c08bc9027bd2652df4c450166a4afb4511610433fffa69d5d70ff0890514a896c42df9860d2e71ce76c8d907b93a972a39d340523779d SHA512 4fd94b0d971c2cf0c4373713a3b1a27201938b561542c7ace17b5dbef55c87952af3ae273584096fd33d8ef8a4efe6bd04cd2f9bd7faff739351d67e6dc3b284
 MISC metadata.xml 809 BLAKE2B 6c3ad8e9bbbc3cfbd8c18183051153054b2ab7f4dd94e69c8f4f98a955001330d1e51e6b1da7f98a7ce29f7920b7a55a31624828a5aeaf7831ace0b4cf5dbec0 SHA512 5aa885d48f2d4626ed54a67abcc068186189e726ddb68bc889b6dc7d9aa09da30dbf7bb284020503d70bc94a25b5e16c907fe992862c2c2a6c344e2977e57f25
diff --git a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
new file mode 100644
index 000000000000..be7ad0f4831b
--- /dev/null
+++ b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The edge addition planarity suite of graph algorithms"
+HOMEPAGE="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
+
+SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 95b4bb856f36..a2ef35f29bc2 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,5 @@
+AUX polymake-4.6-perl-5.36.patch 659 BLAKE2B 4013b45b4edc79654fcfe77ffa17530ddaca8513eaf76fc338dae7fbcd1cf83f07f7b5ccaf2117051ae3f9fc951caa676b36fa06413988c271e0a5f01da28233 SHA512 0bf9f512c6b7439bf1660560d25a502f1fa16b7f0136f04f1c1c8812c1b1c5ab0ab5133e149777243985ca37e159d8a3de355b443441126328565063faa2ba8e
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
+EBUILD polymake-4.6-r1.ebuild 4119 BLAKE2B c04865bd05d7b52223b59c93f814e67a35a5d14ad4c7224be8e169ed3359aa67551e4aa174b54b88c4dde46c8468661cf5428c7fea5ba70574bd38183cac7ec0 SHA512 5d98adebe72237bca051cd0e4b9bbec533fae5ce182becd20e26bc7a32179693a5e283f7529952e0f7cd7a1662fefcc1718fd4c4ceff05950c634eba0211a3bf
 EBUILD polymake-4.6.ebuild 4028 BLAKE2B d3f194adf0566143a32e3914e5bfdeccee3e41e8d59236d3bfc22ee061cfa39039f46339b5a2a5e0e05ea6a8761387dfa506658d392cd7874c2d96f8745d9671 SHA512 9e8b93bc2b86c9ec895b44f5988d70e583f3b414c82d4993e3c0df2fcefd650f809a549325bdbdcb2ae4a6d7199cbd1d295775ab8f63b7883e655725ac64bda5
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch b/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch
new file mode 100644
index 000000000000..4a9d349ccb9a
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch
@@ -0,0 +1,15 @@
+diff -up lib/core/src/perl/RefHash.xxs.orig lib/core/src/perl/RefHash.xxs
+--- a/lib/core/src/perl/RefHash.xxs	2022-06-06 10:35:17.689807548 +0200
++++ b/lib/core/src/perl/RefHash.xxs	2022-06-06 10:37:12.935663947 +0200
+@@ -71,7 +71,11 @@ SV* tmp_keysv::set(SV* keysv)
+    Copy(obj.keyp, HEK_KEY(hekp), sizeof(SV*), char);
+    HEK_LEN(hekp) = sizeof(SV*);
+    HEK_HASH(hekp) = U32(obj.keyl >> 4);          // hash value
++#if PerlVersion < 5360
+    HEK_FLAGS(hekp) = HVhek_UNSHARED;
++#else
++   HEK_FLAGS(hekp) = HVhek_NOTSHARED;
++#endif
+    sv.sv_any = &xpv;
+    sv.sv_refcnt = 1;
+    sv.sv_flags = SVt_PVIV | SVf_IVisUV | SVf_POK | SVp_POK | PmFlagsForHashKey;
diff --git a/sci-mathematics/polymake/polymake-4.6-r1.ebuild b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
new file mode 100644
index 000000000000..446fedbda04a
--- /dev/null
+++ b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic ninja-utils toolchain-funcs
+
+DESCRIPTION="Tool for polyhedral geometry and combinatorics"
+SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
+HOMEPAGE="https://polymake.org/"
+
+# polymake itself is GPL-2, but even the minimal tarball bundles a lot
+# of other code. I've included everything that turns up with a
+#
+#   find ./ -name 'LICENSE' -o -name 'COPYING'
+#
+# in the list below. If any of these bother you, you may want to take a
+# closer look at how (or even if) the corresponding code is being used.
+LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
+
+REQUIRED_USE="^^ ( bliss nauty )"
+
+# The "configure" script isn't autotools; it basically exists just to
+# exec some other perl script but using the familiar name.
+BDEPEND="dev-util/ninja
+	dev-lang/perl"
+
+DEPEND="
+	libpolymake? ( dev-lang/perl )
+	dev-libs/boost:=
+	dev-libs/gmp:=
+	dev-libs/libxml2:2=
+	dev-libs/libxslt:=
+	dev-libs/mpfr:=
+	sys-libs/readline:=
+	bliss? ( sci-libs/bliss:=[gmp] )
+	cdd? ( sci-libs/cddlib:= )
+	flint? ( sci-mathematics/flint:= )
+	lrs? ( >=sci-libs/lrslib-051:=[gmp] )
+	nauty? ( sci-mathematics/nauty:= )
+	normaliz? ( >=sci-mathematics/normaliz-3.8:= )
+	ppl? ( dev-libs/ppl:= )
+	singular? ( sci-mathematics/singular:= )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/TermReadKey
+	dev-perl/XML-SAX
+	dev-perl/XML-Writer"
+
+# Tests observed failing after upgrade to polymake-4.5. No idea if they
+# worked prior to that. Someone who actually understands polymake will
+# have to get these working (at least briefly) before we re-enable them.
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-perl-5.36.patch" )
+
+src_configure() {
+	# Without this, the build system tries to use "the highest possible"
+	# optimization level and will override what's in your CXXFLAGS.
+	export CXXOPT=""
+
+	tc-export CC CXX
+
+	# We need to define BLISS_USE_GMP if bliss was built with gmp support.
+	# Therefore we require gmp support on bliss, so that the package
+	# manager can prevent rebuilds with changed gmp flag. Yes, this should
+	# be append-cppflags; but the build system doesn't respect CPPFLAGS.
+	use bliss && append-cxxflags -DBLISS_USE_GMP
+
+	# This isn't an autotools ./configure script, so a lot of things
+	# don't work the way you'd expect. We disable openmp unconditionally
+	# because it's only supposedly only used for building the bundled
+	# libnormaliz (we unbundle it) and for something called to_simplex
+	# that I can't find anywhere in the polymake source.
+	./configure --prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
+		$(usev !libpolymake "--without-callable") \
+		--without-java \
+		--without-javaview \
+		--without-native \
+		--without-scip \
+		--without-soplex \
+		--without-openmp \
+		$(use_with bliss bliss "${EPREFIX}/usr") \
+		$(use_with cdd cdd "${EPREFIX}/usr") \
+		$(use_with flint flint "${EPREFIX}/usr") \
+		$(use_with lrs lrs "${EPREFIX}/usr") \
+		$(use_with nauty nauty "${EPREFIX}/usr") \
+		$(use_with normaliz libnormaliz "${EPREFIX}/usr") \
+		$(use_with ppl ppl "${EPREFIX}/usr") \
+		$(use_with singular singular "${EPREFIX}/usr") \
+		|| die
+}
+
+# There is a backwards-compatible Makefile that would call ninja for us
+# in src_compile/src_install, but it doesn't handle MAKEOPTS correctly.
+src_compile() {
+	eninja -C build/Opt
+}
+
+src_install() {
+	# DESTDIR needs to find its way into the real install script,
+	# support/install.pl.
+	export DESTDIR="${D}"
+	eninja -C build/Opt install
+}
+
+src_test() {
+	perl/polymake --script run_testcases --emacs-style \
+		|| die "test suite failed"
+}
+
+pkg_postinst() {
+	elog "Additional features for polymake are available through external"
+	elog "software such as sci-mathematics/4ti2 and sci-mathematics/topcom."
+	elog "After installing new external software run 'polymake --reconfigure'."
+}
diff --git a/sci-mathematics/primecount/Manifest b/sci-mathematics/primecount/Manifest
index 2f35f77542ca..625ec02d6d42 100644
--- a/sci-mathematics/primecount/Manifest
+++ b/sci-mathematics/primecount/Manifest
@@ -1,3 +1,5 @@
 DIST primecount-7.2.tar.gz 340799 BLAKE2B 5ce3661e322be363e2fe79de1dd134b5c3009269cbb10d36dc69bee4c23c9f41d2117b3ed7aa4c5f852e494832573c84a8d9c37cbe92cf80a5024bdec9b22c69 SHA512 df14929012434eddfab94410ba9165642094327f8abd139a6a1ba87e508bba56df91cb0dc9411e873e90a9aa4aa3ba4007396c930d593f5954be8c715fa26e84
-EBUILD primecount-7.2-r1.ebuild 1162 BLAKE2B 3762ecc48997417bc29d95ce19559dba9f07480c842515193851502d648b7030520c883c9b0fe300491f7dafad58ee42dbdea200a50478dba51d9a745cf633ef SHA512 28c2dd35b0f7ef386fbe93ddf003b571abd43fe52735bf3fe7677ea207e1a874ad486501729fe7e228b487ed90c44df1583378658469a46482e92f7bfcf6b45f
+DIST primecount-7.3.tar.gz 360921 BLAKE2B 0d9ad7c791dba12b05e4c88703dc4bfc1f557a1443c8430f3921f1a6e99b740b437cb53f39e832d69c4148b597960b028e0f38e4f4d96e50434b1d020f4ea620 SHA512 56dcae60460c88368214e01f8e3618e6b61b13f2730bfd1f281721ef71d6136308ba6832e4bd25a1885e2c6142009c5772d6102f82c65e8522e990cb62c55e71
+EBUILD primecount-7.2-r1.ebuild 1277 BLAKE2B 92be849a95a336efd085be960af5ba8b6eceb1176db1e981f0c3f629767553a050e8e77bb966ab70930fc26b2df1ffa92537d1a2fcaebaa02221f68d7de6a656 SHA512 a7b515467366778defc734ae31fdea8cf32e2218ab85aa80f6bbbd082e9ff24056b3e9b01d232dbf76f4565c139f3f85f65ac6842dc8d9cae8cc08c9aa2bfcfc
+EBUILD primecount-7.3.ebuild 1278 BLAKE2B 6426ba4758d2551012983af953ca5235726d8d5c7b1c95fa9e2a7a1179077836a9fbe13a931308dcd17e20a6ebff1cbca9b8d1992217b01680d86cbd4795fb3b SHA512 0758650223b753382d87ce94943bfa152fc6f530cbe3870b8811e325075512ffda8e955e606430074f9c0d89064645c81e8b4114e2e1e3a9b4b21525387f39e5
 MISC metadata.xml 674 BLAKE2B 2d8321166afee1e9d0a20723ae6849f17a7ef0d5d474dc3ec0b1650519b197ad5b1360641faa6985a60121501741a137812b8bcf03cd708766278a1b014615f7 SHA512 7a4fa0c1cae4880bdc230065c98ec46dfb5f1b1adae6ffa5eac275f6f04f38ce0c24042e62f5aac6117f9f816890244daec8fb1c920ec4b6a0a124385e5d7e33
diff --git a/sci-mathematics/primecount/primecount-7.2-r1.ebuild b/sci-mathematics/primecount/primecount-7.2-r1.ebuild
index f84b7b7ea831..617ab1e08c27 100644
--- a/sci-mathematics/primecount/primecount-7.2-r1.ebuild
+++ b/sci-mathematics/primecount/primecount-7.2-r1.ebuild
@@ -8,6 +8,7 @@ inherit cmake toolchain-funcs
 DESCRIPTION="Highly optimized CLI and library to count primes"
 HOMEPAGE="https://github.com/kimwalisch/primecount"
 SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD-2"
 SLOT="0/7"  # subslot is first component of libprimecount.so version
 KEYWORDS="amd64"
@@ -32,7 +33,11 @@ DOCS=(
 )
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-mathematics/primecount/primecount-7.3.ebuild b/sci-mathematics/primecount/primecount-7.3.ebuild
new file mode 100644
index 000000000000..eb88741f1621
--- /dev/null
+++ b/sci-mathematics/primecount/primecount-7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Highly optimized CLI and library to count primes"
+HOMEPAGE="https://github.com/kimwalisch/primecount"
+SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/7"  # subslot is first component of libprimecount.so version
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_popcnt +executable openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sci-mathematics/primesieve:="
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	ChangeLog
+	README.md
+	doc/Credits.md
+	doc/Easy-Special-Leaves.md
+	doc/Hard-Special-Leaves.md
+	doc/Records.md
+	doc/References.md
+	doc/alpha-factor-dr.pdf
+	doc/alpha-factor-gourdon.pdf
+	doc/alpha-factor-lmo.pdf
+	doc/libprimecount.md
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIBPRIMESIEVE="OFF"
+		-DBUILD_PRIMECOUNT="$(usex executable)"
+		-DBUILD_STATIC_LIBS="OFF"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_POPCNT="$(usex cpu_flags_x86_popcnt)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/primesieve/Manifest b/sci-mathematics/primesieve/Manifest
index 1d97ee491364..ace9355fbf0b 100644
--- a/sci-mathematics/primesieve/Manifest
+++ b/sci-mathematics/primesieve/Manifest
@@ -1,3 +1,5 @@
 DIST primesieve-7.7.tar.gz 101558 BLAKE2B cfaa91ddcf661e265d403f8a93461fe297ac48db843b096d0dd7828c4e3d11cdba60cb102197248359c79950fe2ac66c8e9295ab17b0d6bd0eed5a6260c7d115 SHA512 bbcc141a12afdf54386d2408e067b1c6af2dd9b5c9f44d71290269ddefc7c46ba6794064cde6728c8356724553cb6bc2e765bf18c24a18b6d5d1f472d2c6e6dd
+DIST primesieve-7.9.tar.gz 111361 BLAKE2B 8e227bd04a89dd5e8ea5dc5e79afa1c5254216863086fd6c3712fb45767ee7e5e23e72d166ada17295e56479e0c0e1ae7f215b72e124e5234a79fb20f340cb3f SHA512 fcfc3445e5becd555b66743f6d73dd4a0cbb48b1d4a3d0d22043261f1861e0631bdeb8702b1f942110f8b327a01173b231accd1f7595600308709832bbbafc06
 EBUILD primesieve-7.7.ebuild 1046 BLAKE2B 503fcab0c41dd30a22ad076b8e6404d24ca37a4c765a8059ffdbc91a48bfb87ff646779327a447b5cfbd96e1f5a9d88d50fda2ee0a1bf82ad4e12516d699f460 SHA512 e6038d77db1f87bc5c413a6e2c1a7ba689ec9920a579befcced2575379b808c0a60262b8ce2d130936e3d8a04df8d0fa6ee66ca2c74ea65f02fb53de37d704f3
+EBUILD primesieve-7.9.ebuild 1047 BLAKE2B 314c50fba490ce902b2fb4471068fb78db55ee04195565e40cf11452bd41332a908553965cb1ccebeed9fcee56b33d93060482f37cd106117b2315c2d61dc7f1 SHA512 0aa1eed9f2376c0f2e35744b983f7638e95ee9dc74ea92aa783c780cb30923c0f97330cb9ac90b92a29415e0a9ff9ee661ff05a8998a2144671df5256bbc52aa
 MISC metadata.xml 672 BLAKE2B e580c88061b6dcece5a34fde2cd13ce8c55264f3bac16fe3af6374df92d6280993452ebeea3d8446d9f8afcf7c1cb6927405c40e82a1c01a153d5060c77392fd SHA512 8ad3dd50c172ad3333d30a01b0e7ddb8f0f96b7666b61a0c6a1644e92abc49fa75f4f54c4c88eb72c2c8c7104d5e720d852bc7319fbc1a9569fcc5de85529b02
diff --git a/sci-mathematics/primesieve/primesieve-7.9.ebuild b/sci-mathematics/primesieve/primesieve-7.9.ebuild
new file mode 100644
index 000000000000..7502f3600271
--- /dev/null
+++ b/sci-mathematics/primesieve/primesieve-7.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="CLI and library for quickly generating prime numbers"
+HOMEPAGE="https://github.com/kimwalisch/primesieve"
+SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/9"  # subslot is first component of libprimesieve.so version
+KEYWORDS="~amd64"
+IUSE="doc +executable test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz )"
+DEPEND=""
+RDEPEND=""
+
+DOCS=(
+	ChangeLog
+	README.md
+	doc/ALGORITHMS.md
+	doc/CPP_Examples.md
+	doc/C_Examples.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC="$(usex doc)"
+		-DBUILD_PRIMESIEVE="$(usex executable)"
+		-DBUILD_STATIC_LIBS="OFF"
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	if use doc; then
+		DOCS+=(
+			"${BUILD_DIR}/doc/html"
+			"${BUILD_DIR}/doc/latex/refman.pdf"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 155912da44a7..cbe4eb647ae5 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,13 +1,7 @@
 AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
-AUX pspp-1.2.0-CVE-2018-20230.patch 4896 BLAKE2B efd7e53d2632a6214ef6be4888c1172b365637afe5ad8740a2dab7b461f170505f8cca37a86c94f08a8b2f2eb9be8113829ea6165003a9809a02e044e804cba2 SHA512 fa689231dd764d0b65338967264dad1e3ec8c8e14f5f6594963c2e154f7d6d2dc4b09952dacd00c75a220cd0ca27061702d66cf1c52a259d54a310ce0243440c
-AUX pspp-1.2.0-CVE-2019-9211.patch 2534 BLAKE2B 5e1e62c322fb3fcc92dd0e7d709325f0d9c7beed05f472bb3107a0d8f8076e669e1b8dc76040dfe3e865e2646909f633757935083431e59c2f4936728444db9a SHA512 96efe84da4e78a2d4530b50ffb6d3bf399ddc8d13ea63afab250f4357ccde0e6de723945848b9c9da0f17bc07861e671e57afd45c38d19928104dd1656a3a2b5
-AUX pspp-1.2.0-fix-gcc10.patch 972 BLAKE2B ae8472cfdefa9bccc97b4872d3435377323bcec0508044b2e69b49f32c7318c0a0b7465cc3de3d1791bd5d97acccb9a4d3f6c0cb456ce564819b0ce34fcfbd88 SHA512 2e4da6e091837436cf5071494d23eb8441ba038b79e59c6ca5c8d52247e5c30155157e0bafd8bb834a15aa4c140e95e8cd71a56e91f8d0aa77f79d9d4487726c
-AUX pspp-1.2.0-fix-overflow.patch 1136 BLAKE2B 0cf7f1039d003a4072ea47ab0f9dc55ecc3d350cb37180fa473095b7cd317d32771bcdf39715244307bcd0ef4a4c0a7658101cdedccf63f430872de49810c47e SHA512 4671bed9fad63dea2597fff97473bc5c4352eacfa7f39bbfd4c0782862a51a286c87d64c999805ad51b4faec15c3367d57bff26990e92c2b873afa9ed9d3a179
-AUX pspp-1.2.0-fix-segfaults.patch 1452 BLAKE2B a5760dfc45149526a67829ec38b0d78208bea982108a29f18742c8b1e3895b0f8e8f960d5789b4962ab60cdbbf301c2476ef158f758357cded65a17680405529 SHA512 c57e01b714ee8daf031beef0f670ff892d844834a53e55e1c326293c49efa7b51ffa6cbbbe3c6bde37a91e342261dcfaf1448839fe3280bab8b104f97c63a5af
-AUX pspp-1.2.0-fix-tests.patch 2217 BLAKE2B 20a2ca51c7bb792ec66281e2c6d10ca1345d5565b62696cf8a40051eacb43456242aa13d566224ee68267650209501d16c87dd57524a4b1386e68c96404159d7 SHA512 742b6acd7611dfce2eab9e246084528e4b80b0ef9f8713f4233f7c8c000c9772c8f62df1ad83cd5adfef2c5fc213fa75f6b2950ce3e9d61786353df034925e74
-AUX pspp-1.2.0-py3.patch 1619 BLAKE2B 5bb9264f5e064860380c79c64641c31f09bb171ff39a188eaab5b8d1fe21a8243b1c72ff77e82447af05db63434a53bfa9cede60f08330cf470c8c70ebfa3cdd SHA512 a7a189fd7e7e0209b50ac655449d59888a5b2bad74b8b76e843916f47c9ca4405362af80fced7291af4b446f070c534f6688662fae6e2f03b2c6e6e0ea18c362
-DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
-DIST pspp-1.4.1.tar.gz 7848393 BLAKE2B c9232aa3d4905d4be54ae993db6a4b37b3696c748e15c8ba6c46c7e56f9974aefe597f893fdc5431af237ad3923da1ef271db39e4d94725ccf93f0a0df443ef4 SHA512 c664a6c6f4f1826db396ad776d81cadc791e4f661c603a7f164f70f9571a84cfae6fec116356b3f950991245b2b0dc9805e75193a055a242558cda1209e7830f
-EBUILD pspp-1.2.0-r1.ebuild 2307 BLAKE2B bcb43ec5798bce0ba6c35375153f67a652fafa0d7534d182f9f771fdbe11cedceb318753bbb9b323200104c49a8dceaf89e9d0acc774707a80372c669df0cb8a SHA512 13c90965bedb3b18498f79ebd4e785bce6254c25b56a51bdb7f36c58f2c082c9e335f584edd0365c39da43700c59a9b08a489651cc9836ce19684ccfb8e5fb38
-EBUILD pspp-1.4.1.ebuild 1885 BLAKE2B 0094e1923dc639d9e03509b66cf8c8292bf959220f94065f2c0e9c44fda4bc9e9a15e3976cccfef24cf1ef3dad2f254780bdcbba3d7fead2fb8d9c5590de61a5 SHA512 668d3070ac16d94bc999de0ff355e9354bcfc6ce5553b9ac5ea46cb1ff509c9cdba4a40956e65758b284140541a34cd62cc6b14e30686391f664cfd9a6edc270
+AUX pspp-1.6.1-drop-which-tests.patch 875 BLAKE2B 99ac5aa25fc26e6f591ea0772bfd168141858c2136295dcd7253dc9a46eb8412110c6fe4c8ff3752bcbb2a43c834724e23fda4fa31c075ef3716cccdc3262680 SHA512 2f9e9049ddd91f8863de52c097a1f35aefa4dc04dc3dc6cf6be8522a97ec56af352edc34123fd4272030b1d865b451accb6fdf8efaab928a8c83cffad7d585e1
+DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
+DIST pspp-1.6.1.tar.gz 9249022 BLAKE2B 306596cd428436df7f97dec627dbad6a089ff0b00b59b8152dac382a091687f4a82afd0ada7c98dea5bbc0369f0e07f1a85dcdbd84a21bfe09cbee9b43b02610 SHA512 29b475393cbe594bc93af681ec9414e56bdd664a29042017025b8f52e4e67eec1bfab638e79313a5a39929873d1d3a29095c33dbcdf40e226cc3e6010bb040a7
+EBUILD pspp-1.6.0.ebuild 1682 BLAKE2B 8d60867a775e2edcf50999c14503208138d9c5f19074c7baaf68d4ef18ccb6abfd17360b77e0a582c8664087e5652453f6237f05a6ff53dbfd5673fd218dd3a7 SHA512 63aaca9e0197a9b5e48739f871e186047fde79ab612ed41bd6407d4048906ead5a4214a49ee23e527598a1066ead30835506c23cd1fc1f6baab8d11b40442c12
+EBUILD pspp-1.6.1.ebuild 1868 BLAKE2B 05b596863fd00b004718711ead00d28ae2ef8c5af39286aff656a09509b33e4b4b55daae83d75d03421b27a4dde7cbe17a10a41c09a507e45aeb9a9a38d164ed SHA512 5cf3e9d3d28f56c13d51aa01c292c5c90026f5192b024a9bf890c391a4c2e945ffc5f8fdd310aa14c69dc8788c3d2c6452b4ed30adcc483dd79f300b65eede86
 MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
deleted file mode 100644
index f0fee070deb6..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=abd1f816ca3b4f382bddf4564ad092aa934f0ccc
-Bug: https://bugs.gentoo.org/679392
-
-From abd1f816ca3b4f382bddf4564ad092aa934f0ccc Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Tue, 1 Jan 2019 08:36:05 -0800
-Subject: pspp-dump-sav: Issue error message for too-large extension records.
-
-CVE-2018-20230.
----
- NEWS                      |  2 ++
- utilities/pspp-dump-sav.c | 30 ++++++++++++++++++------------
- 2 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 3263062ca..191a9804b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,6 +9,8 @@ Changes since 1.2.0:
-  * Plain text output is no longer divided into pages, since it is now
-    rarely printed on paper.
- 
-+ * Bug fix for CVE-2018-20230.
-+
- Changes from 1.0.1 to 1.2.0:
- 
-  * New experimental command SAVE DATA COLLECTION to save MDD files.
-diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
-index aeb648665..b0001ac61 100644
---- a/utilities/pspp-dump-sav.c
-+++ b/utilities/pspp-dump-sav.c
-@@ -37,6 +37,7 @@
- #include "gl/progname.h"
- #include "gl/version-etc.h"
- #include "gl/xalloc.h"
-+#include "gl/xsize.h"
- 
- #define ID_MAX_LEN 64
- 
-@@ -99,7 +100,7 @@ static void read_simple_compressed_data (struct sfm_reader *, int max_cases);
- static void read_zlib_compressed_data (struct sfm_reader *);
- 
- static struct text_record *open_text_record (
--  struct sfm_reader *, size_t size);
-+  struct sfm_reader *, size_t size, size_t count);
- static void close_text_record (struct text_record *);
- static bool read_variable_to_value_pair (struct text_record *,
-                                          char **key, char **value);
-@@ -735,7 +736,7 @@ read_extra_product_info (struct sfm_reader *r,
-   const char *s;
- 
-   printf ("%08llx: extra product info\n", (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   s = text_get_all (text);
-   print_string (s, strlen (s));
-   close_text_record (text);
-@@ -749,7 +750,7 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count)
- 
-   printf ("%08llx: multiple response sets\n",
-           (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   for (;;)
-     {
-       const char *name;
-@@ -909,7 +910,7 @@ read_long_var_name_map (struct sfm_reader *r, size_t size, size_t count)
- 
-   printf ("%08llx: long variable names (short => long)\n",
-           (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   while (read_variable_to_value_pair (text, &var, &long_name))
-     printf ("\t%s => %s\n", var, long_name);
-   close_text_record (text);
-@@ -926,7 +927,7 @@ read_long_string_map (struct sfm_reader *r, size_t size, size_t count)
- 
-   printf ("%08llx: very long strings (variable => length)\n",
-           (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   while (read_variable_to_value_pair (text, &var, &length_s))
-     printf ("\t%s => %d\n", var, atoi (length_s));
-   close_text_record (text);
-@@ -1004,7 +1005,7 @@ read_datafile_attributes (struct sfm_reader *r, size_t size, size_t count)
-   struct text_record *text;
- 
-   printf ("%08llx: datafile attributes\n", (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   read_attributes (r, text, "datafile");
-   close_text_record (text);
- }
-@@ -1196,7 +1197,7 @@ read_variable_attributes (struct sfm_reader *r, size_t size, size_t count)
-   struct text_record *text;
- 
-   printf ("%08llx: variable attributes\n", (long long int) ftello (r->file));
--  text = open_text_record (r, size * count);
-+  text = open_text_record (r, size, count);
-   for (;;)
-     {
-       const char *variable = text_tokenize (text, ':');
-@@ -1389,18 +1390,23 @@ struct text_record
-     size_t pos;                 /* Current position in buffer. */
-   };
- 
--/* Reads SIZE bytes into a text record for R,
-+/* Reads SIZE * COUNT bytes into a text record for R,
-    and returns the new text record. */
- static struct text_record *
--open_text_record (struct sfm_reader *r, size_t size)
-+open_text_record (struct sfm_reader *r, size_t size, size_t count)
- {
-   struct text_record *text = xmalloc (sizeof *text);
--  char *buffer = xmalloc (size + 1);
--  read_bytes (r, buffer, size);
-+
-+  if (size_overflow_p (xsum (1, xtimes (size, count))))
-+    sys_error (r, "Extension record too large.");
-+
-+  size_t n_bytes = size * count;
-+  char *buffer = xmalloc (n_bytes + 1);
-+  read_bytes (r, buffer, n_bytes);
-   buffer[size] = '\0';
-   text->reader = r;
-   text->buffer = buffer;
--  text->size = size;
-+  text->size = n_bytes;
-   text->pos = 0;
-   return text;
- }
--- 
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
deleted file mode 100644
index eb0b84414e88..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Source: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=0b842a84353790534a401e09a8d3bdd3d25bc3a6
-Bug: https://bugs.gentoo.org/679392
-
-From 0b842a84353790534a401e09a8d3bdd3d25bc3a6 Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Wed, 27 Feb 2019 20:11:06 -0800
-Subject: sys-file-writer: Remove assertions based on file position.
-
-These assertions can fail if the underlying file is not a regular file,
-e.g. if it is a device such as /dev/null.
-
-CVE-2019-9211.
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1683499.
-See also https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9211.
-See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923417.
----
- src/data/sys-file-writer.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
-index df5108e2a..bbe58aecd 100644
---- a/src/data/sys-file-writer.c
-+++ b/src/data/sys-file-writer.c
-@@ -953,7 +953,6 @@ write_long_string_value_labels (struct sfm_writer *w,
-   const char *encoding = dict_get_encoding (dict);
-   size_t n_vars = dict_get_var_cnt (dict);
-   size_t size, i;
--  off_t start UNUSED;
- 
-   /* Figure out the size in advance. */
-   size = 0;
-@@ -985,7 +984,6 @@ write_long_string_value_labels (struct sfm_writer *w,
-   write_int (w, 1);             /* Data item (byte) size. */
-   write_int (w, size);          /* Number of data items. */
- 
--  start = ftello (w->file);
-   for (i = 0; i < n_vars; i++)
-     {
-       struct variable *var = dict_get_var (dict, i);
-@@ -1022,7 +1020,6 @@ write_long_string_value_labels (struct sfm_writer *w,
-           free (label);
-         }
-     }
--  assert (ftello (w->file) == start + size);
- }
- 
- static void
-@@ -1032,7 +1029,6 @@ write_long_string_missing_values (struct sfm_writer *w,
-   const char *encoding = dict_get_encoding (dict);
-   size_t n_vars = dict_get_var_cnt (dict);
-   size_t size, i;
--  off_t start UNUSED;
- 
-   /* Figure out the size in advance. */
-   size = 0;
-@@ -1058,7 +1054,6 @@ write_long_string_missing_values (struct sfm_writer *w,
-   write_int (w, 1);             /* Data item (byte) size. */
-   write_int (w, size);          /* Number of data items. */
- 
--  start = ftello (w->file);
-   for (i = 0; i < n_vars; i++)
-     {
-       struct variable *var = dict_get_var (dict, i);
-@@ -1087,7 +1082,6 @@ write_long_string_missing_values (struct sfm_writer *w,
-           write_bytes (w, value_str (value, width), 8);
-         }
-     }
--  assert (ftello (w->file) == start + size);
- }
- 
- static void
--- 
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
deleted file mode 100644
index d228ccc42596..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
-Gentoo Bug: https://bugs.gentoo.org/708548
-
-commit 614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date:   Fri Nov 16 20:27:30 2018 -0800
-
-    psppire: Fix multiple definitions of align_enum_type and two others.
-    
-    These were defined in both psppire-dict.c and widgets.c, which causes a
-    problem building with -fno-common (which is desirable because it allows
-    Address Sanitizer to work better).
-
-diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
-index 26a5dac4f..6ce129249 100644
---- a/src/ui/gui/widgets.c
-+++ b/src/ui/gui/widgets.c
-@@ -171,9 +171,9 @@ enum_to_string (const GValue *src, GValue *dest)
- 
- 
- 
--GType align_enum_type;
--GType measure_enum_type;
--GType role_enum_type;
-+extern GType align_enum_type;
-+extern GType measure_enum_type;
-+extern GType role_enum_type;
- 
- 
- extern const GEnumValue align[];
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
deleted file mode 100644
index 8c31c5f87020..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=be42ce976006feed2a7ba7599ee417c28887af52
-
-From be42ce976006feed2a7ba7599ee417c28887af52 Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Fri, 22 Feb 2019 17:16:40 -0800
-Subject: pspp-dump-sav; Fix write past end of buffer in corner case.
-
-If count == 0 and size > 0, then n_bytes is 0, buffer is a 1-byte
-allocation, and the assignment to buffer[size] would write to buffer[1]
-(or past it), which is past the end of the allocation.
-
-Found by Address Sanitizer.
----
- utilities/pspp-dump-sav.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
-index 1d8d78c87..70687ebc8 100644
---- a/utilities/pspp-dump-sav.c
-+++ b/utilities/pspp-dump-sav.c
-@@ -1403,7 +1403,7 @@ open_text_record (struct sfm_reader *r, size_t size, size_t count)
-   size_t n_bytes = size * count;
-   char *buffer = xmalloc (n_bytes + 1);
-   read_bytes (r, buffer, n_bytes);
--  buffer[size] = '\0';
-+  buffer[n_bytes] = '\0';
-   text->reader = r;
-   text->buffer = buffer;
-   text->size = n_bytes;
--- 
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
deleted file mode 100644
index 03b9d00fe73a..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0
-
-From df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0 Mon Sep 17 00:00:00 2001
-From: John Darrington <john@darrington.wattle.id.au>
-Date: Sat, 2 Mar 2019 15:29:39 +0100
-Subject: PSPPIRE: Avoid some segmentation faults when corrupt data is
- encountered.
-
----
- src/ui/gui/psppire-data-store.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
-index f97b8eaf1..3c2765f5d 100644
---- a/src/ui/gui/psppire-data-store.c
-+++ b/src/ui/gui/psppire-data-store.c
-@@ -183,6 +183,8 @@ psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gi
-   g_return_val_if_fail (variable, g_strdup ("???"));
- 
-   GVariant *vrnt = g_value_get_variant (v);
-+  g_return_val_if_fail (vrnt, g_strdup ("???"));
-+
-   union value val;
-   value_variant_get (&val, vrnt);
- 
-@@ -231,12 +233,14 @@ __get_value (GtkTreeModel *tree_model,
-   if (NULL == variable)
-     return;
- 
--  g_value_init (value, G_TYPE_VARIANT);
--
-   gint row = GPOINTER_TO_INT (iter->user_data);
- 
-   struct ccase *cc = datasheet_get_row (store->datasheet, row);
- 
-+  g_return_if_fail (cc);
-+
-+  g_value_init (value, G_TYPE_VARIANT);
-+
-   const union value *val = case_data_idx (cc, var_get_case_index (variable));
- 
-   GVariant *vv = value_variant_new (val, var_get_width (variable));
--- 
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
deleted file mode 100644
index 1b92572cc820..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=fe94912b9c8682c4666873b84c83cda88f4c135d
-
-commit fe94912b9c8682c4666873b84c83cda88f4c135d
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date:   Mon Nov 26 06:54:52 2018 -0800
-
-    segment: Fix behavior when #! line is not new-line terminated.
-    
-    The code here is supposed to maintain a invariant that, when it returns a
-    nonnegative value, it initializes *type, but it failed to do that when a
-    #! line did not end in a new-line.  This fixes the problem.
-    
-    Bug #55101.
-    Thanks for Friedrich Beckmann for narrowing down the problem.
-    Found by the Debian buildd: https://buildd.debian.org/status/fetch.php?pkg=pspp&arch=arm64&ver=1.2.0-1&stamp=1543183214&raw=0
-
-diff --git a/src/language/lexer/segment.c b/src/language/lexer/segment.c
-index c0a09973c..c607c4bd1 100644
---- a/src/language/lexer/segment.c
-+++ b/src/language/lexer/segment.c
-@@ -92,21 +92,26 @@ segmenter_parse_shbang__ (struct segmenter *s, const char *input, size_t n,
-         {
-           if (input[1] == '!')
-             {
--              int ofs;
--
--              for (ofs = 2; ofs < n; ofs++)
--                if (input[ofs] == '\n')
--                  {
--                    if (input[ofs] == '\n' && input[ofs - 1] == '\r')
--                      ofs--;
--
--                    s->state = S_GENERAL;
--                    s->substate = SS_START_OF_COMMAND;
--                    *type = SEG_SHBANG;
--                    return ofs;
--                  }
-+              for (int ofs = 2; ; ofs++)
-+                {
-+                  if (ofs >= n)
-+                    {
-+                      if (!eof)
-+                        return -1;
-+                    }
-+                  else if (input[ofs] == '\n')
-+                    {
-+                      if (input[ofs - 1] == '\r')
-+                        ofs--;
-+                    }
-+                  else
-+                    continue;
- 
--              return eof ? ofs : -1;
-+                  s->state = S_GENERAL;
-+                  s->substate = SS_START_OF_COMMAND;
-+                  *type = SEG_SHBANG;
-+                  return ofs;
-+                }
-             }
-         }
-       else if (!eof)
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch b/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
deleted file mode 100644
index d2bf940eae64..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=123c3f55a80630655e84f97c9df558d988fa0055
-
-commit 123c3f55a80630655e84f97c9df558d988fa0055
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date:   Mon Nov 19 08:35:23 2018 -0800
-
-    test-date-input.py: Make compatible with Python 3.
-
-diff --git a/tests/data/test-date-input.py b/tests/data/test-date-input.py
-index 6ccc2f8f4..cdab260d6 100644
---- a/tests/data/test-date-input.py
-+++ b/tests/data/test-date-input.py
-@@ -50,8 +50,8 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
-         global n
-         n += 1
-         year, month, day, julian, hour, minute, second = date
--        quarter = (month - 1) / 3 + 1
--        week = (julian - 1) / 7 + 1
-+        quarter = (month - 1) // 3 + 1
-+        week = (julian - 1) // 7 + 1
-         if year >= 1930 and year < 2030:
-             years = ('%d' % year, '%d' % (year % 100))
-         else:
-@@ -163,10 +163,10 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
-         EPOCH = -577734         # 14 Oct 1582
-         expected = (EPOCH - 1
-                     + 365 * (exp_y - 1)
--                    + (exp_y - 1) / 4
--                    - (exp_y - 1) / 100
--                    + (exp_y - 1) / 400
--                    + (367 * exp_m - 362) / 12
-+                    + (exp_y - 1) // 4
-+                    - (exp_y - 1) // 100
-+                    + (exp_y - 1) // 400
-+                    + (367 * exp_m - 362) // 12
-                     + (0 if exp_m <= 2
-                        else -1 if exp_m >= 2 and is_leap_year(exp_y)
-                        else -2)
diff --git a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
new file mode 100644
index 000000000000..5303df4dc2e6
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
@@ -0,0 +1,28 @@
+https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=f0ac9253e8b84691cec17fc80422993949a91cc1
+
+From f0ac9253e8b84691cec17fc80422993949a91cc1 Mon Sep 17 00:00:00 2001
+From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
+Date: Sun, 26 Jun 2022 09:07:18 +0200
+Subject: tests/atlocal.in - switched from which to command -v
+
+Sam James reported a possible future build problem due to the
+usage of the "which" command:
+
+https://savannah.gnu.org/bugs/?62675
+
+I replace "which" with "command -v" as proposed. Thanks for your
+support.
+
+Closes: 62675
+--- a/tests/atlocal.in
++++ b/tests/atlocal.in
+@@ -71,7 +71,7 @@ alias pspp='pspp --no-statrc'
+ # Avoids error messages during tests if $TERM is set to an unknown terminal.
+ TERM=; unset TERM
+ 
+-pspp_diff=`which diff`
++pspp_diff=`command -v diff`
+ if test X"$RUNNER" = Xwine; then
+     diff () {
+         $pspp_diff -w  "$@"
+cgit v1.1
diff --git a/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild b/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
deleted file mode 100644
index 24268f0ab119..000000000000
--- a/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit elisp-common python-any-r1 xdg-utils
-
-DESCRIPTION="Program for statistical analysis of sampled data"
-HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc emacs examples gtk ncurses nls perl postgres test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( cairo )"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	sci-libs/gsl:0=
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libiconv
-	cairo? (
-		x11-libs/cairo[svg]
-		x11-libs/pango
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/gtksourceview:3.0=
-		x11-libs/spread-sheet-widget
-		cairo? ( dev-util/glib-utils )
-	)
-	postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2018-20230.patch
-	"${FILESDIR}"/${P}-CVE-2019-9211.patch
-	"${FILESDIR}"/${P}-fix-overflow.patch
-	"${FILESDIR}"/${P}-fix-segfaults.patch
-	"${FILESDIR}"/${P}-fix-gcc10.patch
-	"${FILESDIR}"/${P}-py3.patch
-	"${FILESDIR}"/${P}-fix-tests.patch
-)
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable nls) \
-		$(use_with cairo) \
-		$(use_with gtk gui) \
-		$(use_with perl perl-module) \
-		$(use_with postgres libpq)
-}
-
-src_compile() {
-	default
-	if use doc; then
-		emake html pdf
-		HTML_DOCS=( doc/pspp{,-dev}.html )
-	fi
-	use emacs && elisp-compile *.el
-}
-
-src_install() {
-	default
-
-	use doc && dodoc doc/pspp{,-dev}.pdf
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pspp/pspp-1.6.0.ebuild b/sci-mathematics/pspp/pspp-1.6.0.ebuild
new file mode 100644
index 000000000000..886cf3d5f542
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gtk ncurses nls perl postgres"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	sci-libs/gsl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libiconv
+	x11-libs/cairo[svg]
+	x11-libs/pango
+	gtk? (
+		dev-util/glib-utils
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:4=
+		>=x11-libs/spread-sheet-widget-0.7
+	)
+	postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+
+pkg_pretend() {
+	ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
+	ewarn "shipped with pspp itself, and should instead be fetched from ELPA:"
+	ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gui) \
+		$(use_with perl perl-module) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake html pdf
+		HTML_DOCS=( doc/pspp{,-dev}.html )
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/pspp{,-dev}.pdf
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-mathematics/pspp/pspp-1.4.1.ebuild b/sci-mathematics/pspp/pspp-1.6.1.ebuild
index 06b745ac8406..befeed9034a2 100644
--- a/sci-mathematics/pspp/pspp-1.4.1.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1 xdg
 
@@ -14,9 +14,9 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc examples gtk ncurses nls perl postgres test"
+# Note: can drop test infra + which dep in next release!
+IUSE="doc examples gtk ncurses nls perl postgres test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( cairo )"
 
 RDEPEND="
 	dev-libs/libxml2:2
@@ -26,23 +26,23 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	virtual/libiconv
-	cairo? (
-		x11-libs/cairo[svg]
-		x11-libs/pango
-	)
+	x11-libs/cairo[svg]
+	x11-libs/pango
 	gtk? (
+		dev-util/glib-utils
 		x11-libs/gtk+:3
-		x11-libs/gtksourceview:3.0=
-		>=x11-libs/spread-sheet-widget-0.6
-		cairo? ( dev-util/glib-utils )
+		x11-libs/gtksourceview:4=
+		>=x11-libs/spread-sheet-widget-0.7
 	)
 	postgres? ( dev-db/postgresql:=[server] )"
 DEPEND="${RDEPEND}"
+# which dep for tests: https://savannah.gnu.org/bugs/index.php?62675
 BDEPEND="
+	${PYTHON_DEPS}
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( virtual/latex-base )
-	test? ( ${PYTHON_DEPS} )"
+	test? ( sys-apps/which )"
 
 pkg_pretend() {
 	ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
@@ -50,20 +50,15 @@ pkg_pretend() {
 	ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
 }
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
+
 	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
 }
 
 src_configure() {
 	econf \
-		--disable-static \
 		$(use_enable nls) \
-		$(use_with cairo) \
 		$(use_with gtk gui) \
 		$(use_with perl perl-module) \
 		$(use_with postgres libpq)
@@ -71,6 +66,7 @@ src_configure() {
 
 src_compile() {
 	default
+
 	if use doc; then
 		emake html pdf
 		HTML_DOCS=( doc/pspp{,-dev}.html )
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 1bcb6366b515..757f720f6c13 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,8 +1,3 @@
-AUX rkward-0.7.2-fix-crash-w-R-4.1.0.patch 3018 BLAKE2B a9d62357819b3c6f0a81f217bb9153483b9524946b0aa38fe4110be6b05c008fc67c68610969c5b4c9aff4e35f3062cc8f5c5452f789d1d29ba01adc80dd43ae SHA512 510bd191a6c9f4ffe2c30fac6af58889fe8fdeb08db37fadd6c20d61f268a6fa412b6248d569b8baaecb095f9a6d330cf2619e2fb22e01d2111a85edeb1b2c78
-AUX rkward-0.7.2-fix-dark-themes.patch 6435 BLAKE2B 9a1ee63898e04cb7147b178c2aedb7fcc0b035dd622197ade838e711aba7d19e9894377c624d4b330b15b010c161271d47fc22ebd660ad42ae053215be3f6031 SHA512 a093deab26f2f2d5284069940b89cd2744c7b9d3b8c4b8eddd9ad2cda1cd5f221db08c30c3bde84f024b3d551307e45ad7383fe597582350b6e1230faea26208
-AUX rkward-0.7.2-fix-eop-tag-in-html.patch 1937 BLAKE2B 3fe2bdd853d370aaa3a52c4cb3f8edb2a93788f932c4af0232e9c9b14b5acf42e8f157f673a4a776fa2b807ee261e2bae4c4751db4a03ec7099a8704bf5ae4da SHA512 9f9cf1377e52009d586869caab1d556998007da6a529d8207e40c62597b6053ca3e98b852d3bfa0e1ede271367ab4811a73a56f4651a551fde4d84b29d3105ff
-AUX rkward-0.7.2-fix-hang-on-exit.patch 1405 BLAKE2B 66655ba68e1f2b09e35b179817f74f6a26aff7e153a9bd9a3beff2bc48ccaf70793a15f96616f38101b6d103103787d723f18b22d6b300f4a46b01dc501efbb4 SHA512 af893064c7999e10e3672818e5803740b345d0e8bfb396306eb29ac04a8a44879e8a90ecfab22a51b807a00d0975c420651e6654b0b86dae9bd35e9f66bd03bf
-AUX rkward-0.7.2-fix-hidpi.patch 809 BLAKE2B f855f8de2e4fcf0ff70676a3f0b0684c2d1d4a5a85a9946824522c9b40afb8d3c233fc9d0c65a5b50a3969b4984bd314024e525464ae0fa67bb2a8c2c9975958 SHA512 4d856bae8ab9397f9efaf5ce581466ef5a6735d67b5348114f12a3446f09148e966c4562e657b872d37a0d4d1d35cd402d91372731bfc20266ef5d84fc8d5d0e
-DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d
-EBUILD rkward-0.7.2-r1.ebuild 1668 BLAKE2B f0167baabfa4c85bec0f1057eba552577a7e6ce8b3a03f9ca40a8cc21587892a7094c19c103ebd7af03c30ac3ddff5cf63c5b92cb6fad11d2164929a4ef66f76 SHA512 aa9a0e5627ac4b7cd3af3935d9988a6a4b93c6ea2572d442ecd01b367262fd519cb6dec9fa02d7bf8bb1d663810e59acb4a51afe76b0c0b40bc9b8e499d1f995
+DIST rkward-0.7.4.tar.gz 5677112 BLAKE2B 5105103e95285c77d53eeffe3cb98e5945d4be29066c5726cd76307c70176cd44eb878d0459257de2f0efb756ecc880343226ce7060bc0866f65f8a3f7f3ea96 SHA512 64a5a42e7b36af410738bdaf19c9bb2e0f7f99816a49dd37be1a1748d925665728ba9feb1977e62f2e710e0e63bc6085c1e957ad0f1feaba58baf22efa4f708b
+EBUILD rkward-0.7.4.ebuild 1419 BLAKE2B 91ab4906138bf57dc3f5f8ad3b204a0b7d8d837c31fee423eafbd172bcd6e6fd973b5f9a2cde04d2d328b9027c8c84442c6e8420270098c631fb86707754c038 SHA512 3db305b798696092589bc22db0ac48a537f6a58bf05a605f926b248f90552a42b8188319f51bba9eb126626959747d00d65b40f0fb181225f1e9e9aeedd59cc5
 MISC metadata.xml 448 BLAKE2B c43701b135281f800da40813b11df123d5088bfa0beb3e0700ba354e991ec18aac267dc0a0f3d206bdd06eef5d50f78378a107f05d1f01d17b0d409e632066de SHA512 b9b3c376714fc5c81008caed25794d262d2d60cafbd3fcdccfeccdf9666b16dbb09f1d06025526c8304c640e150492b685df95f200002e8ef41aed609b0893a8
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch
deleted file mode 100644
index 2cc50575672b..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 157207b915647cd8600c616cf6dfed8f83ecff30 Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@kdemail.net>
-Date: Sat, 26 Jun 2021 22:16:22 +0200
-Subject: [PATCH] Add dummies for the new R graphics functions to avoid crash.
-
-This is not a proper implementation, yet.
-
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=438993
----
- ChangeLog                                     |  3 ++
- .../rkwarddevice/rkgraphicsdevice_setup.cpp   | 15 +++++++-
- .../rkwarddevice/rkgraphicsdevice_stubs.cpp   | 36 +++++++++++++++++++
- 3 files changed, 53 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 0210df6e..ae17bc62 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+--- Version 0.7.2b - UNRELEASED
-+- Fixed: Crash when attempting to use new graphics features in R 4.1.0 (esp. plotting using ggplot2)
-+
- --- Version 0.7.2 - Oct-16-2020
- - Script preview keeps vertical scroll position when updating
- - Python development scripts have been ported to python3
-diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
-index 9909639f..e215c090 100644
---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
-+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
-@@ -216,6 +216,19 @@ bool RKGraphicsDeviceDesc::init (pDevDesc dev, double pointsize, const QStringLi
- #endif
- 	dev->newFrameConfirm = RKD_NewFrameConfirm;
- 
-+#if R_VERSION >= R_Version (2, 14, 0)
-+	dev->holdflush = RKD_HoldFlush;
-+#endif
-+
-+#if R_VERSION >= R_Version (4, 1, 0)
-+	dev->setPattern = RKD_SetPattern;
-+	dev->releasePattern = RKD_ReleasePattern;
-+	dev->setClipPath = RKD_SetClipPath;
-+	dev->releaseClipPath = RKD_ReleaseClipPath;
-+	dev->setMask = RKD_SetMask;
-+	dev->releaseMask = RKD_ReleaseMask;
-+	dev->deviceVersion = 14;
-+	dev->deviceClip = FALSE; // for now
-+#endif
- 	return true;
- }
-- 
-diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
-index 716a9511..b7be1609 100644
---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
-+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
-@@ -579,5 +579,41 @@ void RKD_onExit (pDevDesc dev) {
- 	}
- 	dev->gettingEvent = (Rboolean) false;
- }
-+#endif
-+
-+#if R_VERSION >= R_Version (2, 14, 0)
-+int RKD_HoldFlush (pDevDesc dev, int level) {
-+#warning implement me
-+	return 0;
-+}
-+#endif
-+
-+#if R_VERSION >= R_Version (4, 1, 0)
-+SEXP RKD_SetPattern (SEXP pattern, pDevDesc dd) {
-+#warning implement me
-+	return R_NilValue;
-+}
-+
-+void RKD_ReleasePattern (SEXP ref, pDevDesc dd) {
-+#warning implement me
-+}
-+
-+SEXP RKD_SetClipPath (SEXP path, SEXP ref, pDevDesc dd) {
-+#warning implement me
-+	return R_NilValue;
-+}
-+
-+void RKD_ReleaseClipPath (SEXP ref, pDevDesc dd) {
-+#warning implement me
-+}
-+
-+SEXP RKD_SetMask (SEXP path, SEXP ref, pDevDesc dd) {
-+#warning implement me
-+	return R_NilValue;
-+}
-+
-+void RKD_ReleaseMask (SEXP ref, pDevDesc dd) {
-+#warning implement me
-+}
- 
- #endif
--- 
-GitLab
-
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch
deleted file mode 100644
index 005285e281bf..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 5d64b6d23f19f4307fca2d79838bb6e1e38c7f36 Mon Sep 17 00:00:00 2001
-From: Nick Panayioto <npanayioto3@gmail.com>
-Date: Thu, 28 Oct 2021 05:31:00 -0400
-Subject: [PATCH] Change plugin widgets that set their colors to use
- setStyleSheet, then clear the style sheet to restore the default color.
-
-This looks the same on light themes and makes dark themes not use white text on white background.
-
-BUG: 389914
----
- rkward/misc/getfilenamewidget.cpp    | 8 ++------
- rkward/misc/getfilenamewidget.h      | 2 +-
- rkward/misc/rksaveobjectchooser.cpp  | 6 ++----
- rkward/misc/rksaveobjectchooser.h    | 2 +-
- rkward/plugin/rkinput.cpp            | 8 +++-----
- rkward/plugin/rkpluginbrowser.cpp    | 8 ++++----
- rkward/plugin/rkpluginsaveobject.cpp | 4 ++--
- rkward/plugin/rkvarslot.cpp          | 7 +++----
- 8 files changed, 18 insertions(+), 27 deletions(-)
-
-diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp
-index 6b7f1d26..a439b8a4 100644
---- a/rkward/misc/getfilenamewidget.cpp
-+++ b/rkward/misc/getfilenamewidget.cpp
-@@ -137,11 +137,7 @@ QString GetFileNameWidget::getLocation () {
- 	return (edit->url ().url ());
- }
- 
--void GetFileNameWidget::setBackgroundColor (const QColor & color) {
-+void GetFileNameWidget::setStyleSheet (const QString & style) {
- 	RK_TRACE (MISC);
--
--	QPalette palette = edit->lineEdit ()->palette ();
--	palette.setColor (edit->lineEdit ()->backgroundRole (), color);
--	edit->lineEdit ()->setPalette (palette);
-+	edit->setStyleSheet(style);
- }
--
-diff --git a/rkward/misc/getfilenamewidget.h b/rkward/misc/getfilenamewidget.h
-index ecbf1364..71390667 100644
---- a/rkward/misc/getfilenamewidget.h
-+++ b/rkward/misc/getfilenamewidget.h
-@@ -41,7 +41,7 @@ public:
- /** set the filename/location from outside */
- 	void setLocation (const QString &new_location);
- 
--	void setBackgroundColor (const QColor & color);
-+	void setStyleSheet (const QString &style);
- 
- /** retrieves the current location */
- 	QString getLocation ();
-diff --git a/rkward/misc/rksaveobjectchooser.cpp b/rkward/misc/rksaveobjectchooser.cpp
-index 5d53111d..157f6940 100644
---- a/rkward/misc/rksaveobjectchooser.cpp
-+++ b/rkward/misc/rksaveobjectchooser.cpp
-@@ -194,12 +194,10 @@ void RKSaveObjectChooser::updateState () {
- 	}
- }
- 
--void RKSaveObjectChooser::setBackgroundColor (const QColor &color) {
-+void RKSaveObjectChooser::setStyleSheet (const QString &style) {
- 	RK_TRACE (MISC);
- 
--	QPalette palette = name_edit->palette ();
--	palette.setColor (name_edit->backgroundRole (), color);
--	name_edit->setPalette (palette);
-+	name_edit->setStyleSheet(style);
- }
- 
- QString RKSaveObjectChooser::currentBaseName () const {
-diff --git a/rkward/misc/rksaveobjectchooser.h b/rkward/misc/rksaveobjectchooser.h
-index c5da85c8..3cc56a85 100644
---- a/rkward/misc/rksaveobjectchooser.h
-+++ b/rkward/misc/rksaveobjectchooser.h
-@@ -37,7 +37,7 @@ public:
- 	QString currentBaseName () const;
- 	bool isOk () const;
- 	void setBaseName (const QString &name);
--	void setBackgroundColor (const QColor &color);
-+	void setStyleSheet (const QString &style);
- 	RObject* rootObject () const { return root_object; };
- 	void setRootObject (RObject* new_root);
- private slots:
-diff --git a/rkward/plugin/rkinput.cpp b/rkward/plugin/rkinput.cpp
-index fdbab36a..a1a03ebd 100644
---- a/rkward/plugin/rkinput.cpp
-+++ b/rkward/plugin/rkinput.cpp
-@@ -96,17 +96,15 @@ void RKInput::updateColor () {
- 	if (!widget) widget = textedit;
- 	RK_ASSERT (widget);
- 
--	QPalette palette = widget->palette ();
- 	if (isEnabled ()) {
- 		if (isSatisfied ()) {
--			palette.setColor (widget->backgroundRole (), QColor (255, 255, 255));
-+			widget->setStyleSheet("");
- 		} else {
--			palette.setColor (widget->backgroundRole (), QColor (255, 0, 0));
-+			widget->setStyleSheet("background: red; color: black");
- 		}
- 	} else {
--		palette.setColor (widget->backgroundRole (), QColor (200, 200, 200));
-+		widget->setStyleSheet("background: rgb(200, 200, 200); color: black");
- 	}
--	widget->setPalette (palette);
- }
- 
- void RKInput::requirednessChanged (RKComponentPropertyBase *) {
-diff --git a/rkward/plugin/rkpluginbrowser.cpp b/rkward/plugin/rkpluginbrowser.cpp
-index 9612acb5..ff862d16 100644
---- a/rkward/plugin/rkpluginbrowser.cpp
-+++ b/rkward/plugin/rkpluginbrowser.cpp
-@@ -184,14 +184,14 @@ void RKPluginBrowser::updateColor () {
- 
- 	if (isEnabled ()) {
- 		if (status == RKComponentBase::Satisfied) {
--			selector->setBackgroundColor (QColor (255, 255, 255));
-+			selector->setStyleSheet (QString (""));
- 		} else if (status == RKComponentBase::Processing) {
--			selector->setBackgroundColor (QColor (255, 255, 0));
-+			selector->setStyleSheet (QString ("background: yellow; color: black"));
- 		} else {
--			selector->setBackgroundColor (QColor (255, 0, 0));
-+			selector->setStyleSheet (QString ("background: red; color: black"));
- 		}
- 	} else {
--		selector->setBackgroundColor (QColor (200, 200, 200));
-+		selector->setStyleSheet (QString ("background: rgb(200, 200, 200); color: black"));
- 	}
- }
- 
-diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkpluginsaveobject.cpp
-index 7c084a99..52b9d867 100644
---- a/rkward/plugin/rkpluginsaveobject.cpp
-+++ b/rkward/plugin/rkpluginsaveobject.cpp
-@@ -82,8 +82,8 @@ RKPluginSaveObject::~RKPluginSaveObject () {
- void RKPluginSaveObject::update () {
- 	RK_TRACE (PLUGIN);
- 
--	if (isSatisfied ()) selector->setBackgroundColor (QColor (255, 255, 255));
--	else selector->setBackgroundColor (QColor (255, 0, 0));
-+	if (isSatisfied ()) selector->setStyleSheet(QString(""));
-+	else selector->setStyleSheet(QString("background: red; color: black"));
- 	changed ();
- }
- 
-diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp
-index bc250b25..6a2ae601 100644
---- a/rkward/plugin/rkvarslot.cpp
-+++ b/rkward/plugin/rkvarslot.cpp
-@@ -183,15 +183,14 @@ void RKVarSlot::updateLook () {
- 
- 	QPalette palette = list->palette ();
- 	if (!isSatisfied ()) {		// implies that it is enabled
--		palette.setColor (QPalette::Base, QColor (255, 0, 0));
-+		list->setStyleSheet(QString("background: red; color: black"));
- 	} else {
- 		if (isEnabled ()) {
--			palette.setColor (QPalette::Base, QColor (255, 255, 255));
-+			list->setStyleSheet(QString(""));
- 		} else {
--			palette.setColor (QPalette::Base, QColor (200, 200, 200));
-+			list->setStyleSheet(QString("background: rgb(200, 200, 200); color: black"));
- 		}
- 	}
--	list->setPalette(palette);
- }
- 
- void RKVarSlot::changeEvent (QEvent* event) {
--- 
-GitLab
-
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch
deleted file mode 100644
index bd95490cbe4c..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5f8fb9cd211f0e12ef40a0fc34a42c31f2a24475 Mon Sep 17 00:00:00 2001
-From: Johnny Jazeix <jazeix@gmail.com>
-Date: Tue, 7 Dec 2021 19:03:19 +0100
-Subject: [PATCH] fix end of paragraph tag in html for the rksetupwizard
-
----
- rkward/dialogs/rksetupwizard.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/rkward/dialogs/rksetupwizard.cpp b/rkward/dialogs/rksetupwizard.cpp
-index b14e06ec..e4787793 100644
---- a/rkward/dialogs/rksetupwizard.cpp
-+++ b/rkward/dialogs/rksetupwizard.cpp
-@@ -130,12 +130,12 @@ RKSetupWizard::RKSetupWizard(QWidget* parent, InvokationReason reason, const QLi
- 	auto l = new QVBoxLayout(firstpage);
- 	QString intro = i18n("<p>This dialog will guide you through a quick check of the basic setup of the required (or recommended) components.</p>");
- 	if (reason == NewVersionRKWard) {
--		intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p");
-+		intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p>");
- 	} else if (reason == NewVersionR) {
- 		// TODO: invoke this!
--		intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p");
-+		intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p>");
- 	} else if (reason == ProblemsDetected) {
--		intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p");
-+		intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p>");
- 	}
- 	l->addWidget(RKCommonFunctions::wordWrappedLabel(intro));
- 	auto waiting_to_start_label = RKCommonFunctions::wordWrappedLabel(i18n("<b>Waiting for R backend...</b>") + "<p>&nbsp;</p><p>&nbsp;</p>");
--- 
-GitLab
-
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch
deleted file mode 100644
index 1ce37d11ffeb..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4f17155eae5b81246e8172a80b9421ec0ad22bed Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@kdemail.net>
-Date: Tue, 12 Jan 2021 09:21:29 +0100
-Subject: [PATCH] Fix hang on exit.
-
-(Not sure, whether there are other potential hang conditions on exit, but this is one.)
-
-BUG: 430680
----
- rkward/rbackend/rkrbackendprotocol_frontend.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rkward/rbackend/rkrbackendprotocol_frontend.cpp b/rkward/rbackend/rkrbackendprotocol_frontend.cpp
-index c46ed5de..e5cf5d68 100644
---- a/rkward/rbackend/rkrbackendprotocol_frontend.cpp
-+++ b/rkward/rbackend/rkrbackendprotocol_frontend.cpp
-@@ -42,7 +42,7 @@ RKRBackendProtocolFrontend::~RKRBackendProtocolFrontend () {
- 	RKFrontendTransmitter::instance ()->wait(1000);  // Wait for thread to catch the backend's exit request, and exit()
- 	RKFrontendTransmitter::instance ()->quit();      // Tell it to quit, otherwise
- 	RKFrontendTransmitter::instance ()->wait(3000);  // Wait for thread to quit and clean up.
--	qApp->processEvents();                           // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events
-+	qApp->processEvents(QEventLoop::AllEvents, 500); // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events
- 	delete RKFrontendTransmitter::instance ();
- }
- 
--- 
-GitLab
-
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch
deleted file mode 100644
index cff7b60f1951..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f34cb38798e8a7d3f9a39f26be4ecab3013ea57c Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 5 Oct 2021 22:36:30 +0200
-Subject: [PATCH] Enable highdpi pixmaps
-
-This fixes icons being pixelated on highdpi screens
----
- rkward/main.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rkward/main.cpp b/rkward/main.cpp
-index 8eafd25c..7dcb34a5 100644
---- a/rkward/main.cpp
-+++ b/rkward/main.cpp
-@@ -239,6 +239,7 @@ QString resolveRSpecOrFail (QString input, QString message) {
- 
- int main (int argc, char *argv[]) {
- 	RK_Debug::RK_Debug_Level = DL_WARNING;
-+	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
- #ifndef NO_QT_WEBENGINE
- 	// annoyingly, QWebEngineUrlSchemes have to be registered before creating the app.
- 	QWebEngineUrlScheme scheme("help");
--- 
-GitLab
-
diff --git a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild b/sci-mathematics/rkward/rkward-0.7.4.ebuild
index 80ead3401703..6a89832e92f6 100644
--- a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ DESCRIPTION="IDE for the R-project"
 HOMEPAGE="https://rkward.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -20,13 +20,14 @@ IUSE=""
 
 DEPEND="
 	dev-lang/R
+	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
 	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	kde-frameworks/karchive:5
 	kde-frameworks/kcompletion:5
 	kde-frameworks/kconfig:5
 	kde-frameworks/kconfigwidgets:5
@@ -46,14 +47,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-crash-w-R-4.1.0.patch # KDE-bug 438993
-	"${FILESDIR}"/${P}-fix-hang-on-exit.patch # KDE-bug 430680
-	"${FILESDIR}"/${P}-fix-dark-themes.patch # KDE-bug 389914
-	"${FILESDIR}"/${P}-fix-eop-tag-in-html.patch
-	"${FILESDIR}"/${P}-fix-hidpi.patch
-)
-
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "kate plugins support" "kde-apps/kate:${SLOT}"
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index cb84ff2ba5ec..bc1ee5862fc8 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,16 +5,15 @@ AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcb
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
-AUX singular-4.3.0-includes.patch 764 BLAKE2B 19c83711d2f7eb0d0971a7259f4b0ed9234204bd2ee45d0f3ffd6de18de8d71bccd00b186edae1af180a36a24fef8e72a4a8bc8371eaef1059ec51dcfec0c116 SHA512 dc775f69280f2194f6fca2a7005ab9363a8feabad3d66d0e285cd76a70da5fd9ad6cbb3e95732cf32f9c55b30a0c201260e4bef56830f498016b6554a7230f53
-AUX singular-4.3.0-slibtool.patch 1511 BLAKE2B 495d226fdd4114468364bdbee0add287d70c3d7c991e81a86c03023c2b73c85936365ebfe254b9a3e45f2043d4f9a6e385d40d4546437f34b4c6478f4f02ada3 SHA512 e62f40e51879709c1d5a409d2ff5fea49ac5b37d73b6e5fc6041756143882fd9ab2bdc4e5ec68ab1626109a27d4b8c7e361e88080ed2a3c62c7f0a1e591c69cf
+AUX singular-4.3.0_p1-gcc12.patch 2670 BLAKE2B a7dcbe6a6b93baa53ffddf5f25fbf2cea54be1fa453854ddec7b177a132ab38ec5b8cb93078c2183e43896f342231866095dbf2e453fa1952e4215abfdf82baa SHA512 7d3f80e6e2a4980872f5bbc2a41c7925f6fac7dd6184df372375bb959c098203d5551f8c5e0bcaae2bb8ff498515135c8ca2859f43b86eeb5b950e64a6d8d2fd
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
-DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f SHA512 b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
+DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
-EBUILD singular-4.3.0.ebuild 2499 BLAKE2B b03d3c8a01eeeafea83d23c3cd6979239b2be9febabd42b81774676ae44d8df64144f734e3d202e2f916d1a186e9ce1b5e38ce844358d373cd56cd68ac73245d SHA512 27bf7a713bbbb23046a05961e91c2249c7a3240ef37925b4d9873f2def8ec8d9ac5f92f92d893ea9cbb036c0de462347d20c262be1e3bc6a6412a3442d101aee
-MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
+EBUILD singular-4.3.0_p1.ebuild 2442 BLAKE2B 414fb3fe1752c58e0eb776e337ce3c8fb1f36488856a1f103d71a52495b9200b83bf73c3bca369681584ba65642cb54ba7996c0362f54791d242077ef5cb14e8 SHA512 e9d0287082cfcd5143858033dff722ec98d48091cb21145b7bbc5cfd66c4eca745e73033134a3c23e3a7c9081a9b489aac1c0ef8d1cea7d52403fc7f27a3e2ee
+MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
deleted file mode 100644
index 07df5c0cc068..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Wed, 19 Jan 2022 15:02:14 +0100
-Subject: [PATCH] fix: missing includes
-
----
- kernel/oswrapper/feread.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
-index ccdd272285..5491007478 100644
---- a/kernel/oswrapper/feread.cc
-+++ b/kernel/oswrapper/feread.cc
-@@ -7,6 +7,7 @@
- 
- #include "kernel/mod2.h"
- #include <errno.h>
-+#include <stdio.h>
- 
- // ----------------------------------------
- // system settings:
-@@ -21,6 +22,7 @@
- #include "misc/options.h"
- 
- #include "kernel/oswrapper/feread.h"
-+#include "reporter/reporter.h"
- 
- #if defined(HAVE_DYN_RL)
- #include <unistd.h>
diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
deleted file mode 100644
index 72d88979e870..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index ba7d911..346602f 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
- 
- case $host_os in
-   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
-+  *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
- esac
- 
- dnl INCLUDES=""
-diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
-index 23f216e..119c4ef 100644
---- a/libpolys/polys/Makefile.am
-+++ b/libpolys/polys/Makefile.am
-@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
- 
--P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace
--
--p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
- 
- P_PROCS = templates/p_Procs_Lib.cc
- 
diff --git a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
new file mode 100644
index 000000000000..570d0be87a29
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
@@ -0,0 +1,76 @@
+diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
+index fa42bf5e28..aefa661600 100644
+--- a/kernel/oswrapper/vspace.cc
++++ b/kernel/oswrapper/vspace.cc
+@@ -197,7 +197,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -245,7 +249,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size + (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -275,7 +283,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
+@@ -751,7 +763,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -799,7 +815,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size +  (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -829,7 +849,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 0477525e4c04..0deaba87eadc 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
index e2ccc7d6e9a3..f46ae019c973 100644
--- a/sci-mathematics/singular/singular-4.3.0.ebuild
+++ b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic
+inherit autotools elisp-common
 
 MY_PN=Singular
 MY_PV=$(ver_rs 3 '')
@@ -14,7 +14,7 @@ MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
 DESCRIPTION="Computer algebra system for polynomial computations"
 HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
 SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_DIR2}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
@@ -37,8 +37,7 @@ SITEFILE=60${PN}-gentoo.el
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
-	"${FILESDIR}/${PN}-4.3.0-slibtool.patch"
-	"${FILESDIR}/${PN}-4.3.0-includes.patch"
+	"${FILESDIR}/${PN}-4.3.0_p1-gcc12.patch"
 )
 
 src_prepare() {
diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index d16042866d7b..a2d527fc518c 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -1,9 +1,5 @@
-DIST slepc-3.13.1.tar.gz 4797627 BLAKE2B 29372b8a2d4c5f3b26e840df743f7aec098bfeeb29e9c108e509baa21d9697da19c737470ba4c132391d5193ebf749ef3f3c6ece600ec7527502d40a239aa0ee SHA512 620c344274808329c0a1009e7844532e03e88d38135bfd5b73bc0bc6815b17b6dfb49341d05399230ba6e06997db688aec17615429eaca3dc94fd886119bf321
-DIST slepc-3.14.2.tar.gz 4865497 BLAKE2B d6fd0b45368383fad03b17f9d7f0ef26215b7459a5566c62ab2ad758eaa5fbc626be255b0aafa29b8830eb649a7bcfb0f36d383b865b4c1baa9de6037638de84 SHA512 0727a4f1672c4eb3cf0aa20aa408b897425539ac69123001ac3b2e0bc2d1fa230ef028fa0cd5e89e7a86a98884164fd1c97a742f90f0c128fcc7066d032ee321
-DIST slepc-3.15.0.tar.gz 5191730 BLAKE2B 2fcdfbe25f59a80390478059ef0a8b066ac39b57e99fe65ab4fe4814507fdc78d1feb245df5f7542f08c151d20f2e2a6168c4bc2624f78ab5058627816bb6696 SHA512 f815f0805db3f3e329324778c172ba301ebb5d2fc8f8f4c5dd17e574a2cbed5c0f8015715bc908dfcbd4050fade8dab7ae3b312bae746c41d84c57bc5d101929
 DIST slepc-3.16.0.tar.gz 5486237 BLAKE2B 28f45036ba7e6aa2b227c6f25e2c8edf7fc6914f3150043a7e310f270d24e669f32172897b558687c33a809c484e314a865296d4879a622d85004d329ec3bd1c SHA512 15ba9e4626fe3cf44142448b77869fa6d313bb7c026736d5552dfbab1ce350c2e2f2379fb647a1c236af8cb95895e4442dca1defa741a5b2b9172cbdf0baf75f
-EBUILD slepc-3.13.1.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
-EBUILD slepc-3.14.2.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
-EBUILD slepc-3.15.0.ebuild 1583 BLAKE2B 1897d8420f72f8732d604981f73fc00770749195cc8310b3ca4c464a2e07793b0445549dd68f14bb48973f686b39f95639388478cd0b2189251f4c1952d2272c SHA512 e9cec56f0df9015ddadd844392f50d0cc8faaf2929c717f07089af0b2dc73a43ed9d3fdffa23c49a254e445dfec034d62026242780392404b49ae79e7a0508dd
+DIST slepc-3.17.1.tar.gz 5450177 BLAKE2B ec4f597085a176a010797d599779cc4532e52996105bb76f755073876ebb81026c580cb5759a03bda58cb2de2767b1dcdb01ff0d946f218117edb2a7a6557414 SHA512 5429aa7516ec0b2fee8158f9317634faf1c963aa60237be81a0392d5f2fa9f531db59b4a9ad04e266d808befdbd71b5a30259b4abc639a1da2defffd74acd35b
 EBUILD slepc-3.16.0.ebuild 1583 BLAKE2B 1897d8420f72f8732d604981f73fc00770749195cc8310b3ca4c464a2e07793b0445549dd68f14bb48973f686b39f95639388478cd0b2189251f4c1952d2272c SHA512 e9cec56f0df9015ddadd844392f50d0cc8faaf2929c717f07089af0b2dc73a43ed9d3fdffa23c49a254e445dfec034d62026242780392404b49ae79e7a0508dd
+EBUILD slepc-3.17.1.ebuild 1530 BLAKE2B 7e80b3ee23830066b7e1e3eca61772d2b3f8142dd8aae6f239f99126369f8d4838aa88fe852aa7db5cd95a9a364bc3e5e1c78c300756c346abdc2585c3602181 SHA512 809b67f9ae40b19f29b8f47953562542d736437e99e943637b7ca5620ff00b7839815c6c1ee72e11dbb6a5c8823c17c32348e7c9adfb8f5c97197a3529f735e1
 MISC metadata.xml 452 BLAKE2B 88f38d59fe707307721dce331ce359fb394e246e86c9acffe2bca8dcbd08f02f843ecb1c3812ed15af022edb2ccb4132e16067da9ac58129dfdef4119cc00738 SHA512 37974d7da3a3b4ae085ac3430c85ff74d4fafe453b9ef32cccebf893cdcc3074d89f4560056e7e54145ed24fa4f76a2126baf9a01b6a5477babd4fcb412f792c
diff --git a/sci-mathematics/slepc/slepc-3.13.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild
deleted file mode 100644
index b30b13af2da9..000000000000
--- a/sci-mathematics/slepc/slepc-3.13.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
-HOMEPAGE="https://slepc.upv.es/"
-SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="complex-scalars doc mpi"
-
-RDEPEND="
-	=sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=]
-	sci-libs/arpack[mpi=]
-	mpi? ( virtual/mpi )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-MAKEOPTS="${MAKEOPTS} V=1"
-
-src_configure() {
-	# *sigh*
-	addpredict "${PETSC_DIR}"/.nagged
-
-	# Make sure that the environment is set up correctly:
-	unset PETSC_DIR
-	unset PETSC_ARCH
-	source "${EPREFIX}"/etc/env.d/99petsc
-	export PETSC_DIR
-	export PETSC_ARCH
-	export SLEPC_DIR="${S}"
-
-	# configure is a custom python script and doesn't want to have default
-	# configure arguments that we set with econf
-	./configure \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
-		--with-arpack=1 \
-		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99slepc <<- EOF
-		SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib
-	EOF
-	doenvd 99slepc
-
-	if use doc ; then
-		dodoc docs/slepc.pdf
-		docinto html
-		dodoc -r docs/*.html docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/slepc/slepc-3.14.2.ebuild b/sci-mathematics/slepc/slepc-3.14.2.ebuild
deleted file mode 100644
index b30b13af2da9..000000000000
--- a/sci-mathematics/slepc/slepc-3.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
-HOMEPAGE="https://slepc.upv.es/"
-SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="complex-scalars doc mpi"
-
-RDEPEND="
-	=sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=]
-	sci-libs/arpack[mpi=]
-	mpi? ( virtual/mpi )
-"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	dev-util/cmake
-"
-
-MAKEOPTS="${MAKEOPTS} V=1"
-
-src_configure() {
-	# *sigh*
-	addpredict "${PETSC_DIR}"/.nagged
-
-	# Make sure that the environment is set up correctly:
-	unset PETSC_DIR
-	unset PETSC_ARCH
-	source "${EPREFIX}"/etc/env.d/99petsc
-	export PETSC_DIR
-	export PETSC_ARCH
-	export SLEPC_DIR="${S}"
-
-	# configure is a custom python script and doesn't want to have default
-	# configure arguments that we set with econf
-	./configure \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
-		--with-arpack=1 \
-		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# add PETSC_DIR to environmental variables
-	cat >> 99slepc <<- EOF
-		SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib
-	EOF
-	doenvd 99slepc
-
-	if use doc ; then
-		dodoc docs/slepc.pdf
-		docinto html
-		dodoc -r docs/*.html docs/manualpages
-	fi
-}
diff --git a/sci-mathematics/slepc/slepc-3.15.0.ebuild b/sci-mathematics/slepc/slepc-3.17.1.ebuild
index 0cd112cb1f08..8aa85eac9d58 100644
--- a/sci-mathematics/slepc/slepc-3.15.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,6 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \
 		--with-arpack=1 \
-		--with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \
 		--with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")"
 }
 
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 4619b2aa4078..a512e96628b0 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -9,5 +9,5 @@ DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90a
 DIST why3-2021-20210519-19ADF-src.tar.gz 10386938 BLAKE2B 93b6323c562126244f5cccef34088a521fe3dc1cec07c966e94472503ec8492707b20a641936449307f0439e711a82260d36679cbc69f53df8e7886a1d3673c3 SHA512 65e3c1430001962f2c7cce786f3e30f14b5295cff89c4087d95c1545e81743723319ba0309dbe15c4c46552110b25ff57addc3ee085dade02ea59a2273b127db
 EBUILD why3-for-spark-2019-r2.ebuild 3010 BLAKE2B d843d70e1b9145175b11edd461a6237af4215b6c7a31235fbab73e75c79668dd570857dc62db737e2e262fd59a10158c7857c0e1d47a2d36fac45a9f3cecb9ce SHA512 ea7791bf0ae35b66a13c4d8ee606fccc05e919beb892ddc2b6a53cef29df400b2e0b53b1e9b7c6a6f4144fb98bf44f467878f9e2bb94352734ad11595748b3be
 EBUILD why3-for-spark-2020.ebuild 2929 BLAKE2B 08af878a591cd6445a5f7dba13d9162a2f8ed192fa335a10391124207b354493fa3366618e3590b6cc8425b931610f779db66eb3c95965eb134864a62bac8bf7 SHA512 e08745656eff3612e5510c378efd4ef9630e753f366d03e89a9035cacbb0e24abe3d7f6618b08d641e1139d4612b71267cc2a73b10d738f58a78aa9fdc0d9215
-EBUILD why3-for-spark-2021-r1.ebuild 3357 BLAKE2B c4dceedd311dfeb272c3367ee4ab734a12657d87212d923d65bc06958b828350d6a54fef0f4035bbc4ed6a254ca0328b157192348fe6ed47d686060bb84df05e SHA512 500901a1715f64469776c953792f6b32ba3fdfe4edb20e1d5aa9fc41ba79e736eba3652ed6b2f47884ed29fb9eff42694778ff7da0c3ba89bb411bc5a6194795
+EBUILD why3-for-spark-2021-r1.ebuild 2940 BLAKE2B 5b5ffeae7fcaf34302d4bb5b0b2c20e321e94e410e3bbf3d896828eda2c1026411d0da12be1d6ed1dbce6e5ddb775a5e5baac8f1da3496b48ec4208cbc9b3410 SHA512 dadd7cfbc2ad89d173f5934c4a7edb16059c7106d40654ed117d64cb5d3e338faa0b64a4a367de2b5e9f61ef5c64919943bea1e651d2de6900ccd28bdc0d9cfb
 MISC metadata.xml 1486 BLAKE2B 3f8757b80b9b1b031fdfee11a4d1fb8aa6bf52b496e7fe2f26b3159313aa6df3998717b9b7d69a3e8c1206425986d3f8faa4d73b7ca1e216b90521c6bbe10c68 SHA512 60dd1f95702d163ad46f636d4af302437cab29d29fb1466352ff2889841d378bb2c6d4670cd626dcf612f2a1196627f09282f29e63815a929411d5bbdc68593e
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild
index 986e7bf497fd..fd2397eb1b04 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2021-r1.ebuild
@@ -56,19 +56,9 @@ PATCHES=(
 )
 
 QA_FLAGS_IGNORED=(
-	/usr/lib64/why3/commands/why3shell.cmxs
-	/usr/lib64/why3/commands/why3extract.cmxs
-	/usr/lib64/why3/commands/why3execute.cmxs
-	/usr/lib64/why3/commands/why3prove.cmxs
-	/usr/lib64/why3/commands/why3wc.cmxs
-	/usr/lib64/why3/commands/why3doc.cmxs
-	/usr/lib64/why3/commands/why3replay.cmxs
-	/usr/lib64/why3/commands/why3webserver.cmxs
-	/usr/lib64/why3/commands/why3pp.cmxs
-	/usr/lib64/why3/commands/why3show.cmxs
-	/usr/lib64/why3/plugins/'.*'.cmxs
-	/usr/lib64/ocaml/why3/why3.cmxs
-	/usr/lib64/ocaml/why3/why3extract.cmxs
+	'/usr/lib.*/why3/commands/.*cmxs'
+	'/usr/lib.*/why3/plugins/.*cmxs'
+	'/usr/lib.*/ocaml/why3/.*cmxs'
 	/usr/bin/why3
 	/usr/bin/why3config.cmxs
 	/usr/bin/why3session.cmxs
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index b827628b71bd..d60da19a5566 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,7 +1,3 @@
-DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
-DIST z3-4.8.16.tar.gz 5223980 BLAKE2B 67bca86d48df51c9aa4fa3544fd77133c4cc429e6f77f89aa26a559e56e267b8c0891befc6a5e24be541011aac02cb0d51ef26a636c3b360a1fa4d445967da21 SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615
 DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
-EBUILD z3-4.8.15-r1.ebuild 2600 BLAKE2B d55c66f4e595b84127e8d5ad5e0895d9df003094a47a68329eb7664e69bfb4b04c2c476abd16caee95467b1537ebff6bcf038858b2d6cb97ccfec72795cd9064 SHA512 fbe4d7a3b271e5938990ddbb6ecafd7f5f725508c6ee741f71ee46322313a606c3b5058ac37c8b7054bffb8670593fe24006a5a84c193f5bda41d09420882145
-EBUILD z3-4.8.16.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
-EBUILD z3-4.8.17.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
+EBUILD z3-4.8.17.ebuild 2614 BLAKE2B e69e8ede7cebd497598e854224bb1f3c9e93765df016aaf33efbfa56bd2508a773459c829a0343de6aa9cffcfb3e3da4eb62fbd7e438fae7aaf3af26288d4391 SHA512 6c9f47d73b9c016fc404c28656d4102a0f179c2e8b73f548aadbaf2847f211da41ec099b76f9f79602f19fd59eab4ee99ae66315bd47a35509158ad235e4fbac
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.15-r1.ebuild b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
deleted file mode 100644
index 31cec588863f..000000000000
--- a/sci-mathematics/z3/z3-4.8.15-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.16.ebuild b/sci-mathematics/z3/z3-4.8.16.ebuild
deleted file mode 100644
index 7ebfae64d20b..000000000000
--- a/sci-mathematics/z3/z3-4.8.16.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.17.ebuild b/sci-mathematics/z3/z3-4.8.17.ebuild
index 7ebfae64d20b..f97bc38fd53d 100644
--- a/sci-mathematics/z3/z3-4.8.17.ebuild
+++ b/sci-mathematics/z3/z3-4.8.17.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-mathematics
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)