gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-mathematics
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
70 files changed, 781 insertions, 1255 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 349fd019ec7f..18f9a6178073 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 16500b127a2c..a5b7f8cbdffb 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -4,5 +4,5 @@ AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d3
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
 DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
 EBUILD arb-2.19.0.ebuild 749 BLAKE2B 05815e6f1635924824d5173ad0558627b5c98923b384d4f0dd2d369b7158acb0923f2f82d7d9ec29cb3f48cb30a402afe3adb3850d60ea60af5d95e4d1633dca SHA512 d7d9d2e1dd92cdc541de0212722b12c2db5eca27b00684f24af34d0829e1de91ecdafb731880d2eda177d363929e3bee3aa68f8a41f277f88b17a1554de01974
-EBUILD arb-2.21.0.ebuild 794 BLAKE2B 31d5e76b4f9f2ae55c16d92826619035b0ee95f1e3be0f59d4bc1abdbd5e4c0358c24d4470e776aa72df82cdf45d495aa76646f9fe6505c26cff8b1bfc3fffe3 SHA512 a6b065d708ffa164a09302ec40a601073cb980c4a4e8fbe3e52ca46d94f2e2311dcb3fececa17210dcd1b2d8939c8240c73aea66b46ac90ef5a253c25bc37648
+EBUILD arb-2.21.0.ebuild 792 BLAKE2B 1275d14673cb09b748d2dd206f030e2fee431798adf27e629008a73301498d901e8815d5f5908e2b06d878f1ee17082e8138f8070e93d2e275d8c6a1440515d8 SHA512 105fec72bda06488fef22c77988aae8bbdc519256a703694fd2d4939bad4c000766a5c10b25e7739952e4fa927fee7ee4a1f7d4fb8c948ee243892763c6c60f3
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.21.0.ebuild b/sci-mathematics/arb/arb-2.21.0.ebuild
index 977fd100e51f..6d7c604056cd 100644
--- a/sci-mathematics/arb/arb-2.21.0.ebuild
+++ b/sci-mathematics/arb/arb-2.21.0.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 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/cadical/Manifest b/sci-mathematics/cadical/Manifest
index 905451ab2716..eef40ed8536c 100644
--- a/sci-mathematics/cadical/Manifest
+++ b/sci-mathematics/cadical/Manifest
@@ -1,4 +1,4 @@
 AUX cadical-makefile.in-ar.patch 323 BLAKE2B 226618745824824d8d7ccea53a3435abed9f829ca8462994fcdf805b7e5ba18a571214a16fbb2fcaeb0c91683424402e0a3c8dd05cd8f8dbdec19ed30aa023eb SHA512 30427fb87ef6aef56b9aebc3b2e0981e79c680c73dba20d371364d1b3668b51f1cbba4b6c7467ffb979245488b8ca1f2251a6321db4991221051f0c4b8e6a4d7
 DIST cadical-1.5.2.tar.gz 596334 BLAKE2B 2e6c0f0602b807cf9ee5993aa627e074291b0128d19474d5431e01992d66b111773e593c14712338e9702f64e23eae6fdd937b5b86b2b9b3e08022dbbb199fd7 SHA512 1aab87bdaec938eb219f75f13bf2fcb031f47ac1f49b586f769aeececd1c33b166341bef3bc8713e62b4612a91c405db33e6d1b48e1074a3433d80e9ecb33fe2
 EBUILD cadical-1.5.2-r1.ebuild 732 BLAKE2B f97142135bf5be3f3912d572235aa0de953ac4137e715b0b3732014c19527cb2a6a4fca456bdd5e48b9384038b1028fcaef8b47695ead65bff5ebdd17fc1d3ce SHA512 aed6e5bd0cda217c6b2a1c9a32dc27f0b0c5f051dcbf43a3e06e806e5a6099340a8d224027b77e6949b3ca3f053f1cd1676cf968d95c9a63636bbe18703e7f79
-MISC metadata.xml 612 BLAKE2B 61991d650dbdae11b63c71085f145740272b8fe3b720da4d6750c6b82b7bc72e3acabf22826b0e01301d4866c05431d607f20f86a35e71b0754deb157dab34bb SHA512 c46f122e4d50c0a3db07e42453491d4285d5ef879f026ed747d173b9f0000ba26d44a097104cbe0642cac448c9b565d61132d0d9d4660dfb8a6c24900d6098b9
+MISC metadata.xml 613 BLAKE2B 6d7e0c1b5eae3803aa0981b195457cdcc6d2ffa2af655837e615da6ed6914ac5bec7a831ced6703ff67476561cf67139ea5519d98cdc2bd8d5781108496046e2 SHA512 b04ad6ae6e2626cea18049e3e20eb227b5580853b8ad77179ea693ed61f12d042b7ea505eb8cfafaa0121564ab0a4b6c7dcdf84f78fa2f47c465e6f61fb1a3f0
diff --git a/sci-mathematics/cadical/metadata.xml b/sci-mathematics/cadical/metadata.xml
index c3c09f27203e..7cac34b62a52 100644
--- a/sci-mathematics/cadical/metadata.xml
+++ b/sci-mathematics/cadical/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index ec1130fb2108..848d8d08a6eb 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,7 +1,9 @@
 DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e976fb46689e0eae182fa4ec571524ae9f4f1a5ebbd44966fbdc4ee10cffda59c287d51ab48df4ac0e5e6844c SHA512 f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
+DIST coq-8.15.0.tar.gz 7215106 BLAKE2B 512fde593f6e7fb8b410b5debf5a78bc5d0d181ed7207c00669fc33fa39c2d7e57860f3afbcfc9defd2093115242ad176a5451d9bb309483ba2172e2b0521d02 SHA512 be6c799b6635875255f7288b9bae5f9108660308f299823155d41353e96fbed4e41e1fc8896fe9653c095da740a80dbf5a1add6b28d279eb7b65365eeaff54ab
 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.ebuild 2371 BLAKE2B be3296b09cdb60c1408d3562ce96c810b43193c386bea72b50fa604fd93d08b9267074c082b40f7d20649122968b9775a5d0477509c504cb76d91a24c5dbac4d SHA512 63666fd745f6f39c97e3f69b250a8cd7528ba3d78a303652f358e238317087c3cf4851a574cbd477193c097a5da6da85965832e8c19897c4e94d1fc4660f3578
 MISC metadata.xml 939 BLAKE2B e8da08122c0821621a51c3d0fee7d62302a7e0f2f5c37d5787ce2ee613df299a1256f78bbb1d1c6d045076055aad6a25849a02000b97be619b9e984694315ac3 SHA512 98ae3bfb70f27c4b5e5cb18ebe0b9b93ddbb855e426eb54d019957253b3077fc32f0810aae4049f1fcd53209da863addb4b1e88b21ea7422515ce387bfdbdf43
diff --git a/sci-mathematics/coq/coq-8.15.0.ebuild b/sci-mathematics/coq/coq-8.15.0.ebuild
new file mode 100644
index 000000000000..b02fe03c702c
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.15.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop dune
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+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="gtk debug +ocamlopt"  # doc add when antlr & antlr-python are ready
+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}"
+# to build docs we needantlr >=4.7, not yet in the tree
+# BDEPEND="doc? (
+#	>=dev-java/antlr-4.7:4
+#	dev-python/antlr-python:4
+#	dev-python/beautifulsoup4
+#	dev-python/pexpect
+#	dev-python/sphinx_rtd_theme
+#	dev-python/sphinxcontrib-bibtex
+# )"
+
+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)
+		-with-doc no
+	)
+
+	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/easycrypt/Manifest b/sci-mathematics/easycrypt/Manifest
index f3d073b6686b..83a04e2b33be 100644
--- a/sci-mathematics/easycrypt/Manifest
+++ b/sci-mathematics/easycrypt/Manifest
@@ -1,3 +1,3 @@
 DIST easycrypt-1.0_pre20211210.tar.gz 1185137 BLAKE2B 3557a8b0423109a3b3e6e02f6d1ad88f07847d105015546c90b5a46cf514f1311390d3a6f6476c042420b91a62ad095919f7ab616adee2778165d9d081070730 SHA512 0043eac02e916dc46ed1cb4f278f148f915d09f336e904b1a711c18d62cda177e434fc13682ec095a085e458ba90ca8dd02968206af60f0b80a378f16b205553
-EBUILD easycrypt-1.0_pre20211210-r1.ebuild 854 BLAKE2B 69628e4415d62c8371ebcc43bf3a50e26417ab5bca67ad5a08b12352deee65cdc03217297a1f6e48191c5e25d679e0094c9b6b8eedb3a93128a65b85de8b327b SHA512 aaab397b4d3288b047f32a337beecf43262fbfe4fc702a501f359bc20eeb11a002b386c8772b429fc4fda3a033f51cc44fc8d0d0d5e4c0f88fcef12d5bf8bab8
-MISC metadata.xml 662 BLAKE2B de713a2c7c496742f1b793a0b8f1cd959d5c138af886455b9ee8479281098ead17f9e4f82cdf9d7e411b3bfe9db090d8a791da19856632e7d33b740aee1e9d3b SHA512 7c43407b9779c6c80550e1049897315b8b8ed18655e0987a477bf820040363739fa80e4c8c76c6b7278290d21d088a739eb1a4f357c03b86ff8f4bb69a8cb833
+EBUILD easycrypt-1.0_pre20211210-r2.ebuild 997 BLAKE2B 478ad9edc20d1da5f92c52fecf0d642591d926accc3040eb0eec9406fe99db24455b525d4334d5859bcc20e0cc472cb49ff005dc042151ba403cc0fc765f94a9 SHA512 ab80d2e314d2bde1877967bbec78c9226750fa5d8b80bddd5cdb2beeea26b478f5b4274ac10e4d3fba3d3c5e49a7762b061e1b4f433d51008dd4a60aa6a3f468
+MISC metadata.xml 799 BLAKE2B 967a758171a2fe87b648a29bf2663beaae7834119e55a7619c98518c96cfe459e59fe5dc72a9faea071c0b488dc8144f1c0e43677ac63646f1ba12cf831f4a88 SHA512 411ff1acad400c3e70e546fd59b20db13b0f1db121aca9f1af23da708cd82340114bc966f64cfb5a35e84967c1131c660ab260f867639932c67edf47c859c4ca
diff --git a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r1.ebuild b/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r2.ebuild
index 17f451552103..ef1279bbd12b 100644
--- a/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-r1.ebuild
+++ b/sci-mathematics/easycrypt/easycrypt-1.0_pre20211210-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
 
-COMMIT="49aec58ea63a64adcf5fbabcc14c6739f337b206"
+H=49aec58ea63a64adcf5fbabcc14c6739f337b206
 
 inherit dune
 
@@ -14,8 +14,8 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EasyCrypt/${PN}.git"
 else
-	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
+	SRC_URI="https://github.com/EasyCrypt/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${H}"
 fi
 
 LICENSE="CeCILL-B CeCILL-C"
@@ -36,3 +36,10 @@ RDEPEND="
 	dev-ml/zarith:=
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local theories="[\"$(ocamlc -where)/easycrypt/theories\"]"
+	sed -i "s|EcRelocate\.Sites\.theories|${theories}|g" src/ec.ml || die
+
+	default
+}
diff --git a/sci-mathematics/easycrypt/metadata.xml b/sci-mathematics/easycrypt/metadata.xml
index 08fb88e8b7d7..f874f218f5cd 100644
--- a/sci-mathematics/easycrypt/metadata.xml
+++ b/sci-mathematics/easycrypt/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
     <email>ml@gentoo.org</email>
     <name>ML</name>
   </maintainer>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
     EasyCrypt is a toolset for reasoning about relational properties of
     probabilistic computations with adversarial code. Its main application is
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 0eea6f1ea1b6..bdab40575f4b 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -2,5 +2,5 @@ AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d5
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
 EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
-EBUILD flint-2.8.4.ebuild 1529 BLAKE2B 951c66854be6d5aaccc4855b870e884aabe52792fc92005eef0d8141c885d8be48d167ed39935b7f541ec2adcbb3cb9550cdd73ff5567e385ca6a034a8a8231f SHA512 022d80243f3d8c789918ae9e9d92125cf671a581b351cfaf675f916475c71d9e1fb2b189113e82258e965c131b7dfeb719aad00653a958061ac7521a1f4539c8
+EBUILD flint-2.8.4.ebuild 1527 BLAKE2B c74158618cb85471fda7e7a26b438f0d68ade93f0633ed34c65424488bb1b14b13dd7639ea599531099d87fb631474c26103d0c3e87233a589bb432c4c504399 SHA512 453b1404a1a99c8681d061b5373f50fb469122e45a1dd5c91be264f7714c8aeb5ffdca9c0d5e88d9c0c884c953b08ac094c680c012187f1bdece23f890514c87
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.8.4.ebuild b/sci-mathematics/flint/flint-2.8.4.ebuild
index 216026f6df27..604d35b47fd9 100644
--- a/sci-mathematics/flint/flint-2.8.4.ebuild
+++ b/sci-mathematics/flint/flint-2.8.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
@@ -21,7 +21,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/geogebra-bin/Manifest b/sci-mathematics/geogebra-bin/Manifest
index 01300d91fa24..babc764fe91a 100644
--- a/sci-mathematics/geogebra-bin/Manifest
+++ b/sci-mathematics/geogebra-bin/Manifest
@@ -1,5 +1,7 @@
 AUX geogebra.sh 954 BLAKE2B 6345f6f0103f326a3d0acc56d9c794c0f269613916b221e690bb4065be9597a9b0c77b1caa370d144548b6f24bf96995f2c2b6ca70d2da16d296e0639feecc2b SHA512 f44c7250af9c991fb78b96d97d0324084f97e54c2b64c680fc82a71ddba1cb5c89c76276eaa0b3bd966ace4d90f4336b3cc3c3c5603294b2314d6d82916c70e0
 DIST GeoGebra-Linux-Portable-5-0-604-0.tar.bz2 138245005 BLAKE2B 589b12a60161ca07e6da82953aeda69a2ed7302634df9078cb997000e2b77486aa1f4dfcbc1daddfddf0b425574ad927c97e0a08d70d708a209eaf0af86d9756 SHA512 ccf190f436504727dc9c6fa10adbd2d0a72a87b641e5b7ce2c7bc8ffe8c1baa00d97b3d2b619f32f1c50b28d5c72b0e0b15619e9c8be74ad8c8fb5afbe66c9a3
+DIST GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 131095393 BLAKE2B bef756bec904e40e06823de7121deb9755bd3523040018a826dcd78e5e8563095f7e4b16a90cad34e14d04628706c1d5a56856d389bd8d599d5588d875ff9b11 SHA512 a55e05bbb7acb6f4512ae3163312fd19095f32b9a3beed09ff12e8af2389dae2bb916af816aa50ee6645f4eb4b78936f3bc497312dc9446d8e1464830cd7b717
 DIST Geogebra.svg 522 BLAKE2B 8c11d037bd8af7af571abc2bba0a8610f0ed5c1cea46fdc47a40d0176e5ea3b7ad4700601a3094b1aa15012f769883c7f5cb60a70f4ed400df57e3b0610271e9 SHA512 a54fedd530d1c803e14d6f44ab7341d9f1ae17fb6b6496bd21788ad1b88b0977d574db6de199e9168543a03dff73ab19e3c50793ec91750ff5fff4a4b7af408d
 EBUILD geogebra-bin-5.0.604.0-r2.ebuild 1182 BLAKE2B 8a693a3bdde6c8b5cc1b22f3d4f25e84d824704d1c5dcdb18c1d37472b126b9ef3fdddc1a81de31daf24992363a11a34862f7c7a9fa390fc0bc8f3d9e1bb651e SHA512 f2fd807d3c41787f4ff2d9eea33154240b4b240031e862c9eeb8766420106c0a090166b4714014b344873aee9cf30c9385af22b3183539ca74308c5acf3173e5
+EBUILD geogebra-bin-5.0.683.0.ebuild 1182 BLAKE2B 3fadbfe0b1b57e1aeb279b20daf194623d459aa2dc8e11252c69109c5712ce011c37340e9ced43da3407cfa5ce892b83e4a53427c8946c656637d6fe67ab097e SHA512 9c74947fc90c2145d2596c0586db931adc351442f1365a6ce319f3a8a5025c7ed88b71a7a98924f2a7ab60734614ea80cb868e81d0040525101500c48218b806
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
new file mode 100644
index 000000000000..3749e86ddc99
--- /dev/null
+++ b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop prefix xdg
+
+MY_PV="${PV//./-}"
+
+DESCRIPTION="Mathematics software for geometry"
+HOMEPAGE="https://www.geogebra.org"
+SRC_URI="https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
+	https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
+
+LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+RDEPEND="
+	dev-java/java-config
+	|| (
+		dev-java/openjdk:8[javafx]
+		dev-java/openjdk:11[javafx]
+	)
+	!sci-mathematics/geogebra
+"
+
+# no tests
+RESTRICT="test"
+
+src_unpack() {
+	default
+	mv -v GeoGebra-Linux-Portable-* "${P}" || die
+	rm -rf "${P}/jre"* || die
+	rm -f "${P}/geogebra-portable" || die
+}
+
+src_prepare() {
+	eapply_user
+}
+
+src_install() {
+	insinto /opt
+	doins -r geogebra
+	newbin "$(prefixify_ro "${FILESDIR}"/geogebra.sh)" geogebra
+
+	fperms 0755 /opt/geogebra/geogebra
+	doicon "${DISTDIR}/Geogebra.svg"
+	make_desktop_entry geogebra Geogebra Geogebra Science
+}
+
+src_test() {
+	ewarn "package has no tests"
+}
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 8b925c06a708..a805a9a4f759 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,6 +2,5 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r2.ebuild 1631 BLAKE2B cd0084cc50cea5303a41ca4e10d8bdb0afe1c03e1c7f92a9b6bf6e42cf901d122c0769f8218ed5aa02671479750d2c853bcdb68e5ebf77775d34176b5970e894 SHA512 5ecc3f93d6fa3da09af5340091b4a93e5b4c840b6eaa7d61575931950a99b61abda51946bde1edbfe25a0a6899f9abcdfb71bd8eb493161ab804c38247e0847f
-EBUILD gfan-0.6.2-r3.ebuild 1666 BLAKE2B c8f52e3b6de28840061c6a23f846f88f166a8a33dac5adf6d6ea536d5fd6d6423d9f208b0f5cf4cc822485c85e59d1fa5dab5a35047d0a99c8a94d54fa5455f7 SHA512 68c23c9388dcecb4cb103702fe9d238d8235f7d2a26e9d435dfac63f7c9e0fa169a4e9520f4eb5db612bee0d1ce9fa4236acdf539b53b829e6e644ee4be41d70
+EBUILD gfan-0.6.2-r4.ebuild 1867 BLAKE2B 771c2d6b4e656b5461f19c56afed397995da74dc984542adc590bbfa6b79012b37d6572abeac711cc7b43defba925198ab9c98a2e3d5b7565007a1bacc631ea0 SHA512 4811847a4e24efa6f6844ac32c6c473c8076e4871880fe1c26f9112303a435cf68dee16900dc2278dde2f691404a197c59e39476a3114e043bb4f91f52103138
 MISC metadata.xml 1344 BLAKE2B 1a1d24099e2338877b068dee2b9e17feb4063de3a681a3b8d6a707c863708d6f380bb4864eb2fd5fef8ed49d6b1a770a8d1b4c12ce722b4f7fe113876de0b792 SHA512 8d5c93337a82b132c66c8d7e64c97deedcfdc724e9874bf308e6d817f71e663bc2b281ea133ae15e30096f5c801f88116b11e4d36dd8dd8eec526b5bc16d5f54
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
deleted file mode 100644
index 24132c367b9e..000000000000
--- a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html"
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-	sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-	)
-
-pkg_setup() {
-	tc-export CC CXX
-
-	# This should really go in cppflags, but that doesn't work with
-	# gfan's hand-written Makefile.
-	append-cxxflags -DNOCDDPREFIX
-}
-
-src_prepare() {
-	default
-
-	# This test hangs on x86, bug 717112.
-	rm -r testsuite/0602ResultantFanProjection || \
-		die "unable to disable test 0602ResultantFanProjection"
-}
-
-src_configure() {
-	# The upstream Makefile says that GCC produces bad code with -O3.
-	replace-flags "-O3" "-O2"
-	default
-}
-
-src_compile() {
-	default
-	if use doc; then
-		pushd doc > /dev/null || die
-		# The LaTeX build commands need to be repeated until the
-		# document "stops changing," which is not as easy as it
-		# sounds to detect. Running it twice seems to work here.
-		pdflatex manual.tex && bibtex manual && pdflatex manual.tex || die
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	use doc && dodoc doc/manual.pdf
-}
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 00132defd82f..1ec0a87690e9 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.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 flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
@@ -41,6 +41,10 @@ src_prepare() {
 	# This test hangs on x86, bug 717112.
 	rm -r testsuite/0602ResultantFanProjection || \
 		die "unable to disable test 0602ResultantFanProjection"
+
+	# And this one fails (harmlessly) on x86, bug 818397.
+	rm -r testsuite/0009RenderStairCase || \
+		die "unable to disable test 0009RenderStairCase"
 }
 
 src_configure() {
@@ -56,7 +60,11 @@ src_compile() {
 		# The LaTeX build commands need to be repeated until the
 		# document "stops changing," which is not as easy as it
 		# sounds to detect. Running it twice seems to work here.
-		pdflatex manual.tex && bibtex manual && pdflatex manual.tex || die
+		for iteration in 1 2; do
+			latex manual.tex && \
+				bibtex manual && \
+				dvipdf manual.dvi manual.pdf || die
+		done
 		popd > /dev/null || die
 	fi
 }
diff --git a/sci-mathematics/lcalc/Manifest b/sci-mathematics/lcalc/Manifest
index 6c60c0712f30..d0e09fef0731 100644
--- a/sci-mathematics/lcalc/Manifest
+++ b/sci-mathematics/lcalc/Manifest
@@ -1,5 +1,3 @@
-DIST lcalc-2.0.3.tar.xz 825904 BLAKE2B c2daab62de1d5bfb024a8246a965d850480cf313efe4f0ddb7561c28d2cae2aa231fea5c07e073d21e04cfcf2b558f931472825f9100e6ab4585ac87d80b4d3a SHA512 33d7cff04d88b62775a69b5b38eea41c24bdb88592d5185fbf9c13ea0c62a7c07c041f7f4e5c06415a3983b0ba369f3c9766a556090a6282e1cd7003ad25ba46
 DIST lcalc-2.0.5.tar.xz 830360 BLAKE2B 4a282de8548bc0b3d95fe079362ea98dd1397a1f0f7c4c61c6d2df8c5f95b9638aa628a25b138e6037520c69e56bfab635872115139caf3270d473e01276b980 SHA512 d3b7fa25dd3c2a8f88671076dfb5ab5e933be7feff24bbd160c92a476953f5553f9fb58f72c36b9c668929385084918fc3396e1a0bcc55de12ea8cb647c53929
-EBUILD lcalc-2.0.3.ebuild 924 BLAKE2B 7207a3babebb5a8e47066634e85c4a9f6e03c466cd1cbf18edcdf5c022d8b387a989b9e3013e897bedaf6f553a98cce780d6daf971324ece5a8b79471b095e56 SHA512 f5d4dee6746b553ba89603659fa3581d670e7e089ff3c996718c0aa7fbfb7d3e171310fa0490a8aa55083dc50059830e2bec0e7d35d540b14f211550f12506ea
-EBUILD lcalc-2.0.5.ebuild 925 BLAKE2B d89e68242d0a5525c29dc92468592a7b09cbb8769c85556378f35528fa414e615c2ac878d7d68720cf84c3af311f2f57a4602d00e410371432a2de5f2194bfb4 SHA512 8886b867197640fbb8a5236b8e22298f19d93d3c35e8d0d7f6f2ac295936c2fd410807012c226af226fa3d451c58df3041662b2658b374485c080b4b3be9ba0d
+EBUILD lcalc-2.0.5.ebuild 924 BLAKE2B 0334372571316c0f12943119d55f90f944712f369563db99942fd2dea5b5a3372d100507c305a3d53460ecb27e3082f7664aba05b8592a88df30d326d4ff13fa SHA512 6d364b8467ea4acf84e59cfec7c47e6094419a05f33812dc574fb4955aa55bc65e1d9f8e7e7503f0b93f0e4b5c9c02cca82b9beb0411f9d97dfd981513db6fbc
 MISC metadata.xml 1165 BLAKE2B 77544a05687fad32c18cb8d840d8de4291cae4135976bd741bbfd57a015956d5104026b99b1aec934d6a260501d89cd947e052a2ac85e35d2c93f7fc08224ac1 SHA512 cce822c8b50d97a7f8405634f565c3fbe147732db57bd66cccbaad2c2eda23076b76d0dfa442d462d55625a5dff06dde9bdf5e6ab4a9c9417d2f69972cc87add
diff --git a/sci-mathematics/lcalc/lcalc-2.0.3.ebuild b/sci-mathematics/lcalc/lcalc-2.0.3.ebuild
deleted file mode 100644
index 57cad69e748a..000000000000
--- a/sci-mathematics/lcalc/lcalc-2.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 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/32cb4e639e3c1051eb6caf19dfe0769b/${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:= )"
-REPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with pari) \
-		  --enable-precision="$(usev double)$(usev double-double)$(usev quad-double)"
-}
diff --git a/sci-mathematics/lcalc/lcalc-2.0.5.ebuild b/sci-mathematics/lcalc/lcalc-2.0.5.ebuild
index c9c56f0028ee..31542c170399 100644
--- a/sci-mathematics/lcalc/lcalc-2.0.5.ebuild
+++ b/sci-mathematics/lcalc/lcalc-2.0.5.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 @@ SRC_URI="https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e
 LICENSE="GPL-2+"
 # The subslot is the libLfunction soname major version
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Omit USE=mpfr for now because it's broken upstream:
 #
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index 356a56321b13..c22074c5a4c7 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,7 +1,9 @@
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
 DIST lean-3.35.1.tar.gz 1872461 BLAKE2B 44635b05a7e8ea89522dfb44b8f097ec530419ab79a5413648292ca34019ca744ae3e327cf3a7c627cb7a7a682cfcb2ffc5e6802f2c5ad67e0a7abc303624a3c SHA512 24238cd9e920042f5bf7ba0a121da860e7e9c804d169c888bfabbc5e79e55f556a8920fab0c1a7e72b13501798c5f3fcb068f1705a0cf230f2b89abe1b3045ab
 DIST lean-3.37.0.tar.gz 1875569 BLAKE2B 26d2513da35f0fa7efa6a9bb7706884b95666079e1c0d4349f2745a5908417c0b3d01027901425bf6bc4affdb314a79235c52bac9395bd9e54d53930e6b0dbe0 SHA512 c28139cfff7b40785ab51a9591964adc473f28d7a9877d891a132737c165ce6649924e6c75905442632452b9447c095aae830df347492bae058215d3392a7c09
+DIST lean-3.38.0.tar.gz 1877265 BLAKE2B 30d4364ee9d788ed128b63c42b5f7d55b91721ca74a6bc847e33f0d7be800cd2d3d90b4964e398f9116375afe6447a3f10f25ab716445aa9b7a5458d534bbf09 SHA512 441889f561a1fd369d2a4bc305e936834bb6c11ef85cfb4b69a5649226b405340fa787eb2ff73e44d2da6bb25a7819af70cf465abdf323777601c9f619c58508
 EBUILD lean-3.35.1-r2.ebuild 1773 BLAKE2B 15392079ec1e4d9eec5dfd9ee13fee05eca98fb2d7fe204a05b793b06588848c339dbb3b01c8c84f30fc45acc2ce8bb74be5841b9aa216a3d5f2d42d3158b7a6 SHA512 89f983bdb770e0fdbbcbd4db2a1bc8de25df33050ed936748788695e4926588471e8963289ef5bd397748abc41aae656f5614f3317b05b70f54dcd43189464d1
 EBUILD lean-3.37.0.ebuild 1773 BLAKE2B 6a332c70ff4fe6731391d180909c732976385466dc28add08014be98e84dd0c7a36a56349516099f6b16966bf70e03d3bf1b19633d9e54c054d2adbb4b9d12e8 SHA512 7601871b46ee585037c8c7600ebf3f4166004314cae3062b3a70838920f0199f5ba4570daa8f1b051a1aa7390e9a9986a0e553088e0a39b1ac45e884bc1ed18a
+EBUILD lean-3.38.0.ebuild 1773 BLAKE2B 6a332c70ff4fe6731391d180909c732976385466dc28add08014be98e84dd0c7a36a56349516099f6b16966bf70e03d3bf1b19633d9e54c054d2adbb4b9d12e8 SHA512 7601871b46ee585037c8c7600ebf3f4166004314cae3062b3a70838920f0199f5ba4570daa8f1b051a1aa7390e9a9986a0e553088e0a39b1ac45e884bc1ed18a
 EBUILD lean-3.9999.ebuild 1773 BLAKE2B 15392079ec1e4d9eec5dfd9ee13fee05eca98fb2d7fe204a05b793b06588848c339dbb3b01c8c84f30fc45acc2ce8bb74be5841b9aa216a3d5f2d42d3158b7a6 SHA512 89f983bdb770e0fdbbcbd4db2a1bc8de25df33050ed936748788695e4926588471e8963289ef5bd397748abc41aae656f5614f3317b05b70f54dcd43189464d1
-MISC metadata.xml 672 BLAKE2B 60612895864a164fce242ff1daa5390444c74fbb56fbc062c5448a2770ecab1048d67ce672ff543bab7b410eae118fa9fb087319e724a60437b4da2d8638e40d SHA512 2496062c9db3c2d1c9467b00fe20c0618df8cbdce2799dfdabd6c4fda4b5393bd49392c438fa81f07330fbf1aec3556b369f0fa88acff44e65b0c2cee8e94ea7
+MISC metadata.xml 673 BLAKE2B a0450429934f5c161e73df65461ef4142663b704766424aa13abd06a83bf27744a1505d06b615bde4fa0b4fe65500d7d4ac904753a107bf830722af92a3ab1ef SHA512 bad144f7071ec66f4eb0b167c83c3a32614d6d57a03cab3d981a42d174a853a118f3f9a938c41de21db9933b0bdf2290f52c33795be9df12c195572ab1b4d8b9
diff --git a/sci-mathematics/lean/lean-3.38.0.ebuild b/sci-mathematics/lean/lean-3.38.0.ebuild
new file mode 100644
index 000000000000..e47a48054580
--- /dev/null
+++ b/sci-mathematics/lean/lean-3.38.0.ebuild
@@ -0,0 +1,75 @@
+# 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 optfeature 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 +json +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=$(usex json)
+		-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/metadata.xml b/sci-mathematics/lean/metadata.xml
index efbd9f15e639..f06c80c2d7be 100644
--- a/sci-mathematics/lean/metadata.xml
+++ b/sci-mathematics/lean/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/mathematica/Manifest b/sci-mathematics/mathematica/Manifest
index 452434dcf9da..029c7c5ee8e4 100644
--- a/sci-mathematics/mathematica/Manifest
+++ b/sci-mathematics/mathematica/Manifest
@@ -1,7 +1,11 @@
 DIST Mathematica_10.3.1_LINUX.sh 3200459545 BLAKE2B 5a057b4e714eabb0afebe5a3ef536dbdc2d49a775130442e21493d6a0756527362fddfa7fabf927f996464456309c37b10b70a37f05718cb9f79d8ffc5912098 SHA512 08658a01a18c14a9b3f422816007980bf6576162e4cca6779ed1bdaf6b9748fb36a195006529ed6725f462042a264e7ee7753e802af8072ba6bebfee0cad8543
 DIST Mathematica_12.1.0_LINUX.sh 5889770327 BLAKE2B b0e637714f376d4066d5e484ef9facdcac36db691f7fd93e4a8228960acc9ec4b74b12ca19556c01247bd7927497f01f0c339a099b7f5abc7547051cc99c1fce SHA512 a661aa644944ee1058d7429f352ba6508514314086676a6eb918aac32773cc949feb531951b614be53198fa863575d8db456c66aa1306fd858c23423ef590fbb
 DIST Mathematica_12.1.1_LINUX.sh 4438946649 BLAKE2B 473f814a3e0686bb3a6ac1f49c887842bc17db11439b65c1dad1dae8cd5797e6762d94bccdf156f6f9ba1edb9a16ed5172936a6884d2f0f98c29808214b1eabe SHA512 5cfdd91bae9bad53afe405b40759732589119256c3f785058808b20faf21f593d90bf7bb2dbaccf3e983aa84ff380a1fa6d40fd63f5ba17109c1cd6818c63490
+DIST Mathematica_12.2.0_LINUX.sh 4454613844 BLAKE2B 03b0567afe001fd0781ea6daf0f23ccaccf44ed6ce225cc190239d228c684099a1fa1070cedc0c5bf1517804a4b8b34903d56b2b028392895437a304b56f682d SHA512 0b98d0f2a15ea834892897a64089da08bee5783a8a51b1a0e624618105c896c91c865cca5b5c7b8e72569a5065ef091be7138b7d72d94e4697a213a91d5b8770
+DIST Mathematica_13.0.0_BNDL_LINUX.sh 5118155611 BLAKE2B ff15a9def53f7fb808b117ecf2573f415b928c13a86d15634e6282c8f8542b32fa42ff76baeac95faa1242dc4350b0db28231c5cb7f36bc5b57425c2804bf996 SHA512 05008559c531a6920745d0047be0f2c42cb6994309db3f2ee2ad44151655f43d88de063a4952c5ac5544818e2da8973305ee46f44e74d7301da21cdf710cbd5b
 EBUILD mathematica-10.3.1-r1.ebuild 2821 BLAKE2B 958869840413f275d50272636693c776ac399cc14401d21d8709aab81ec23f396b0407618b787a4c04fe5a70327c604bef81735f6fcdeb8cbbaf6b74cf387172 SHA512 ac52970098b31e2e1a72d50dffc0db3cfe67c68eed8272b1d78febe5e47eb514b333c23a9c5f7030bb606f937106b5a237818d9ab829779533e33f5459d2aeb2
 EBUILD mathematica-12.1.0.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
 EBUILD mathematica-12.1.1-r1.ebuild 3134 BLAKE2B 4a8f269cfb1d77dd941dfab8c56dc310306aea75fd6d676f2e79a1208420c25161afef7e253c101763d57a441480403580dbb62b31b420f6dbce3f7cfa786fc8 SHA512 cf14b8567a9dc6bd7f19447cb9d277c929084abf20bf073c4d9aa049e1795ddba0862f43340bfbb37d2633d84e7b5adfe4a3123554fd62bc55c018394177a2ee
+EBUILD mathematica-12.2.0.ebuild 3135 BLAKE2B 782b070347eea963fc8e59799f2b971649014518947cbd0f0b8a602d7c2f7fad3aaf1b66ada9db3e20ff255a833cf8909a5a819912ddf6f7a72bc85440221089 SHA512 6e8348a8b7fdde48be0ee851ecf89445dffad1d63ece74485c04404c662384f72fad918278ffd88893e3b1ec5084c6a4072b6f9b1e8d71babe8abe59383ff480
+EBUILD mathematica-13.0.0.ebuild 3140 BLAKE2B d9e0fbdb71a760470783cbab6ef2a333682d968bfa60d062068d351b8ff9e4f4a574286ee9cd80241998b037ee76d2e366f398ae20fc59f8ba6a0bb3f4998596 SHA512 67ebf9553163e8518daea7fee095345b26a7f20ca204101e796117d84b937c4e11c5d7953fdd7682ffd2606a5af4164e03ca630e51bcfabca934c28db26fb853
 MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/sci-mathematics/mathematica/mathematica-12.2.0.ebuild b/sci-mathematics/mathematica/mathematica-12.2.0.ebuild
new file mode 100644
index 000000000000..8582dd407643
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-12.2.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="+doc"
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+RDEPEND="
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(ver_cut 1-2)
+M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack" -- "-help" || die
+}
+
+src_prepare() {
+	pushd "${S}/unpack" > /dev/null || die
+	# fix ACCESS DENIED issue when installer check the avahi-daemon
+	sed -e "s:avahi-daemon -c:true:g" -i "Unix/Installer/MathInstaller" || die
+	/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
+	popd > /dev/null || die
+	eapply_user
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation"
+	fi
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -\) -delete
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${D}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}"
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \
+			>> "${T}/${name}"
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica*.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		domenu "${filename}"
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}"
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathematica/mathematica-13.0.0.ebuild b/sci-mathematics/mathematica/mathematica-13.0.0.ebuild
new file mode 100644
index 000000000000..4852a7e91f32
--- /dev/null
+++ b/sci-mathematics/mathematica/mathematica-13.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib xdg
+
+DESCRIPTION="Wolfram Mathematica"
+SRC_URI="Mathematica_${PV}_BNDL_LINUX.sh"
+HOMEPAGE="https://www.wolfram.com/mathematica/"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64"
+SLOT="0"
+IUSE="+doc"
+
+RESTRICT="strip mirror bindist fetch"
+
+DEPEND=""
+
+# Mathematica comes with a lot of bundled stuff. We should place here only what we
+# explicitly override with LD_PRELOAD.
+RDEPEND="
+	media-libs/freetype
+"
+
+# we need this a few times
+MPN="Mathematica"
+MPV=$(ver_cut 1-2)
+M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="opt/*"
+
+S=${WORKDIR}
+
+src_unpack() {
+	/bin/sh "${DISTDIR}/${A}" --nox11 --keep --target "${S}/unpack" -- "-help" || die
+}
+
+src_prepare() {
+	pushd "${S}/unpack" > /dev/null || die
+	# fix ACCESS DENIED issue when installer check the avahi-daemon
+	sed -e "s:avahi-daemon -c:true:g" -i "Unix/Installer/MathInstaller" || die
+	/bin/sh "Unix/Installer/MathInstaller" -auto "-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
+	popd > /dev/null || die
+	eapply_user
+}
+
+src_install() {
+	local ARCH='-x86-64'
+
+	if ! use doc; then
+		einfo "Removing documentation"
+		rm -r "${S}/${M_TARGET}/Documentation"
+	fi
+
+	einfo 'Removing MacOS- and Windows-specific files'
+	find AddOns SystemFiles -type d -\( -name Windows -o -name Windows-x86-64 \
+		-o -name MacOSX -o -name MacOSX-x86-64 -\) -delete
+
+	# move all over
+	mv "${S}"/opt "${D}"/opt || die
+
+	# the autogenerated symlinks point into sandbox, remove
+	rm "${D}"/opt/bin/* || die
+
+	# install wrappers instead
+	for name in ${M_BINARIES} ; do
+		einfo "Generating wrapper for ${name}"
+		echo '#!/bin/sh' >> "${T}/${name}"
+		echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1 /${M_TARGET}/Executables/${name} \$*" \
+			>> "${T}/${name}"
+		dobin "${T}/${name}"
+	done
+	for name in ${M_BINARIES} ; do
+		einfo "Symlinking ${name} to /opt/bin"
+		dosym ../../usr/bin/${name} /opt/bin/${name}
+	done
+
+	# fix some embedded paths and install desktop files
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "wolfram-mathematica*.desktop") ; do
+		echo Fixing "${filename}"
+		sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
+		echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
+		domenu "${filename}"
+	done
+
+	# install mime types
+	insinto /usr/share/mime/application
+	for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" -name "application-*.xml"); do
+		basefilename=$(basename "${filename}")
+		mv "${filename}" "${T}/${basefilename#application-}"
+		doins "${T}/${basefilename#application-}"
+	done
+}
+
+pkg_nofetch() {
+	einfo "Please place the Wolfram Mathematica installation file ${SRC_URI}"
+	einfo "in your \$\{DISTDIR\}."
+	einfo "Note that to actually run and use Mathematica you need a valid license."
+	einfo "Wolfram provides time-limited evaluation licenses at ${HOMEPAGE}"
+}
diff --git a/sci-mathematics/mathlib-tools/Manifest b/sci-mathematics/mathlib-tools/Manifest
index d2fc08050435..ae38fe3ae8d7 100644
--- a/sci-mathematics/mathlib-tools/Manifest
+++ b/sci-mathematics/mathlib-tools/Manifest
@@ -1,3 +1,3 @@
 DIST mathlib-tools-1.1.0.tar.gz 32374 BLAKE2B f470927cae1dc66478efd44de6a5fd7c8df9656351ee342d14a1e75e8774383616cedf01b21ef1b92220fb03b1f1ccb326e3363dd0fec4fb5876f43c5ddb4010 SHA512 bc59d2e41c42ecc22c5768ac3adb209f0b170e2e97fe68483d8518b78a6b4fa163c1d46e4e3996c6f3e0aaa329c642fd111b3e16d850f40b6edc81c81215d03f
-EBUILD mathlib-tools-1.1.0.ebuild 1241 BLAKE2B 7b636b9be79404b2f46e7d3a5eb0d501a0267cdd00e84963eafd1ccaf91c343aefc93b2ae17b1662cf3d3ccbabbcb2be38d6bbf823122238d4264e14aaba1f8b SHA512 b695d4886cb7b36c944c40153d1ae1bf8e80ece5aa6c0c8e70be0d1b421dc5dad144089991d239d6957c8f50dd2a746a588add440c15af1e74565399135a984c
-MISC metadata.xml 738 BLAKE2B 8ac6b5355d564ff532b2158189adf95190dfd36b7d7fca1986c8ea24821b0062d65c27317b60b13b4b0541e68e89f014b477c299a651bed65b54cf5288fc8d34 SHA512 c5add5d3f3bdcda89f635067ed442eee731f9648048ab28aff005041ea3f223e196a80186e15b8b67553ee66db1409bd3c6af85cb453635db0c31fd89685d4a8
+EBUILD mathlib-tools-1.1.0.ebuild 1244 BLAKE2B 41ecfb20940515bc5aa8815b85be3f80f3660875fd6b5def8308d10a7859eec07735ca3438129d1787b114e6b308596481dd7621fdbea9072ed64f5b0e266280 SHA512 9223836891bd6d4fb94778e5e449c96c536799cbcdb8889aa3c803e569d1bcd6c528b72f5d3bf7d18413b20d4e1bd7c22cc6077b4a302f041c531c1a1a847702
+MISC metadata.xml 739 BLAKE2B 9761a9dfaccb53c0efffe372f23ab8ab06c72de96e511d4aa4cc0b4adba6635ab115253459d0339e38e4098dbfa76227676dbb2ad3e1d57572bd84d1a70bb108 SHA512 cc21a9daf83f052f665f6a2fe2d3074e1ddbbb560fdcc84a8bf0664c5bedea1ea7d2d435c9902e941c7aece0410edf7d319e482cc18919ec2703ea6330d3555b
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.ebuild
index ce6f9c8adf9e..76f08c06d208 100644
--- a/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.ebuild
+++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.1.0.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=8
 
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/sci-mathematics/mathlib-tools/metadata.xml b/sci-mathematics/mathlib-tools/metadata.xml
index 9859ea5c8b42..d2b17cbe5953 100644
--- a/sci-mathematics/mathlib-tools/metadata.xml
+++ b/sci-mathematics/mathlib-tools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/metamath/Manifest b/sci-mathematics/metamath/Manifest
index efff7865960e..fdfcc4c77c57 100644
--- a/sci-mathematics/metamath/Manifest
+++ b/sci-mathematics/metamath/Manifest
@@ -1,4 +1,4 @@
 AUX metamath-configure.ac-dont_force_optimize.patch 490 BLAKE2B 5a7175a72b32ecb1991f01a481459543bf9fdc511ded4bbe1551d5991710f3176575b7ebbea50c6aff3cb4087370960249e78223b84df6337304c1eb7dfaf460 SHA512 882ebb713e6209af28d39fbe120aac223337602d3553e93bfe2649237f6f03cc5dc5ab610ae0f051054f24668ecea85293ce9a1bac6fb8b635a52f93e9cf806f
 DIST metamath-0.198.tar.gz 468593 BLAKE2B 030bc61f5d8f0c02d473fcd2802b3411c96eff04f7144b966f1f098aec3a65218137228f4d97ba96aaa190386802db00865b9e997b399ce06b19d421c335f2bf SHA512 607c0a8208b9414b36bf82a1fcb0b826e9bfa4cbcec0337be58f3e890b91473649b115403227f440b9774e5653434ffdf09f0ab82c2f5af59eac0d11b9d09942
 EBUILD metamath-0.198.ebuild 632 BLAKE2B f5df87080cce63d8410cd70d7979350582e40357fc9fbabe86bff8d8ba4434d6170a1d1ecfefe5f1d5ad5a3b7ca8f456f5eaecb406490631539a009d53d95677 SHA512 dea937a871e03eece4f72a81e6814013ddfc7266da2aa708394c1dc35a4584d565d42260b05b116290d8529ed909605fb8bc627e2015e44848fef6fc539b249c
-MISC metadata.xml 635 BLAKE2B dccfae75c331c81b14e7bda8efe077f10dd6c92793a8834a189f02c7803775aca5237499af2042854121b4f6acf5d7a1919488ed659c64f364ff6963c3bd4543 SHA512 81b87f82b5ed9cd89faa674c002bd085acdc4cdb1c3441701e8945d8dac0eb85399660e9e4774732c31d0fb0e6b9628817bdbd4b2154073a1875da925baa4ab4
+MISC metadata.xml 636 BLAKE2B 9eeac379ea80537a65c408f7236376e3710ccc619c6bab34824ba6de08b762e5acae925ce6975f59d92db7f166d5b9fdd8619934a3b6eb54ab8844d9b4c18175 SHA512 d90c4a36c4e68af955af173f17300ebb59d26004fd799c25bfc7f99218c04611e2ea042e6487637445c35d05bbf38b8ce93cfbc2e04dd1ce3d74e58af25ff440
diff --git a/sci-mathematics/metamath/metadata.xml b/sci-mathematics/metamath/metadata.xml
index 7107a9aad059..b5aa4cee8574 100644
--- a/sci-mathematics/metamath/metadata.xml
+++ b/sci-mathematics/metamath/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/minisat/Manifest b/sci-mathematics/minisat/Manifest
index 3e2e561057fe..ed887b8cb2cf 100644
--- a/sci-mathematics/minisat/Manifest
+++ b/sci-mathematics/minisat/Manifest
@@ -1,7 +1,5 @@
-AUX minisat-2.2.0_p20130925-nusmv.patch 17540 BLAKE2B 4dee908cb3b7f466ea2fa908667d37ebd3298069f6b09dafb1e5fd50a1e4f0bba318151efd38385b7e7571f0aa753dd34191fa3b08f64ad626f777c0df8528db SHA512 cfad7fb104f8630396f745144da7c052b1e6d5eb3ac9f3cc86a71c9d1353664ea9ece3cbd977f12a9d3a18efc245e33eb97bb949516c5620d3f6b76aa3c1586c
+AUX minisat-2.2.1-cmake.patch 1971 BLAKE2B f194354706bafb51111648221b9ccb03c808caf245a45a0cc00bfd06d5167e46963bfe3c66164dd9df34373cc74ea36e4b11b69b9806363decc925b4db469d07 SHA512 5ceb69491e6a5dd6d7438f567a9c92f7c39e7e93fae776f901e6df1b855d2242941df3bf34e8e147992a9ed5b5120704172c4c9502db5f8baf962c058d26679e
 DIST MiniSat.pdf 327416 BLAKE2B 77f77d763c9554680b4c5e1688801e8462102e8ddbcc3b53badccee17a98f935ef0e971a636abeb04021a2b3a3e9d6acfe4828b5dd20e6ef8733d71788cc31b0 SHA512 94e70c721740c0b7fd52621c7a5e43dd9207eed92e60a1c64ee63b541b9861d2580d14ba64c49c6c4f273ac028ded43bc944c71131e51693cdd7d1763af582f6
-DIST minisat-2.2.0_p20130925.tar.gz 49544 BLAKE2B 8c6893fb6c604140609c36cc912c02a73c1f2726d7f399595c50d674aff69c57f9c4914da6d95c37a46fefc218dd4b0550645bd7058d46640d08103e2a4ec333 SHA512 37fc35cc4f3104d7f0e8ee9f7123fc34e175df578658266799d809d71d6cf081e811919f304a02f6cb9c3827d308e59408149d63d1d1e7c6d0b495350f93b3d9
 DIST minisat-2.2.1.tar.gz 50485 BLAKE2B 58c292f0b90dd459fa29fadbf9e2b20106406c08df9ce98f40138b12a8f001b4ab72f661815d1254c6c90158c3d6e3df339c784552605a935ebc5e703b2d8768 SHA512 a69734e1a70fe056f9dfd479fe4e6e25bc418d3631c1c2d0dea1190ffe9f86b1fc5e9aabaf3772a752fe654551f1e84e47fcb8655f6fe25176efc8d8bc96c663
-EBUILD minisat-2.2.0_p20130925-r1.ebuild 1612 BLAKE2B 4198df59696fa88b779ab8ea9954a1f53db39b8e9dfaf1c80897f5a772d9436731579ec2adf59d292bb0d9aa6baab446057333188838ed2a6548efd6ef5990fa SHA512 2bcbf4aeadb12e0998bdc97065c527dbeb29b155e352feaf4b871b89028a1784025c71e8e2f9ee27a135056feeb4fd557967c5d0e130b0b88ef7cfdc396aa438
-EBUILD minisat-2.2.1.ebuild 700 BLAKE2B e911c31d9ed3f6847e80f832f657fe06cce9fcc1faa75ab97fdb819dee89eae24094089ef41148ad85a0ea41619a8db66c96a5a4508c293b15c647010d204e00 SHA512 68a4c1bfc7d8deeeb401b8d1d11a994cc75731fb5a0b14ce9d11063a4578bfad848db462efe146591134db2b653c3366a2d59bfdce51aec7ecd2cfcaffc98fa2
-MISC metadata.xml 1285 BLAKE2B ac5f5813e82419840d0a004e623b08d88967bbf9e4e617c2ec23bdd574c67cee349f83aefcf719aa4151b991eaa6e5ee5fe0a1fcc955bd56b6bc6cb84cda3235 SHA512 ee16bf934be05d0128e0d9bce30dc9fab70a6b8934e6d6047a8e9a11a9558cd0fbe824323b98573589f6bd6cc2eae925f591d9cd97193d5f63769d28074e5fd0
+EBUILD minisat-2.2.1-r1.ebuild 639 BLAKE2B 651b93daea22d747fb472004c0f48643490ee8c15f1e1de43aa73f4df848309b610b01c8e79530f64517a78e5720c6c22b94e95b87871ea63a600a67ee09a8e7 SHA512 5adda43272e97882dcff9df129e18720eeb6e2dd7ead21a86f3448af08300699ed2ba01e0d53951dfd27ac7d7e4031766fd3c0a9c5139a1b1d60882493556286
+MISC metadata.xml 1244 BLAKE2B 7ef490fc9e45d1f9af7e5b40028614d71557e055fea15289dffcf4afc16fe72ecfa48b4dc7508ee042f603bd7035ccdc529b3640f33d67e96b3b5ede433455c4 SHA512 e6dbcbc2433da6491c94eefbcdf78d5634ca17c4c2e6174a832b46b75a6771cb1b7d92a3fe14d739dc9215a78126e40fe8447b2b3a65c355f9addcf4084ffe3d
diff --git a/sci-mathematics/minisat/files/minisat-2.2.0_p20130925-nusmv.patch b/sci-mathematics/minisat/files/minisat-2.2.0_p20130925-nusmv.patch
deleted file mode 100644
index 4b17c8fb44bb..000000000000
--- a/sci-mathematics/minisat/files/minisat-2.2.0_p20130925-nusmv.patch
+++ /dev/null
@@ -1,527 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -69,8 +89,8 @@
- VERB=
- endif
- 
--SRCS = $(wildcard minisat/core/*.cc) $(wildcard minisat/simp/*.cc) $(wildcard minisat/utils/*.cc)
--HDRS = $(wildcard minisat/mtl/*.h) $(wildcard minisat/core/*.h) $(wildcard minisat/simp/*.h) $(wildcard minisat/utils/*.h)
-+SRCS = $(wildcard minisat/core/*.cc) $(wildcard minisat/simp/*.cc) $(wildcard minisat/utils/*.cc) $(wildcard minisat/proof/*.cc)
-+HDRS = $(wildcard minisat/mtl/*.h) $(wildcard minisat/core/*.h) $(wildcard minisat/simp/*.h) $(wildcard minisat/utils/*.h) $(wildcard minisat/proof/*.h)
- OBJS = $(filter-out %Main.o, $(SRCS:.cc=.o))
- 
- r:	$(BUILD_DIR)/release/bin/$(MINISAT)
-@@ -89,7 +109,7 @@
- lsh:	$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE)
- 
- ## Build-type Compile-flags:
--$(BUILD_DIR)/release/%.o:			MINISAT_CXXFLAGS +=$(MINISAT_REL) $(MINISAT_RELSYM)
-+$(BUILD_DIR)/release/%.o:			MINISAT_CXXFLAGS +=$(MINISAT_REL) $(MINISAT_RELSYM) $(MINISAT_FPIC)
- $(BUILD_DIR)/debug/%.o:				MINISAT_CXXFLAGS +=$(MINISAT_DEB) -g
- $(BUILD_DIR)/profile/%.o:			MINISAT_CXXFLAGS +=$(MINISAT_PRF) -pg
- $(BUILD_DIR)/dynamic/%.o:			MINISAT_CXXFLAGS +=$(MINISAT_REL) $(MINISAT_FPIC)
-@@ -195,7 +215,7 @@
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(INSTALL) -m 755 $(BUILD_DIR)/dynamic/bin/$(MINISAT) $(DESTDIR)$(bindir)
- 
--clean:
-+origclean:
- 	rm -f $(foreach t, release debug profile dynamic, $(foreach o, $(SRCS:.cc=.o), $(BUILD_DIR)/$t/$o)) \
-           $(foreach t, release debug profile dynamic, $(foreach d, $(SRCS:.cc=.d), $(BUILD_DIR)/$t/$d)) \
- 	  $(foreach t, release debug profile dynamic, $(BUILD_DIR)/$t/bin/$(MINISAT_CORE) $(BUILD_DIR)/$t/bin/$(MINISAT)) \
-@@ -203,6 +223,7 @@
- 	  $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE)\
- 	  $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR)\
- 	  $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB)
-+	rm -f $(NUSMV_LIBNAME)
- 
- distclean:	clean
- 	rm -f config.mk
---- a/minisat/core/Solver.cc
-+++ b/minisat/core/Solver.cc
-@@ -101,7 +101,16 @@
-   , conflict_budget    (-1)
-   , propagation_budget (-1)
-   , asynch_interrupt   (false)
--{}
-+{
-+    // NuSMV: MOD BEGIN
-+    /* Disables "progress saving" which relies on last polarity
-+       assigned to a var when branching. Polarity for us is forced to
-+       be false. See http://reasoning.cs.ucla.edu/fetch.php?id=69&type=pdf
-+    */
-+    phase_saving = 0;
-+    default_polarity = l_Undef;
-+    // NuSMV: MOD END
-+}   
- 
- 
- Solver::~Solver()
-@@ -250,8 +259,19 @@
- {
-     Var next = var_Undef;
- 
-+    // NuSMV: PREF MOD
-+    // Selection from preferred list
-+    for (int i = 0; i < preferred.size(); i++) {
-+      if (value(preferred[i]) == l_Undef) {
-+        next = preferred[i];
-+        break;
-+      }
-+    }
-+    // NuSMV: PREF MOD END
-+
-     // Random decision:
--    if (drand(random_seed) < random_var_freq && !order_heap.empty()){
-+    if (next == var_Undef && // NuSMV: PREF MOD
-+        drand(random_seed) < random_var_freq && !order_heap.empty()){
-         next = order_heap[irand(random_seed,order_heap.size())];
-         if (value(next) == l_Undef && decision[next])
-             rnd_decisions++; }
-@@ -269,6 +289,8 @@
-         return lit_Undef;
-     else if (user_pol[next] != l_Undef)
-         return mkLit(next, user_pol[next] == l_True);
-+    else if (default_polarity != l_Undef) // NuSMV
-+        return mkLit(next, default_polarity == l_True);
-     else if (rnd_pol)
-         return mkLit(next, drand(random_seed) < 0.5);
-     else
-@@ -620,6 +642,19 @@
- }
- 
- 
-+// NuSMV: PREF MOD
-+void Solver::addPreferred(Var v)
-+{
-+    preferred.push(v);
-+}
-+
-+void Solver::clearPreferred()
-+{
-+    preferred.clear(0);
-+}
-+// NuSMV: PREF MOD END
-+
-+
- void Solver::rebuildOrderHeap()
- {
-     vec<Var> vs;
---- a/minisat/core/Solver.h
-+++ b/minisat/core/Solver.h
-@@ -90,6 +90,19 @@
-     void    setPolarity    (Var v, lbool b); // Declare which polarity the decision heuristic should use for a variable. Requires mode 'polarity_user'.
-     void    setDecisionVar (Var v, bool b);  // Declare if a variable should be eligible for selection in the decision heuristic.
- 
-+    // NuSMV: PREF MOD
-+    /*
-+     * Add a variable at the end of the list of preferred variables
-+     * Does not remove the variable from the standard ordering.
-+     */
-+    void addPreferred(Var v);
-+    
-+    /*
-+     * Clear vector of preferred variables.
-+     */
-+    void clearPreferred();
-+    // NuSMV: PREF MOD END
-+    
-     // Read state:
-     //
-     lbool   value      (Var x) const;       // The current value of a variable.
-@@ -134,6 +147,8 @@
-     int       ccmin_mode;         // Controls conflict clause minimization (0=none, 1=basic, 2=deep).
-     int       phase_saving;       // Controls the level of phase saving (0=none, 1=limited, 2=full).
-     bool      rnd_pol;            // Use random polarities for branching heuristics.
-+    lbool     default_polarity; // NuSMV: default polarity for vars
-+    
-     bool      rnd_init_act;       // Initialize variable activities with a small random value.
-     double    garbage_frac;       // The fraction of wasted memory allowed before a garbage collection is triggered.
-     int       min_learnts_lim;    // Minimum number to set the learnts limit to.
-@@ -215,6 +230,10 @@
-     Var                 next_var;         // Next variable to be created.
-     ClauseAllocator     ca;
- 
-+    // NuSMV: PREF MOD
-+    vec<Var>            preferred;
-+    // NuSMV: PREF MOD END
-+
-     vec<Var>            released_vars;
-     vec<Var>            free_vars;
- 
---- a/minisat/core/SolverTypes.h
-+++ b/minisat/core/SolverTypes.h
-@@ -52,7 +52,7 @@
-     int     x;
- 
-     // Use this as a constructor:
--    friend Lit mkLit(Var var, bool sign = false);
-+    friend Lit mkLit(Var var, bool sign);
- 
-     bool operator == (Lit p) const { return x == p.x; }
-     bool operator != (Lit p) const { return x != p.x; }
-@@ -61,6 +61,7 @@
- 
- 
- inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
-+inline  Lit  mkLit     (Var var)            { return mkLit(var, false); }
- inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }
- inline  Lit  operator ^(Lit p, bool b)      { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
- inline  bool sign      (Lit p)              { return p.x & 1; }
-@@ -120,6 +121,7 @@
- inline int   toInt  (lbool l) { return l.value; }
- inline lbool toLbool(int   v) { return lbool((uint8_t)v);  }
- 
-+#define MINISAT_CONSTANTS_AS_MACROS
- #if defined(MINISAT_CONSTANTS_AS_MACROS)
-   #define l_True  (lbool((uint8_t)0)) // gcc does not do constant propagation if these are real constants.
-   #define l_False (lbool((uint8_t)1))
---- a/minisat/simp/Solver_C.cc
-+++ b/minisat/simp/Solver_C.cc
-@@ -0,0 +1,246 @@
-+
-+/**************************************************************************************************
-+
-+Solver_C.C
-+
-+C-wrapper for Solver.C
-+
-+  This file is part of NuSMV version 2. 
-+  Copyright (C) 2007 by FBK-irst. 
-+  Author: Roberto Cavada <cavada@fbk.eu>
-+
-+  NuSMV version 2 is free software; you can redistribute it and/or 
-+  modify it under the terms of the GNU Lesser General Public 
-+  License as published by the Free Software Foundation; either 
-+  version 2 of the License, or (at your option) any later version.
-+
-+  NuSMV version 2 is distributed in the hope that it will be useful, 
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public 
-+  License along with this library; if not, write to the Free Software 
-+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-+
-+  For more information on NuSMV see <http://nusmv.fbk.eu>
-+  or email to <nusmv-users@fbk.eu>.
-+  Please report bugs to <nusmv-users@fbk.eu>.
-+
-+  To contact the NuSMV development board, email to <nusmv@fbk.eu>. ]
-+
-+**************************************************************************************************/
-+
-+
-+#include "SimpSolver.h"
-+extern "C" {
-+#include "Solver_C.h"
-+}
-+
-+namespace {
-+using Minisat::lbool;
-+} // namespace
-+
-+extern "C" MiniSat_ptr MiniSat_Create()
-+{
-+  Minisat::SimpSolver *s = new Minisat::SimpSolver();
-+  s->default_polarity = l_True;
-+  return (MiniSat_ptr)s;
-+}
-+
-+extern "C" void MiniSat_Delete(MiniSat_ptr ms)
-+{
-+  delete (Minisat::SimpSolver *)ms;
-+}
-+
-+extern "C" int MiniSat_Nof_Variables(MiniSat_ptr ms)
-+{
-+  return ((Minisat::SimpSolver *)ms)->nVars();
-+}
-+
-+extern "C" int MiniSat_Nof_Clauses(MiniSat_ptr ms)
-+{
-+  return ((Minisat::SimpSolver *)ms)->nClauses();
-+}
-+
-+/* variables are in the range 1...N */
-+extern "C" int MiniSat_New_Variable(MiniSat_ptr ms)
-+{
-+  /* Actually, minisat used variable range 0 .. N-1,
-+     so in all function below there is a convertion between
-+     input variable (1..N) and internal variables (0..N-1)
-+  */	
-+  Minisat::Var var = ((Minisat::SimpSolver *)ms)->newVar();
-+  ((Minisat::SimpSolver *)ms)->setFrozen(var, true);
-+  return var+1;
-+}
-+
-+
-+/*
-+ * Here clauses are in dimacs form, variable indexing is 1...N
-+ */
-+extern "C" int MiniSat_Add_Clause(MiniSat_ptr ms,
-+                                  int *clause_lits, int num_lits)
-+{
-+  int i;
-+  Minisat::vec<Minisat::Lit> cl;
-+  for(i = 0; i < num_lits; ++i) {
-+    const int lit = clause_lits[i];
-+    assert(abs(lit) > 0);
-+    assert(abs(lit) <= MiniSat_Nof_Variables((Minisat::SimpSolver*)ms));
-+    int var = abs(lit) - 1;
-+    cl.push((lit > 0) ? Minisat::mkLit(var) : ~ Minisat::mkLit(var));
-+  }
-+  ((Minisat::SimpSolver *)ms)->addClause(cl);
-+
-+  if(((Minisat::SimpSolver *)ms)->okay()) return 1;
-+  return 0;
-+}
-+
-+extern "C" int MiniSat_Solve(MiniSat_ptr ms)
-+{
-+  bool ret = ((Minisat::SimpSolver *)ms)->solve();
-+  if(ret) return 1;
-+  return 0;
-+}
-+
-+/*
-+ * Here the assumption is in "dimacs form", variable indexing is 1...N
-+ */
-+extern "C" int MiniSat_Solve_Assume(MiniSat_ptr ms,
-+				    int nof_assumed_lits,
-+				    int *assumed_lits)
-+{
-+  int i;
-+  Minisat::vec<Minisat::Lit> cl;
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);
-+
-+  solver.simplify();
-+  if(solver.okay() == false) return 0;
-+
-+  assert(nof_assumed_lits >= 0);
-+  for(i = 0; i < nof_assumed_lits; ++i) {
-+    const int lit = assumed_lits[i];
-+    assert(abs(lit) > 0);
-+    assert(abs(lit) <= MiniSat_Nof_Variables((Minisat::SimpSolver*)ms));
-+    int var = abs(lit) - 1;
-+    cl.push((lit > 0) ? Minisat::mkLit(var) : ~Minisat::mkLit(var));
-+  }
-+
-+  if (solver.solve(cl)) return 1;
-+  return 0;
-+}
-+
-+extern "C" int MiniSat_simplifyDB(MiniSat_ptr ms)
-+{
-+  ((Minisat::SimpSolver *)ms)->simplify();
-+  if(((Minisat::SimpSolver *)ms)->okay()) return 1;
-+  return 0;
-+}
-+
-+/*
-+ * Here variables are numbered 1...N
-+ */
-+extern "C" int MiniSat_Get_Value(MiniSat_ptr ms, int var_num)
-+{
-+  assert(var_num > 0);
-+  if(var_num > MiniSat_Nof_Variables(ms)) return -1;
-+  /* minisat assigns all variables. just check */
-+  assert(((Minisat::SimpSolver *)ms)->model[var_num-1] != l_Undef); 
-+  
-+  if(((Minisat::SimpSolver *)ms)->model[var_num-1] == l_True) return 1;
-+  return 0;
-+}
-+
-+extern "C" int MiniSat_Get_Nof_Conflict_Lits(MiniSat_ptr ms)
-+{
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);
-+
-+  return solver.conflict.size();
-+}
-+
-+extern "C" void MiniSat_Get_Conflict_Lits(MiniSat_ptr ms, int* conflict_lits)
-+{
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);
-+
-+  Minisat::LSet& cf = solver.conflict;
-+
-+  for (int i = 0; i < cf.size(); ++i) {
-+    int v = Minisat::var(~cf[i]);
-+    int s = Minisat::sign(~cf[i]);
-+    assert(v != Minisat::var_Undef);
-+    conflict_lits[i] = (s == 0) ? (v+1) : -(v+1);
-+  }
-+}
-+
-+/** mode can be  polarity_user, polarity_rnd */
-+extern "C" void MiniSat_Set_Polarity_Mode(MiniSat_ptr ms, int mode)
-+{
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  assert(__polarity_unsupported != mode); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);  
-+  if (polarity_rnd == mode) {
-+    solver.rnd_pol = true;
-+    solver.default_polarity = l_Undef;
-+  }
-+  else {
-+    // assert(polarity_user == mode);
-+    solver.rnd_pol = false;
-+    switch (mode) {
-+    case polarity_false:
-+      solver.default_polarity = l_True;
-+      break;
-+    case polarity_true:
-+      solver.default_polarity = l_False;
-+      break;
-+    default: // polarity_user
-+      solver.default_polarity = l_Undef;
-+      break;
-+    }
-+  }
-+}
-+
-+extern "C" int MiniSat_Get_Polarity_Mode(MiniSat_ptr ms)
-+{
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);  
-+  //return solver.rnd_pol ? polarity_rnd : polarity_user;
-+  if (solver.rnd_pol) {
-+    return polarity_rnd;
-+  } else if (solver.default_polarity == l_True) {
-+    return polarity_false;
-+  } else if (solver.default_polarity == l_False) {
-+    return polarity_true;
-+  } else {
-+    return polarity_user;
-+  }
-+}
-+
-+extern "C" void MiniSat_Set_Random_Seed(MiniSat_ptr ms, double seed)
-+{
-+  assert(((Minisat::SimpSolver*)0) != ((Minisat::SimpSolver*)ms)); 
-+  Minisat::SimpSolver& solver = *((Minisat::SimpSolver*)ms);
-+  solver.random_seed = seed;
-+}
-+
-+
-+// NuSMV: PREF MOD
-+/* variables are in the range 1...N */
-+extern "C" void MiniSat_Set_Preferred_Variable(MiniSat_ptr ms, int x)
-+{
-+  /* Actually, minisat used variable range 0 .. N-1,
-+     so in all function below there is a convertion between
-+     input variable (1..N) and internal variables (0..N-1)
-+  */
-+  ((Minisat::SimpSolver *)ms)->addPreferred((Minisat::Var) x);
-+}
-+
-+extern "C" void MiniSat_Clear_Preferred_Variables(MiniSat_ptr ms)
-+{
-+
-+  ((Minisat::SimpSolver *)ms)->clearPreferred();
-+}
-+// NuSMV: PREF MOD END
---- a/minisat/simp/Solver_C.h
-+++ b/minisat/simp/Solver_C.h
-@@ -0,0 +1,72 @@
-+/**************************************************************************************************
-+
-+Solver_C.h
-+
-+C-wrapper for Solver.h
-+
-+  This file is part of NuSMV version 2. 
-+  Copyright (C) 2007 by FBK-irst. 
-+  Author: Roberto Cavada <cavada@fbk.eu>
-+
-+  NuSMV version 2 is free software; you can redistribute it and/or 
-+  modify it under the terms of the GNU Lesser General Public 
-+  License as published by the Free Software Foundation; either 
-+  version 2 of the License, or (at your option) any later version.
-+
-+  NuSMV version 2 is distributed in the hope that it will be useful, 
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public 
-+  License along with this library; if not, write to the Free Software 
-+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-+
-+  For more information on NuSMV see <http://nusmv.fbk.eu>
-+  or email to <nusmv-users@fbk.eu>.
-+  Please report bugs to <nusmv-users@fbk.eu>.
-+
-+  To contact the NuSMV development board, email to <nusmv@fbk.eu>. ]
-+
-+**************************************************************************************************/
-+
-+#ifndef SOLVER_C_h
-+#define SOLVER_C_h
-+
-+//=================================================================================================
-+// Solver -- the main class:
-+
-+#define MiniSat_ptr void *
-+
-+enum {
-+  __polarity_unsupported = -1,
-+  polarity_true = 0, 
-+  polarity_false = 1, 
-+  polarity_user = 2,  
-+  polarity_rnd = 3,
-+};
-+
-+MiniSat_ptr MiniSat_Create();
-+void MiniSat_Delete(MiniSat_ptr);
-+int MiniSat_Nof_Variables(MiniSat_ptr);
-+int MiniSat_Nof_Clauses(MiniSat_ptr);
-+int MiniSat_New_Variable(MiniSat_ptr);
-+int MiniSat_Add_Clause(MiniSat_ptr, int *clause_lits, int num_lits);
-+int MiniSat_Solve(MiniSat_ptr);
-+int MiniSat_Solve_Assume(MiniSat_ptr, int nof_assumed_lits, int *assumed_lits);
-+int MiniSat_simplifyDB(MiniSat_ptr);
-+int MiniSat_Get_Value(MiniSat_ptr, int var_num);
-+int MiniSat_Get_Nof_Conflict_Lits(MiniSat_ptr ms);
-+void MiniSat_Get_Conflict_Lits(MiniSat_ptr ms, int* conflict_lits);
-+
-+void MiniSat_Set_Polarity_Mode(MiniSat_ptr ms, int mode);
-+int MiniSat_Get_Polarity_Mode(MiniSat_ptr ms);
-+void MiniSat_Set_Random_Seed(MiniSat_ptr ms, double seed);
-+
-+// NuSMV: PREF MOD
-+void MiniSat_Set_Preferred_Variable(MiniSat_ptr, int);
-+void MiniSat_Clear_Preferred_Variables(MiniSat_ptr);
-+// NuSMV: PREF MOD END
-+
-+//=================================================================================================
-+#endif
---- a/minisat/utils/System.cc
-+++ b/minisat/utils/System.cc
-@@ -77,7 +77,7 @@
-     struct rusage ru;
-     getrusage(RUSAGE_SELF, &ru);
-     return (double)ru.ru_maxrss / 1024; }
--double Minisat::memUsedPeak() { return memUsed(); }
-+double Minisat::memUsedPeak(bool strictlyPeak) { return memUsed(); }
- 
- 
- #elif defined(__APPLE__)
-@@ -87,11 +87,11 @@
-     malloc_statistics_t t;
-     malloc_zone_statistics(NULL, &t);
-     return (double)t.max_size_in_use / (1024*1024); }
--double Minisat::memUsedPeak() { return memUsed(); }
-+double Minisat::memUsedPeak(bool strictlyPeak) { return memUsed(); }
- 
- #else
- double Minisat::memUsed()     { return 0; }
--double Minisat::memUsedPeak() { return 0; }
-+double Minisat::memUsedPeak(bool strictlyPeak) { return 0; }
- #endif
- 
- 
diff --git a/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch b/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch
new file mode 100644
index 000000000000..1c875827f6ac
--- /dev/null
+++ b/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch
@@ -0,0 +1,54 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ 
+ project(minisat)
+ 
++include(GNUInstallDirs)
+ #--------------------------------------------------------------------------------------------------
+ # Configurable options:
+ 
+@@ -44,24 +45,16 @@
+     minisat/core/Solver.cc
+     minisat/simp/SimpSolver.cc)
+ 
+-add_library(minisat-lib-static STATIC ${MINISAT_LIB_SOURCES})
+ add_library(minisat-lib-shared SHARED ${MINISAT_LIB_SOURCES})
+ 
+ target_link_libraries(minisat-lib-shared ${ZLIB_LIBRARY})
+-target_link_libraries(minisat-lib-static ${ZLIB_LIBRARY})
+ 
+ add_executable(minisat_core minisat/core/Main.cc)
+ add_executable(minisat_simp minisat/simp/Main.cc)
+ 
+-if(STATIC_BINARIES)
+-  target_link_libraries(minisat_core minisat-lib-static)
+-  target_link_libraries(minisat_simp minisat-lib-static)
+-else()
+-  target_link_libraries(minisat_core minisat-lib-shared)
+-  target_link_libraries(minisat_simp minisat-lib-shared)
+-endif()
++target_link_libraries(minisat_core minisat-lib-shared)
++target_link_libraries(minisat_simp minisat-lib-shared)
+ 
+-set_target_properties(minisat-lib-static PROPERTIES OUTPUT_NAME "minisat")
+ set_target_properties(minisat-lib-shared
+   PROPERTIES
+     OUTPUT_NAME "minisat" 
+@@ -73,11 +66,11 @@
+ #--------------------------------------------------------------------------------------------------
+ # Installation targets:
+ 
+-install(TARGETS minisat-lib-static minisat-lib-shared minisat_core minisat_simp 
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++install(TARGETS minisat-lib-shared minisat_core minisat_simp 
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(DIRECTORY minisat/mtl minisat/utils minisat/core minisat/simp
+-        DESTINATION include/minisat
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/minisat
+         FILES_MATCHING PATTERN "*.h")
diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index 812aa0c09202..68f253bc3c2d 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    MiniSat is a minimalistic, open-source SAT solver, developed to help
-    researchers and developers alike to get started on SAT. It is released
-    under the MIT licence, and is currently used in a number of projects.
-    MiniSat is small and well-documented, and possibly also well-designed,
-    making it an ideal starting point for adapting SAT based techniques to
-    domain specific problems.
-    Winning all the industrial categories of the SAT 2005 competition, MiniSat
-    is a good starting point both for future research in SAT, and for
-    applications using SAT.
-    MiniSat supports incremental SAT and has mechanisms for adding non-clausal
-    constraints. By virtue of being easy to modify, it is a good choice for
-    integrating as a backend to another tool, such as a model checker or a more
-    generic constraint solver.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">niklasso/minisat</remote-id>
-    <remote-id type="github">stp/minisat</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		MiniSat is a minimalistic, open-source SAT solver, developed to help
+		researchers and developers alike to get started on SAT. It is released
+		under the MIT licence, and is currently used in a number of projects.
+		MiniSat is small and well-documented, and possibly also well-designed,
+		making it an ideal starting point for adapting SAT based techniques to
+		domain specific problems.
+		Winning all the industrial categories of the SAT 2005 competition, MiniSat
+		is a good starting point both for future research in SAT, and for
+		applications using SAT.
+		MiniSat supports incremental SAT and has mechanisms for adding non-clausal
+		constraints. By virtue of being easy to modify, it is a good choice for
+		integrating as a backend to another tool, such as a model checker or a more
+		generic constraint solver.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">niklasso/minisat</remote-id>
+		<remote-id type="github">stp/minisat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild b/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
deleted file mode 100644
index 39e62e229e7d..000000000000
--- a/sci-mathematics/minisat/minisat-2.2.0_p20130925-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Small yet efficient SAT solver with reference paper"
-HOMEPAGE="http://minisat.se/Main.html"
-COMMIT=37dc6c67e2af26379d88ce349eb9c4c6160e8543
-SRC_URI="https://github.com/niklasso/minisat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT"
-
-IUSE="debug doc"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-DOCS=( README doc/ReleaseNotes-${PV%_*}.txt )
-PATCHES=( "${FILESDIR}"/${P}-nusmv.patch )
-
-src_prepare() {
-	default
-	# Remove makefile silencing and
-	# Remove static linking by default
-	sed -i -e "s/VERB=@/VERB=/" \
-		-e "s/--static //g" \
-		Makefile || die
-
-	sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \
-		Makefile || die
-
-	# Fix headers ( #include "minisat/..." -> #include <...> )
-	while IFS="" read -d $'\0' -r file; do
-		einfo Correcting header "$file"
-		sed -i -e 's:#include "minisat/\([^"]*\)":#include <minisat/\1>:g' "${file}" || die
-	done < <(find minisat -name "*.h" -print0)
-}
-
-src_configure() {
-	local minisat_cflags="${CFLAGS} -D NDEBUG -I${S}/minisat"
-	emake config prefix="${EPREFIX}"/usr MINISAT_RELSYM="" MINISAT_REL="${minisat_cflags}" MINISAT_PRF="${minisat_cflags}" MINISAT_DEB="${CFLAGS} -D DEBUG -I${S}/minisat"
-}
-
-src_compile() {
-	emake all $(usex debug d "")
-}
-
-src_install() {
-	use doc && DOCS+=( "${DISTDIR}"/MiniSat.pdf )
-	default
-
-	dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a
-}
diff --git a/sci-mathematics/minisat/minisat-2.2.1.ebuild b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
index 360c5a33082b..15d260429e0f 100644
--- a/sci-mathematics/minisat/minisat-2.2.1.ebuild
+++ b/sci-mathematics/minisat/minisat-2.2.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
@@ -11,19 +11,17 @@ SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.
 	doc? ( http://minisat.se/downloads/MiniSat.pdf )"
 S="${WORKDIR}/${PN}-releases-${PV}"
 
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
 IUSE="doc"
 
 RDEPEND="sys-libs/zlib:="
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
 src_install() {
 	cmake_src_install
-
-	mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) || die
-	dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a
-
 	use doc && dodoc "${DISTDIR}"/MiniSat.pdf
 }
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 041cee2b990d..fd0b6f6d6a60 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,5 +1,6 @@
-AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a70ad62f63fdaad76116948133dd1a915d17c0b6887adc936692de1a91e917954a0478ea30d5db0449e3ad43b5d35835da8 SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6
-AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
+AUX msieve-1.51-reduce-printf.patch 1073 BLAKE2B a977fb38ccfe9170bee1af8bdeed846ae5b2766f5b6c5334788748efc9c0a20e212a09df472452dbe1638d2a3fe5807d5f6fb38a934b38ccb9e8731dd0f57c21 SHA512 f675bbbe6070d3908fcfaff5ae4394b48b66e002c7b721e823aae83c9810a77272f7d148eb63b7bf1d2e2a473bf3aee26cc7a5f75d3e7d4b0b93771dd76f0325
+AUX msieve-1.53-fix-version.patch 1002 BLAKE2B 76f4e62f9e7714d75d0015ef6204b4a6b38663a49c9f941f961ad604fcc221909ca1ef5758d1a7389bff23bed4b1744e6db558963ac2a441dc49fa0d45a8e1ab SHA512 5069306c34a0fbd5ac9004495b1055f6e1d5f2fda57bfdb781609db0506f2a34625bc8fc1d4d00d1acfc9d893ed2c718ebcdc33b43ab576d601f06c7572729ce
+AUX msieve-1.53-makefile.patch 2983 BLAKE2B f6f6c3ddc7447d5e2e258c8d4689693f7545596b988a0de7d71be7b2b51684f939a1032e8a828141b422a1d09a7268193160c9b791a20075b0c78bfc71bb3126 SHA512 71e171edb313f78b9fcd7528d21c26b8e2a87b2bf262421699715281b4d642844e203aea8d6c5eecd4ea3bef1ea9c8d7e304b1aec5e6bb52052a1f0201886a2c
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
-EBUILD msieve-1.53-r1.ebuild 1232 BLAKE2B 2552549e4c0ced96b57a7643f4febcbb109a40885521d23408e48d265084345e2063b2bf9acea6007f254d287bf3b49be8b5e3b4fb3ab3d5c3cae7480952e120 SHA512 cdbca923a6d310ebade396846afd725a00b837fce68a422fc706d43a30135c581ee83db290b57571dcea60f3bad0add79bcc4e691f5bef46741b9e0f388d8b91
+EBUILD msieve-1.53-r1.ebuild 1050 BLAKE2B 24d80301ad0e2dcdec4aaaa45e9f540d2227238b297592c829c7e8d2fd7b128bbf1dae256a7a4cfcc35db74316c5170647d2f2f132d93ffe934f64d2de25ab4a SHA512 97ec470ce451f50860621e675a3382e24e2676b976a1f467264f890a99944addc2328dfe11361b734bbd6463966e058f6e6c700f98105f8a287925edf8abca91
 MISC metadata.xml 333 BLAKE2B d39c13d7d0b53f9e6bcd216bdd7e517152c3c74c8ef1b22e18dcc3a390ab7124cd2d9b6cfc81d5c9f58669572eed3045033b5154136dacc1729c9d50ddf28200 SHA512 692294346a4a20ac8daffe6d52026ae20200a673f88d2753780e676fa82f2bfef44c9081350ba724985af1030aaf41197c9dc6966b6c72fa7b973c81aee1e630
diff --git a/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
index 39892716716a..e3483b8d15bb 100644
--- a/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
+++ b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
@@ -1,6 +1,5 @@
-diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
---- msieve-1.50/common/minimize.c	2011-07-04 23:32:33.000000000 +0800
-+++ msieve-copy/common/minimize.c	2012-11-26 23:09:22.889240528 +0800
+--- a/common/minimize.c
++++ b/common/minimize.c
 @@ -210,7 +210,7 @@
  		}
  	}
@@ -10,9 +9,8 @@ diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
  	*min_out = x;
  	*status = 1;
  	return fx;
-diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c
---- msieve-1.50/gnfs/poly/stage2/optimize.c	2011-10-15 23:03:39.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/optimize.c	2012-11-26 23:14:36.243232414 +0800
+--- a/gnfs/poly/stage2/optimize.c
++++ b/gnfs/poly/stage2/optimize.c
 @@ -430,9 +430,9 @@
  #if 0
  	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
@@ -25,9 +23,8 @@ diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/
  #endif
  }
  
-diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c
---- msieve-1.50/gnfs/poly/stage2/stage2.c	2011-10-09 09:32:49.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/stage2.c	2012-11-26 23:14:30.894232552 +0800
+--- a/gnfs/poly/stage2/stage2.c
++++ b/gnfs/poly/stage2/stage2.c
 @@ -122,10 +122,10 @@
  	}
  
diff --git a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
index eb9a8d7ac2d0..c3ec73ac5987 100644
--- a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
+++ b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
@@ -1,5 +1,3 @@
-diff --git a/common/driver.c b/common/driver.c
-index ffecfa9..3e1da78 100644
 --- a/common/driver.c
 +++ b/common/driver.c
 @@ -189,10 +189,9 @@ void msieve_run(msieve_obj *obj) {
@@ -15,8 +13,6 @@ index ffecfa9..3e1da78 100644
  	start_time = time(NULL);
  	if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) {
  		printf("%s", ctime(&start_time));
-diff --git a/demo.c b/demo.c
-index a882732..ec3e869 100644
 --- a/demo.c
 +++ b/demo.c
 @@ -81,9 +81,8 @@ void get_random_seeds(uint32 *seed1, uint32 *seed2) {
diff --git a/sci-mathematics/msieve/files/msieve-1.53-makefile.patch b/sci-mathematics/msieve/files/msieve-1.53-makefile.patch
new file mode 100644
index 000000000000..2676cefff18b
--- /dev/null
+++ b/sci-mathematics/msieve/files/msieve-1.53-makefile.patch
@@ -0,0 +1,108 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,8 @@
+ 
+ # gcc with basic optimization (-march flag could
+ # get overridden by architecture-specific builds)
+-CC = gcc
+-WARN_FLAGS = -Wall -W
+-OPT_FLAGS = -O3 -fomit-frame-pointer -march=native \
+-	    -D_FILE_OFFSET_BITS=64 -DNDEBUG -D_LARGEFILE64_SOURCE
++CFLAGS += -Wall -W
++CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ 
+ # use := instead of = so we only run the following once
+ SVN_VERSION := $(shell svnversion .)
+@@ -29,15 +27,14 @@
+ 	SVN_VERSION := unknown
+ endif
+ 
+-CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \
+-	 	-DMSIEVE_SVN_VERSION="\"$(SVN_VERSION)\"" \
+-		-I. -Iaprcl -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
++CPPFLAGS += -DMSIEVE_SVN_VERSION="\"$(SVN_VERSION)\"" \
++	-I. -Iaprcl -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
+ 
+ # tweak the compile flags
+ 
+ ifeq ($(ECM),1)
+-	CFLAGS += -DHAVE_GMP_ECM
+-	LIBS += -lecm
++	CPPFLAGS += -DHAVE_GMP_ECM
++	LIBS += -lecm -lgomp
+ endif
+ ifeq ($(WIN),1)
+ 
+@@ -61,22 +58,21 @@
+ 	CUDA_ROOT = $(shell dirname $(NVCC))/../
+ 	CUDA_LIBS = -lcuda
+ endif
+-	CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
++	CPPFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
+ 	LIBS += $(CUDA_LIBS)
+ endif
+ ifeq ($(MPI),1)
+-	CC = mpicc
+-	CFLAGS += -DHAVE_MPI
++	CPPFLAGS += -DHAVE_MPI
+ endif
+ ifeq ($(BOINC),1)
+ 	# fill in as appropriate
+ 	BOINC_INC_DIR = .
+ 	BOINC_LIB_DIR = .
+-	CFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
++	CPPFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
+ 	LIBS += -L$(BOINC_LIB_DIR) -lboinc_api -lboinc
+ endif
+ ifeq ($(NO_ZLIB),1)
+-	CFLAGS += -DNO_ZLIB
++	CPPFLAGS += -DNO_ZLIB
+ else
+ 	LIBS += -lz
+ endif
+@@ -272,9 +268,9 @@
+ 
+ all: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) $(GPU_OBJS)
+ 	rm -f libmsieve.a
+-	ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS)
+-	ranlib libmsieve.a
+-	$(CC) $(CFLAGS) demo.c -o msieve $(LDFLAGS) \
++	$(AR) r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS)
++	$(RANLIB) libmsieve.a
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) demo.c -o msieve \
+ 			libmsieve.a $(LIBS)
+ 
+ clean:
+@@ -287,27 +283,27 @@
+ # common file build rules
+ 
+ %.o: %.c $(COMMON_HDR)
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ # QS build rules
+ 
+ mpqs/sieve_core_generic_32k.qo: mpqs/sieve_core.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -DBLOCK_KB=32 -DHAS_SSE2 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DBLOCK_KB=32 -DHAS_SSE2 \
+ 		-DROUTINE_NAME=qs_core_sieve_generic_32k \
+ 		-c -o $@ mpqs/sieve_core.c
+ 
+ mpqs/sieve_core_generic_64k.qo: mpqs/sieve_core.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -DBLOCK_KB=64 -DHAS_SSE2 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DBLOCK_KB=64 -DHAS_SSE2 \
+ 		-DROUTINE_NAME=qs_core_sieve_generic_64k \
+ 		-c -o $@ mpqs/sieve_core.c
+ 
+ %.qo: %.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ # NFS build rules
+ 
+ %.no: %.c $(COMMON_HDR) $(NFS_HDR)
+-	$(CC) $(CFLAGS) -Ignfs -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -Ignfs -c -o $@ $<
+ 
+ # GPU build rules
+ 
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 4cf9b2d6dce3..1f8a4593e738 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-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=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -24,26 +24,24 @@ PATCHES=(
 	# TODO: Integrate ggnfs properly
 	"${FILESDIR}"/${PN}-1.51-reduce-printf.patch
 	"${FILESDIR}"/${PN}-1.53-fix-version.patch
+	"${FILESDIR}"/${PN}-1.53-makefile.patch
 )
 
-src_prepare() {
-	default
+src_configure() {
+	tc-export AR CC RANLIB
 
-	sed -i -e 's/-march=k8//' Makefile || die
-	sed -i -e 's/CC =/#CC =/' Makefile || die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die
-	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
+	use ecm && export ECM=1
+
+	if use mpi; then
+		export MPI=1
+		export CC=mpicc
+	fi
+
+	use zlib && export ZLIB=1
 }
 
 src_compile() {
-	use ecm && export ECM=1
-	use mpi && export MPI=1
-	use zlib && export ZLIB=1
-	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		OPT_FLAGS="${CFLAGS}" \
-		all
+	emake all
 }
 
 src_install() {
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index a24ebaedcf04..4efa59d87abd 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1,10 +1,5 @@
 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2
-DIST nauty-popcnt.patch 56034 BLAKE2B 838858a0decf9323217f6b8d7b200b0158db9a02efd278a5d3cf7392ac2201e901b36b963f3f30ca6070fd0ddfa70577a442b795b09fec0d457d33649c6e93c6 SHA512 4931440b6178cb668997539ac2991f0d04758b8750668d4477cb8a456640640c5bb71c2858e423a4ad812e3401151834366e04693bf9a5ecc5ccc211d2e4229c
-DIST nauty26r7.tar.gz 1660659 BLAKE2B d1d6774dd65cbdb906727324b5008bb962d54d16f99afe68f643f62ab2e7fe297a7cb4ef59b5f50c72c7e59fa9ff8ef2c82f4a77764c7f076b90e8171c7f1370 SHA512 60a724264b43b48338c17240c3cf7156f408267f1b2df995ea7b5ab9fa48852cb11057e83178a364ca028d80dc9124ca9b38cdac34e150a995475140d07c8af6
 DIST nauty27r3.tar.gz 1721200 BLAKE2B 2071f241dc531a056c678be0ec40497421440f2d5f1796ba20c1257feff426a452df592912faadca08010b29afbbc8cc0552c0517c168af3de9f3334b60d7f18 SHA512 8d6d92de8d348d3874677a55773088f4ff5b9a45fd9ed3802c9b1590072f5861946ac1d21892f4b383a9e36f6c9ac08270d021429cf36da3e5038e6a38d9fb6c
-DIST nauty_2.6r7+ds-1.debian.tar.xz 30328 BLAKE2B 009d64aa2042f814e55238ff83bde4d205925922c13a46213b933ec0f6364ed9a86aeabc7b4c22fdb717bd3ee7efdf794f3f2637cd08d7921e61cee99e73cf9a SHA512 fadde6a767e43048980842415207613ffeaa38d021fbf6a3f26a4bbe6877a92ddf5950094de517edd0f924deeacc8dec1d6a7334123c2a87d15befcc3876bc63
 DIST nauty_2.7r3+ds-1.debian.tar.xz 45520 BLAKE2B 5078ab84d1fcdbddc0f7442ebed57fb63551701295615b99f2833c300168dd7f71205fa3cc2e9ea977f52e389b67883b68e7d5d39e1698c6040913e4571fa4f9 SHA512 8618c78a7c6f1d579cb20048fcf55fb45b69d8d1cebd7f2c9aee664768ab78f0ab1930863c8475a153c9ac9f4692cf6e43f96d01c4a219eae1f23bb61cb50407
-EBUILD nauty-2.6.7-r1.ebuild 1526 BLAKE2B c3ffeaa04617b7d18d2c18c5264930b6cd3b67db184770cbc34dfaa1b63e8c3496bc2d45f3922965e041a3929e53443da15c84762ac8b4132c8f320d5971a7da SHA512 191f12019f2d3016b6154d9f41a652bdebcbc0ab1cfdc57bc17a77bba4876434dc1b0950777cf4ec556997c82b3897964cb9ff635b8b5b485350a86791e56be0
-EBUILD nauty-2.6.7.ebuild 1469 BLAKE2B 31dbd03617b358b4881f866c7b0c0863aa808c58433120c215886f23439896fff8f05e4df3e635473a4400a54fea53084cc81a949bc9eb732397d73775e1c831 SHA512 b9d7e3d17636c716e53658b590d37aaf4ed09219fed46b975cbd9ee1d36c17c1c57c3ce430b13f6125baf094e8f748072313c53e63c1e9249f081afe3f535f9b
-EBUILD nauty-2.7.3.ebuild 1963 BLAKE2B 32d5aad7586e7afb406fac45513ac925cb996a3cf0e426d640f97b87924da807e1c7b34264996d41b35cc3fd3e62745977ce0c52bffc7b5fafb1cec52f65443c SHA512 bd644f58eb2b73ae55113d43574c96316f1737a15fea0e388a5773fdcb77cff8f764f1bee41d5ca0b539e1d3a980be8f380c3a5116e4ab521bc79ddd37341e87
+EBUILD nauty-2.7.3.ebuild 1961 BLAKE2B af67f6907cc1ccf3bae706626e1d682c33b55aa0f0b85773968cf07f6d2ee5d7a3692d948f7aaf4ebfb30827c177f63db6fe2e7d0fe99165c720b555f4259645 SHA512 93691377b8e67eca41e8d80c2902f91c8182714eff9f3c4cae2e4afd03d379b71c0f710785671a35569105b6294abb8d4fcb9e57ab6c82ba06814955dd01dc66
 MISC metadata.xml 546 BLAKE2B a4224bf8078d785c2f6a90c3041db97b0dac92eca9ab9513989f899fc7b57e5a95d918a4abc7cbf2d8605107c764e32d4473cea6fa59703a0571aedf48aa5bfe SHA512 ff16cdbedc93669baa03da38ff27683c1a638390611b5c67f1be271542c1cb332e164743b3c9e8b43e89f14316970603bbe7f9130ad656257d8e0a654ce63238
diff --git a/sci-mathematics/nauty/nauty-2.6.7-r1.ebuild b/sci-mathematics/nauty/nauty-2.6.7-r1.ebuild
deleted file mode 100644
index 3bbf8f7251b1..000000000000
--- a/sci-mathematics/nauty/nauty-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV1=$(ver_rs 2 'r')
-MY_PV=$(ver_rs 1 '' $(ver_rs 2 'r'))
-
-DESCRIPTION="Computing automorphism groups of graphs and digraphs"
-HOMEPAGE="https://pallini.di.uniroma1.it/"
-DEBIAN_PATCH_VERSION="1"
-SRC_URI="http://cs.anu.edu.au/~bdm/${PN}/${PN}${MY_PV}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV1}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz
-	http://pkgs.fedoraproject.org/cgit/rpms/nauty.git/plain/nauty-popcnt.patch"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/gmp:0
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${MY_PV}"
-DOCS=( schreier.txt config.txt formats.txt changes24-26.txt )
-PATCHES=(
-	"${WORKDIR}"/debian/patches/upstream-lintian-spelling-error.patch
-	"${WORKDIR}"/debian/patches/upstream-fix-gt_numorbits.patch
-	"${WORKDIR}"/debian/patches/upstream-fix-include-extern.patch
-	"${WORKDIR}"/debian/patches/upstream-zlib-blisstog_c.patch
-	"${WORKDIR}"/debian/patches/upstream-C2help2man.patch
-	"${WORKDIR}"/debian/patches/upstream-autotoolization.patch
-	"${WORKDIR}"/debian/patches/system-preprocessing-examples.patch
-	"${DISTDIR}"/nauty-popcnt.patch
-)
-
-src_prepare() {
-	default
-	rm makefile || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static --enable-runtime-popcnt --enable-tls
-}
-
-src_install() {
-	default
-
-	# remove .la file
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/nauty/nauty-2.6.7.ebuild b/sci-mathematics/nauty/nauty-2.6.7.ebuild
deleted file mode 100644
index 579baf03ad7f..000000000000
--- a/sci-mathematics/nauty/nauty-2.6.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools versionator
-
-MY_PV1=$(replace_version_separator 2 'r')
-MY_PV=$(delete_version_separator 1 ${MY_PV1})
-
-DESCRIPTION="Computing automorphism groups of graphs and digraphs"
-HOMEPAGE="http://pallini.di.uniroma1.it/"
-DEBIAN_PATCH_VERSION="1"
-SRC_URI="http://cs.anu.edu.au/~bdm/${PN}/${PN}${MY_PV}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV1}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz
-	http://pkgs.fedoraproject.org/cgit/rpms/nauty.git/plain/nauty-popcnt.patch"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/gmp:0
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${MY_PV}"
-DOCS=( schreier.txt config.txt formats.txt changes24-26.txt )
-PATCHES=(
-	"${WORKDIR}"/debian/patches/upstream-lintian-spelling-error.patch
-	"${WORKDIR}"/debian/patches/upstream-fix-gt_numorbits.patch
-	"${WORKDIR}"/debian/patches/upstream-fix-include-extern.patch
-	"${WORKDIR}"/debian/patches/upstream-zlib-blisstog_c.patch
-	"${WORKDIR}"/debian/patches/upstream-C2help2man.patch
-	"${WORKDIR}"/debian/patches/upstream-autotoolization.patch
-	"${WORKDIR}"/debian/patches/system-preprocessing-examples.patch
-	"${DISTDIR}"/nauty-popcnt.patch
-)
-
-src_prepare() {
-	default
-	rm -f makefile
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static --enable-runtime-popcnt --enable-tls
-}
diff --git a/sci-mathematics/nauty/nauty-2.7.3.ebuild b/sci-mathematics/nauty/nauty-2.7.3.ebuild
index 8ed6af921a53..0b89c32e208f 100644
--- a/sci-mathematics/nauty/nauty-2.7.3.ebuild
+++ b/sci-mathematics/nauty/nauty-2.7.3.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
@@ -18,7 +18,7 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="examples"
 
 BDEPEND="sys-apps/help2man"
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b8e03b538908..b3cb166c15e3 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,9 +3,7 @@ AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
-DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0 SHA512 4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
-DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9 SHA512 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
+DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
-EBUILD octave-6.3.0.ebuild 5141 BLAKE2B b71e881edee3c2870506b3f671c2164257ab0eaa6b89088f7b150cfb1785d754b1c54426a725013f7330570e6db6f709c430663bb6c90e601224444d949bfd5b SHA512 7357f59c466707efa991eee029e140d283e03c6576ca02078b0483002e3b3d21044acb12ba50d2be1e86753558ac7840e2fc3f33f85c9cf7af1b705e2604809c
+EBUILD octave-6.4.0.ebuild 5510 BLAKE2B b957e17fc89dbebc34b5ee7458d9583547fd3a7254a298e7e0ef0c7de2600f5984245783b31a557c3568422fa64d1e89b5e779c0c1dffef88b9b475cd8f8fb56 SHA512 57b761608a70315e79c910e66e287eb6316e153ff29780013938d90e03b3ef779f04aa259047ceecc03addea970b45a9c3d3e26ce012db12b94511b6522f9edd
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/octave-6.2.0.ebuild b/sci-mathematics/octave/octave-6.2.0.ebuild
deleted file mode 100644
index f38aa0631f6a..000000000000
--- a/sci-mathematics/octave/octave-6.2.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-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 ~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
-# documentation to text (see scripts/help/help.m).
-RDEPEND="
-	app-arch/bzip2
-	app-text/ghostscript-gpl
-	sys-apps/texinfo
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-libs/qscintilla:=
-	)
-	hdf5? ( sci-libs/hdf5:0= )
-	java? ( >=virtual/jre-1.6.0:* )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		virtual/glu
-		>=x11-libs/fltk-1.3:1=[opengl,xft]
-		x11-libs/gl2ps:0=
-	)
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig
-	)
-	qhull? ( media-libs/qhull:0= )
-	qrupdate? ( sci-libs/qrupdate:0= )
-	readline? ( sys-libs/readline:0= )
-	sndfile? ( media-libs/libsndfile )
-	sparse? (
-		sci-libs/arpack:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0=
-	)
-	ssl? (
-		 dev-libs/openssl:0=
-	)
-	sundials? ( >=sci-libs/sundials-4:0= )
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	gui? ( dev-qt/linguist-tools:5 )
-	java? ( >=virtual/jdk-1.6.0 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )"
-
-# I'm not sure what the getcwd patch is intended to fix. That macro is
-# part of gnulib, though, so if it's a serious problem then we should
-# consult upstream about it.
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	# Some of these use_with flags are a bit mismatched. The configure
-	# script offers only --without-foo, and detects "foo" automatically
-	# unless --without-foo is specified. Passing --with-foo is not an
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--disable-jit \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
-	default
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc $(find doc -name '*.pdf')
-	else
-		# bug 566134, macros.texi is installed by make install if use doc
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && \
-		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
-	doenvd 99octave
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.4.0.ebuild
index 5c1ff358633d..4b0b6832a769 100644
--- a/sci-mathematics/octave/octave-6.3.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0.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=6
 
-inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -19,8 +19,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~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
 # documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
+#
 RDEPEND="
 	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
 	app-text/ghostscript-gpl
 	sys-apps/texinfo
 	dev-libs/libpcre:3=
@@ -120,12 +125,17 @@ src_configure() {
 	# --with-sundials_ida (no-op) with USE="sundials"
 	# --without-sundials_ida (disables it) with USE="-sundials"
 	#
+	# The --enable-link-all-dependencies flag is needed because
+	# otherwise, the build system appends --no-undefined to LDFLAGS and
+	# then proceeds to undefine things. GNU libtool ignores this, but
+	# slibtool (for example) does not (bug 776583).
 	econf \
 		--localstatedir="${EPREFIX}/var/state/octave" \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		--disable-64 \
 		--disable-jit \
+		--enable-link-all-dependencies \
 		--enable-shared \
 		--with-z \
 		--with-bz2 \
@@ -182,13 +192,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 56e429e878a1..96558fa174ff 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -4,8 +4,6 @@ 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.2.tar.gz 4766461 BLAKE2B f765edaee8e3b85f859edb1ac82f20aab6cda1a1bb87a2bfaf2de0824d401aef8d5f559a95bc2da565b492f49445b7cf9bcce45376b100e6ca736d82a381ca88 SHA512 ee034e4f2d385755aa5fcddb8b562a2faf4d847591d35c47461e3cbf01382da3a85f004685c842e0c530fdb29e384b69dc496a568b9b204e276b4c8e27afd382
 DIST pari-2.13.3.tar.gz 4768312 BLAKE2B e6df23d3929ef1549009eb82c628cc2b9f1f3a446b2c2b246e157b93859006c3f4526c6fef4b975be87b9c6c011e179c169b4f237981c2ca1e02df0adbc4c00a SHA512 16cc20e44bc9b408798a86ffc31f8096e5adc01e0b8f7620e3d03201d71ddbe1d1bfecb22ab69c5b03270e9e97657042de29bb2055173b0d4cf169ec4373972b
-EBUILD pari-2.13.2.ebuild 3420 BLAKE2B 815903b0bb2dd8e18784ac8ac8dba9f4dccaede8d5d8dea3d79c556e9c297da4b2320ae3ba134d1d87b9f11c0864fbf80efaa1bd7f479d02a0e59234c80220b6 SHA512 d2a79878b8ae0d684844ac5c78927ae8b96f986fd2c81a56f4b98afe53322fd4f5426b29beda5d26f87cc03536f71577580ddbed7bb54b9620a13b4d4938b632
-EBUILD pari-2.13.3.ebuild 3424 BLAKE2B be104eacb347b0bdf27e6a5046091fe6880894b44ca6fb4962114eca12025cf9d5a928c45a2f520f61c3aed3c41c912f18944f6b599ecd44de12f02bef341732 SHA512 58f438e50cf6e5feac1bcaaf7c8a1cccd307f347273c99e556c9d3c8419830e1fdf0faf5d6ea9b9dfd55b938b4c42d632312bd5bb129af169c2f680a184de493
+EBUILD pari-2.13.3.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.2.ebuild b/sci-mathematics/pari/pari-2.13.2.ebuild
deleted file mode 100644
index 98226153f6af..000000000000
--- a/sci-mathematics/pari/pari-2.13.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="https://pari.math.u-bordeaux.fr/"
-SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-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"
-IUSE="data doc fltk gmp test threads X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-"
-DEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1= )
-	gmp? ( dev-libs/gmp:0= )
-	X? ( x11-libs/libX11:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.9.4-strip.patch
-	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
-	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
-	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
-)
-
-src_prepare() {
-	default
-
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-}
-
-src_configure() {
-	tc-export CC CXX PKG_CONFIG
-
-	# Workaraound to "asm operand has impossible constraints" as
-	# suggested in bug #499996.
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
-	# sysdatadir installs a pari.cfg stuff which is informative only.
-	# It is supposed to be for "architecture-dependent" data.
-	# It needs to be easily discoverable for downstream packages such as gp2c.
-	# We set LD to "" so that it is set to the value of the compiler used
-	# which is how a normal end user is expected to configure it. pari's build
-	# system do not cope very well with a naked linker, it is expecting a
-	# compiler driver. See https://bugs.gentoo.org/722090
-	LD="" ./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}/usr/share/${PN}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysdatadir="${EPREFIX}"/usr/share/pari \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with fltk) \
-		$(use_with gmp) \
-		--without-qt \
-		$(usex threads "--mt=pthread" "" "" "") \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	local mymake=""
-	use hppa && \
-		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
-	emake ${mymake} gp
-
-	if use doc; then
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}/fonts" emake docpdf
-	fi
-}
-
-src_test() {
-	# Welcome to the jungle, where the tests fail if you make your
-	# terminal bigger.
-	emake COLUMNS=80 test-all
-}
-
-src_install() {
-	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
-	default
-
-	if use doc; then
-		docompress -x "/usr/share/doc/${PF}"
-		emake \
-			DESTDIR="${D}" \
-			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
-			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-doc
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.13.3.ebuild b/sci-mathematics/pari/pari-2.13.3.ebuild
index 3d8273de659b..2b6dd7c50043 100644
--- a/sci-mathematics/pari/pari-2.13.3.ebuild
+++ b/sci-mathematics/pari/pari-2.13.3.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 @@ 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/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 0971689d2746..275716c3b4aa 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,3 @@
-DIST polymake-4.5-minimal.tar.bz2 5634046 BLAKE2B dc8a10885b23f8c690e9b8e36d6b55193bbc6d77d56c3b2facea70221860c33d2df58a8a693b9d43c0f613962ce2bd1b3258f1a558af8335297092a60876054a SHA512 07fcc9c20c4e48fc6d83845c50c12b2cadeaf55f74619985d21e252970ad76d6ee8cc528cd419e71ed5927d83758e5d6862e41c1610f93ea95127ad9115a333b
-EBUILD polymake-4.5.ebuild 3797 BLAKE2B 4b35f3b1ac25db4f0321e58c3b18fb508445d4e5baa57abff2119366dceb100791bf760c70528f84e943d9f3b7b762c51d43b096b58376a5433934fc63e5f97c SHA512 f7ef81a83db66a3a4c32536d86ba7dcf4b0cd78954f4625f114b51efed6d9204d144711c4c3829a0e7c8ba4ce3ae6e8e7574a85c68873e5b20f765d1da63c7f2
+DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
+EBUILD polymake-4.6.ebuild 4029 BLAKE2B f9f126259255ec1cf740822f73b2b1e6330f736cd237f0f6f709e8d8d7afaeb7d47766ce7968bfdfcaf7fd7e547d53f80a4619854b7c4b9be8a90a5001a41ae3 SHA512 ecf42b8137ce148d601217797b707c40d4bd04420732da444ded2dc0608cf07abda988004c375a34a1bbd21786d7b22db6ee6f98aa4549e0e80f223b329c7c0b
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/polymake-4.5.ebuild b/sci-mathematics/polymake/polymake-4.6.ebuild
index 750cfef6a60f..e82e8fe3f95b 100644
--- a/sci-mathematics/polymake/polymake-4.5.ebuild
+++ b/sci-mathematics/polymake/polymake-4.6.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
@@ -60,7 +60,7 @@ RESTRICT=test
 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=$(get-flag -O)
+	export CXXOPT=""
 
 	tc-export CC CXX
 
@@ -71,7 +71,10 @@ src_configure() {
 	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.
+	# 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" \
@@ -81,6 +84,7 @@ src_configure() {
 		--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") \
diff --git a/sci-mathematics/primecount/Manifest b/sci-mathematics/primecount/Manifest
index 7ac7f2ff8f7a..2f35f77542ca 100644
--- a/sci-mathematics/primecount/Manifest
+++ b/sci-mathematics/primecount/Manifest
@@ -1,3 +1,3 @@
 DIST primecount-7.2.tar.gz 340799 BLAKE2B 5ce3661e322be363e2fe79de1dd134b5c3009269cbb10d36dc69bee4c23c9f41d2117b3ed7aa4c5f852e494832573c84a8d9c37cbe92cf80a5024bdec9b22c69 SHA512 df14929012434eddfab94410ba9165642094327f8abd139a6a1ba87e508bba56df91cb0dc9411e873e90a9aa4aa3ba4007396c930d593f5954be8c715fa26e84
-EBUILD primecount-7.2-r1.ebuild 1163 BLAKE2B ca9d9781436ee6113aa1be19dbb297e46134fa262e7e155142b3577340bd1165d80845381e9ff72258055acb665b10fe7878efec3a8f34e4a5ea9c78b4d19462 SHA512 9c2f4979ffef015dcdc6146ee6927a24964793b1a1d5c208bd5723b0cca2488cecb01395bd762758a9db6fea48b34e762fe067f260ac04c55771c7a91eb0ffc2
-MISC metadata.xml 673 BLAKE2B dcb9633d5529d3c78afaf761812f38a370496a861e5391190f9c2059bde94ca6628b5d751eeab4c0832bebeec421825019671d0a9a815e269691922b23f3ce2b SHA512 fdbebd019bfd1d06e505900b2061b6a8597f62b2b979f337c07c7bd9084181004183595e05e9381800c02981ec584fef3454a5c98ceeeb76009887f5acb9dfb7
+EBUILD primecount-7.2-r1.ebuild 1162 BLAKE2B 3762ecc48997417bc29d95ce19559dba9f07480c842515193851502d648b7030520c883c9b0fe300491f7dafad58ee42dbdea200a50478dba51d9a745cf633ef SHA512 28c2dd35b0f7ef386fbe93ddf003b571abd43fe52735bf3fe7677ea207e1a874ad486501729fe7e228b487ed90c44df1583378658469a46482e92f7bfcf6b45f
+MISC metadata.xml 674 BLAKE2B 2d8321166afee1e9d0a20723ae6849f17a7ef0d5d474dc3ec0b1650519b197ad5b1360641faa6985a60121501741a137812b8bcf03cd708766278a1b014615f7 SHA512 7a4fa0c1cae4880bdc230065c98ec46dfb5f1b1adae6ffa5eac275f6f04f38ce0c24042e62f5aac6117f9f816890244daec8fb1c920ec4b6a0a124385e5d7e33
diff --git a/sci-mathematics/primecount/metadata.xml b/sci-mathematics/primecount/metadata.xml
index 524d8bf2ac66..e42b5f5b1542 100644
--- a/sci-mathematics/primecount/metadata.xml
+++ b/sci-mathematics/primecount/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
     <email>mjo@gentoo.org</email>
diff --git a/sci-mathematics/primecount/primecount-7.2-r1.ebuild b/sci-mathematics/primecount/primecount-7.2-r1.ebuild
index 4a994b461a06..f84b7b7ea831 100644
--- a/sci-mathematics/primecount/primecount-7.2-r1.ebuild
+++ b/sci-mathematics/primecount/primecount-7.2-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
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64"
 IUSE="cpu_flags_x86_popcnt +executable openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/primesieve/Manifest b/sci-mathematics/primesieve/Manifest
index 8914dd414283..1d97ee491364 100644
--- a/sci-mathematics/primesieve/Manifest
+++ b/sci-mathematics/primesieve/Manifest
@@ -1,3 +1,3 @@
 DIST primesieve-7.7.tar.gz 101558 BLAKE2B cfaa91ddcf661e265d403f8a93461fe297ac48db843b096d0dd7828c4e3d11cdba60cb102197248359c79950fe2ac66c8e9295ab17b0d6bd0eed5a6260c7d115 SHA512 bbcc141a12afdf54386d2408e067b1c6af2dd9b5c9f44d71290269ddefc7c46ba6794064cde6728c8356724553cb6bc2e765bf18c24a18b6d5d1f472d2c6e6dd
-EBUILD primesieve-7.7.ebuild 1047 BLAKE2B 3d68b141d9ae22af741a3c55dbbca7d955b5f8239fec7afc3cee0209c83bece49ba278dc6ca2adac56de2d97bfd2d484b4d8322f8e1ba2547011535258f26612 SHA512 9de7e6d72bcc93ee1cd6b15b2beb7b27980a42f500c9bfe39200611974e60092db94c4e307d6a2269b463e2d9ae340bef8faa0c1f02a368fe8bb5c1c46c47e57
-MISC metadata.xml 671 BLAKE2B 66f6291e855c6ae971e436b1499e66295c5dd8ed8ae2f82f2383c7379abba2e1a42697bef34acb264b7ee962df6fd71f5d3231ae59deb7c48dd73cd5842a6ccd SHA512 0bc2a3ef693ee89e59046541754f7fb08be9c96fe94b5679254e43d9f89391c0a65271eb82c5c9163a6b80843f7477d56ab4911bafe57ec8c61179f9dde59277
+EBUILD primesieve-7.7.ebuild 1046 BLAKE2B 503fcab0c41dd30a22ad076b8e6404d24ca37a4c765a8059ffdbc91a48bfb87ff646779327a447b5cfbd96e1f5a9d88d50fda2ee0a1bf82ad4e12516d699f460 SHA512 e6038d77db1f87bc5c413a6e2c1a7ba689ec9920a579befcced2575379b808c0a60262b8ce2d130936e3d8a04df8d0fa6ee66ca2c74ea65f02fb53de37d704f3
+MISC metadata.xml 672 BLAKE2B e580c88061b6dcece5a34fde2cd13ce8c55264f3bac16fe3af6374df92d6280993452ebeea3d8446d9f8afcf7c1cb6927405c40e82a1c01a153d5060c77392fd SHA512 8ad3dd50c172ad3333d30a01b0e7ddb8f0f96b7666b61a0c6a1644e92abc49fa75f4f54c4c88eb72c2c8c7104d5e720d852bc7319fbc1a9569fcc5de85529b02
diff --git a/sci-mathematics/primesieve/metadata.xml b/sci-mathematics/primesieve/metadata.xml
index e2285b80a8b4..54378d1eb285 100644
--- a/sci-mathematics/primesieve/metadata.xml
+++ b/sci-mathematics/primesieve/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
diff --git a/sci-mathematics/primesieve/primesieve-7.7.ebuild b/sci-mathematics/primesieve/primesieve-7.7.ebuild
index dff175df46b6..65d0b3d3e93a 100644
--- a/sci-mathematics/primesieve/primesieve-7.7.ebuild
+++ b/sci-mathematics/primesieve/primesieve-7.7.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 @@ 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"
+KEYWORDS="amd64"
 IUSE="doc +executable test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/smtinterpol/Manifest b/sci-mathematics/smtinterpol/Manifest
index 159b651bfb22..d30be41e1aa2 100644
--- a/sci-mathematics/smtinterpol/Manifest
+++ b/sci-mathematics/smtinterpol/Manifest
@@ -2,4 +2,4 @@ AUX smtinterpol-Version.template-version.patch 468 BLAKE2B 38fb0d6e26949f0e56a13
 AUX smtinterpol-build.xml-basename.patch 527 BLAKE2B 41e72630f9d8502f00fe79261e9a45d812fad310ccd3ae45205dc0245abbaa5113824ec4fae1de814b8a98f6bc154de21bbfeeda76d514224320545b5680d0d8 SHA512 6a327c27aa661468619b0b94eab84ab894bd5a7d96ab5ac8c50d1ea4cf1286397a6a2b662fa7a352c6f61d1dcc7d51fbf4a7c7c083070e3625877b49831b790c
 DIST smtinterpol-2.5_p20211018.tar.gz 10676726 BLAKE2B 27bed1f707241416f71d10ae33c39b7fe638b9650a26f3237409722a8782af3b09890dce9acf30ab2d0412cfbe94f57684850c51e486d3d7f7dddd8025021c8d SHA512 8630ae5f9cf3fdcbceffeeb1f199c2e21e27d0348d3aec5a7062ee5eb942c640661ae58603f273881f30f24630a92b041ea867086ce6d0a2eab5fdd924eb01c3
 EBUILD smtinterpol-2.5_p20211018.ebuild 861 BLAKE2B a6c5d7a1285e65ea87f6a7ffc046dc134c16344c228bd41c9ba76160d811fda8323ee8cea698bc50321b345f65060b643639e3e68beac07e5730ba9559b8feab SHA512 64777d2f76f5013317069f6c0bf049c181353116e05eed91aa2684749c79b77f2415abca6b57647c4ee2ab3daad799b39bc7b3a3237e2ff463b42340ee05291d
-MISC metadata.xml 442 BLAKE2B 36be7f65ebd9b11bb690ce827679abc80f95272ad0f7fc505656735cd1403c33d368890743cda66cd0b5cbbc6cf55f54cecea43395b34d0d5d09b05b8ed203e4 SHA512 f10378fd1b8431e00e1e43bcd1a4e9e5d9c7fdb9163172068152b22f980b49db1d1874b4926203b21065730eb0424b38c6a7909a970013dbd6bb0c6b05606af1
+MISC metadata.xml 443 BLAKE2B a49ab13ae830d7e212d85005e32f535d7a13d60ca39d28a0534b2f3dbd779b0afb39918649c903ad698c02b755e1d80e6dd928cbd6d1c045c0bfd514b7a51eaa SHA512 52ea501a323d32e118edd1e82217a6c92432fef5ccce7fdfa78023e0ef2aa76a8c66a274524be18aa39d26c547c00a5035c3998a74f81e6ba73d1c1458e33e36
diff --git a/sci-mathematics/smtinterpol/metadata.xml b/sci-mathematics/smtinterpol/metadata.xml
index 242a13366da1..db3a8cbe040b 100644
--- a/sci-mathematics/smtinterpol/metadata.xml
+++ b/sci-mathematics/smtinterpol/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/vampire/Manifest b/sci-mathematics/vampire/Manifest
index 281766a081c1..a15cc4e1c5b1 100644
--- a/sci-mathematics/vampire/Manifest
+++ b/sci-mathematics/vampire/Manifest
@@ -1,3 +1,3 @@
 DIST vampire-4.6.1.tar.gz 1511760 BLAKE2B 52ede8ac009379b15bc57b2ffe45965cbaf772f0e90bc619d859b85b77ce81eadbdd7ddae7c5e0e9cc69564a07f0abefa17109f7192e6afe634a5a929817fe92 SHA512 7ffeee64e9e4666344c0f9155c7e980920666813388416062cee89e43003fef5a8a54b8656cc42d2fa58b6fb3b87ef7f2c671bfc6787075df4058dcc3a1d46e1
 EBUILD vampire-4.6.1.ebuild 1172 BLAKE2B 7dd2f6e829b0b0d827898f9e8fad4bb7b0419200a5a464d4cfd1494e930d4d89c99e1cfc331e2ef71d20fc7525483cd72d390466b8c6e611c5713b66fcdd5e15 SHA512 628f41b3193f6892e3e012aca9d337975e45320e7cd9921c95263ede37518fab08bf9a83c537cd7571247a1a1135af569c4be41158f488c041c629d9416e637f
-MISC metadata.xml 1019 BLAKE2B 0fe27792f7eb8e3cff02308012a69bbed5229dfbff94822896455464e0497d1c08327644acea04b0e84ab382679668754f4744af6b1906113f804b56cc38a90a SHA512 6e1fa1801cb7571421d9445d4ec514388973428345d2d4b7e371f7f2380a966a6d80ffbca38d8057145ee223288e7186c2b1dc3f5de0b1f54c53443ae97e0744
+MISC metadata.xml 1020 BLAKE2B 6e798243e207d09fac240c73cda8918b300706a19d53918b3ce78e847146ad3676a39d9be8e020b678c20d7fe02da0eab57519ea2c5841eeeea0b8a680045928 SHA512 dc82a586070c97db278ef17a24384436548b2a968d18ead7d148f654bab4ad846e685ac2ae2f7db8048b25115b673bcf8223fa2813b370f9d6b6ac01dcf9040e
diff --git a/sci-mathematics/vampire/metadata.xml b/sci-mathematics/vampire/metadata.xml
index b290952a34d5..b88b3fad8295 100644
--- a/sci-mathematics/vampire/metadata.xml
+++ b/sci-mathematics/vampire/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/verit/Manifest b/sci-mathematics/verit/Manifest
index b6db2bf874c3..cd39e9999082 100644
--- a/sci-mathematics/verit/Manifest
+++ b/sci-mathematics/verit/Manifest
@@ -1,3 +1,3 @@
 DIST verit-2021.06.2-rmx.tar.gz 683775 BLAKE2B e7488ef11f37c4312dc3bb7809c8f4a134c70e0cb893a9127235e5bd660e3cf88648d5af598f650d25aed02eb864c171479a570b4e47b96ab2bb5f6aba3e6926 SHA512 4dfdbcf12fefaba13f5540a08a520e15666ca3bb923483b86eac708cf23bd5d8441d9a687487ae38f9bbdbc023beedf3e503800e99622cb71fb086329c047a4d
 EBUILD verit-2021.06.2.ebuild 508 BLAKE2B 6ac727f550f8fa0c81b70e509e2381e26eee8745b3c16f7626b0f02408bac78b0b2cd88b11c99f815f9439e0454d714254c0b3fa56ec0a063369e74048ba422a SHA512 60e00146bf88f2d93b9a5ec476568700154df6a70b67b85fe3c37bee495546cddc6942b3d5a1659c4252e1a22073d5c776452548cf1bc6d2812834d92faae80f
-MISC metadata.xml 654 BLAKE2B a80ae2771051d1660ef87811291c9a36eb11a596cc3ab2ac3bed1496b178988cfe666b0a62b7ce3fbde4b3b580c5d457e8a2f6be826d90f070086c3c0938e969 SHA512 b6d826f6d1e973c28c5a274628e58e973a7913ad0d254496aa596e172fc4a7469c84a289e64e6ed5542a7983fd06a46d4d3f51ca72aa5e4d469a963749686b4b
+MISC metadata.xml 655 BLAKE2B 901ce12d712051cde3d4cd1c936f5de3b1e52eb9a238c6ba14de2a8ba78bc6f793dedc25ff3f44903f31a70b90bc18fd2e6829e8be88fa431db172c964c32e76 SHA512 1bd1dbbf7d701fde4db5b5b7bf7525baf6d7cda1a959f4a6a10653ddd95be0225a792c10c5adfa78330ceefd37e72fe59436cc3616719fd5e683643e1e123fa8
diff --git a/sci-mathematics/verit/metadata.xml b/sci-mathematics/verit/metadata.xml
index de5342d8a613..f245da8f13fa 100644
--- a/sci-mathematics/verit/metadata.xml
+++ b/sci-mathematics/verit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest
index fa40a5a4e727..5575e8ac9d5c 100644
--- a/sci-mathematics/why3/Manifest
+++ b/sci-mathematics/why3/Manifest
@@ -1,3 +1,3 @@
 DIST why3-1.4.0.tar.gz 6306524 BLAKE2B ade7803a608d090ea06d974ae47e920993de92a5849d60bd63dba68252919a8f4fd1f0f6a3c975fdb727c4ae3afe13921b5d31a14c005e0d08f518e64bcf05e5 SHA512 b492f08a3c7073782b143a4849c47766b12045ad53c56aa8d251fd5b6bc1863ddebe260c99b3ddb27c4e1e1e9ab986c8b02286ec24f4c30f99f81f5f13fdc90a
 EBUILD why3-1.4.0-r2.ebuild 2170 BLAKE2B 4a69d3d119d8ac3dd1d33a820717b1f59d88eb888f168ab5c019e23457de62d81ee07bf7d64ad48a63ab90fe864084588a54d4e7b8163e86cff5f2dbd8185a4e SHA512 99073cf81b27903bd21c0c7d7ce898a449191aeb6e23e3ac81e58cebf6704a2a829d03c847c810093f8ee835f677bae1f64c8b20ffc9f37f74e04ee11e771a5e
-MISC metadata.xml 1680 BLAKE2B 4443de2368a7003db59e341bc671c8aa4c664be935b65df1fd1af161900a977194e012ef3b486f877a77f6b32405d700ee814d7cdeb10703b2462f7337965fb5 SHA512 7cc8dbe476d891d1311cec6ea15b1c6e6391c32bdbe715fe1fb7d2549763384c148e0509fb2b7c68b98b70eec1feeb4d94271378a343d50ef58cb5bb8a07a109
+MISC metadata.xml 1817 BLAKE2B 671ffd58aff152784984d09096259164d691bebbdb057822a8f26c43613b1a057dceb1f6f3ecb7ed4db314630cee206a80c6c819711f6177c343f74c8f9c1267 SHA512 d2c22dec72fadca68284bd2c44b4c39b3a3d41476ab311be7abc50ca9e10d99840eb28aac504a627828fb2a98141acaacbf09d437bc6d8b90f4cb668b6565202
diff --git a/sci-mathematics/why3/metadata.xml b/sci-mathematics/why3/metadata.xml
index 6c2999e4f4d7..9974e9e2b8a1 100644
--- a/sci-mathematics/why3/metadata.xml
+++ b/sci-mathematics/why3/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
@@ -10,6 +10,10 @@
     <email>ml@gentoo.org</email>
     <name>ML</name>
   </maintainer>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
   <longdescription>
     Why3 is a platform for deductive program verification. It provides
     a rich language for specification and programming, called WhyML,
diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
index effbcf2a61f3..774941b67008 100644
--- a/sci-mathematics/yafu/Manifest
+++ b/sci-mathematics/yafu/Manifest
@@ -1,4 +1,4 @@
 AUX yafu-1.34.3-Makefile.patch 211 BLAKE2B 787be431c83a03f4db65c4117f6b75b8f510dee9fcf93b8bcf20a7dcdf4393068da16720914e9dba6a098df7698a5101567b01b7f2addc1d3032ac9204a718d0 SHA512 ee88e14d5d7bc61f1666712ca96800f9f2715e3634e69edb4e8d4aceb4cc364f72fdffa7117970204574100cf3481f458dea2b5effa6b025cd26fb5c77a45d42
 DIST yafu-1.34-src.zip 686655 BLAKE2B 6c5ccb587aeacf4c72c7969d409846ad768f2f7ec1c7c100372617ce75c00a6d61a0a00691f6ebce4de1250e00cb4abe4abeee5278d2aab19d0d8861c8bd1916 SHA512 f8afba77e0286c579b4152517ba3a0b6b85d43606e4fafc653dc06b7f7c2aba0f8f3c65b38f3496657495bff476dd4cc8e06daaad8a7a78a36fc6e1c0cf046a4
-EBUILD yafu-1.34.3-r1.ebuild 1249 BLAKE2B 67b4b85adcf4f7209f55e90e054bf019b8268280598f7a1434f1bc44ebe70cb776f870e510e7c875d52b3b41de3bd252b6975535a91f956919f67014d6c52ad8 SHA512 acadd85a8e5c255aab171043c4fc5072dfae1d836d28b7e1f2d4ddb5fc2cc1963b4c3ff912e90dbef228859efd85dc8b88bdfe38600fc2b9fd54af97e73bad11
+EBUILD yafu-1.34.3-r1.ebuild 1326 BLAKE2B 2bcddbb8bc242b4ab56617784fda129dcca0bf2265256ad2c4c612e7d2b926568141632644673b488b336f1dc1ac66010535e4befaf7c38cf4541b67dd5e6ca1 SHA512 63f399e646295c3d46308d5ef22365d786c3e3c8e1feb1d45d718dd88494876f87b21f76e0653b989f62aea94d44b1ead512c158cd08ef3a30d9b69edb19e6e6
 MISC metadata.xml 242 BLAKE2B a794792e99da2e384e10cf510ccecb79d22a49025b15bda7e9da2bfd0f931dd19e2f45b8ed7a46ad779de32c593be3d13b2d0292fe7d150ac6b912e0d83be188 SHA512 b4ea86c5a13f67ec76ff845162b94a6d554cecb2869a1c1cc292388ae5e9073c0544b1567ebe77583447da12cfa172c3b46d775db51077479bdf5fa48cb330fa
diff --git a/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild b/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
index 24b5c5e29c94..dd3a36e87d85 100644
--- a/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
+++ b/sci-mathematics/yafu/yafu-1.34.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=7
@@ -15,6 +15,10 @@ LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
+	|| (
+		>=sys-devel/gcc-4.2:*[openmp]
+		sys-devel/clang-runtime:*[openmp]
+	)
 	dev-libs/gmp:0=
 	sci-mathematics/gmp-ecm"
 RDEPEND="${DEPEND}"
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-mathematics
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)