gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/sci-mathematics
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
158 files changed, 462 insertions, 466 deletions
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1 b/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
index a90ca448ba4f..25c66a830ae6 100644
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
@@ -4,10 +4,11 @@ DEPEND=sci-mathematics/glpk:=[gmp] dev-libs/gmp:0=[cxx(+)]
 DESCRIPTION=Software package for algebraic, geometric and combinatorial problems
 EAPI=7
 HOMEPAGE=https://4ti2.github.io
+INHERIT=autotools
 KEYWORDS=amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/glpk:=[gmp] dev-libs/gmp:0=[cxx(+)]
 SLOT=0
 SRC_URI=http://4ti2.de/version_1.6.7/4ti2-1.6.7.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=56b3088e91e890b85e9c9882b4212c51
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 85581f948c2c..812fb52c7969 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
index 886832ce142e..611f77dca1d1 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -11,5 +11,5 @@ PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.6.1.2.1.4 )
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode )
 SLOT=0/2.6.1.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.6.1.2/Agda-2.6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1f3460c80b1eeef5a25db800e151e56d
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
index ec348508ebe9..b92d5d1459c7 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?]
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/v1.4.tar.gz -> agda-stdlib-2.6.1.2.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=592624cf25722d12d36034a11cf539f8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=832c9f368f6347f3b033d36592c95c82
diff --git a/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1 b/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
index 33d3674bad69..1dbd20e25eb0 100644
--- a/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/cpitclaudel/alectryon/archive/v1.4.0.tar.gz -> alectryon-1.4.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	elisp-common	e7aaa047873789f549ea3df2f04b2145	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=edb68aaf22f745e31752e00a3ff3a7db
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	elisp-common	e7aaa047873789f549ea3df2f04b2145	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4669c1b36c77bdfc3a2a2436da48079a
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0-r1
index 039f8b32339e..40f8eade298e 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/zarith:= dev-ml/lablgtk:2=[sourceview,ocamlopt=] dev-ml/camlzip sci-mathematics/psmt2-frontend >=dev-ml/ocplib-simplex-0.4:= >=dev-ml/menhir-20181006:= dev-ml/seq:= dev-ml/dune:= dev-ml/num:=
+DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/zarith:= dev-ml/lablgtk:2=[sourceview,ocamlopt=] dev-ml/camlzip:= sci-mathematics/psmt2-frontend >=dev-ml/ocplib-simplex-0.4:= >=dev-ml/menhir-20181006:= dev-ml/seq:= dev-ml/dune:= dev-ml/num:=
 DESCRIPTION=Automatic theorem prover
 EAPI=7
 HOMEPAGE=https://alt-ergo.ocamlpro.com
 IUSE=examples gtk +ocamlopt
 KEYWORDS=amd64
 LICENSE=CeCILL-C
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/zarith:= dev-ml/lablgtk:2=[sourceview,ocamlopt=] dev-ml/camlzip sci-mathematics/psmt2-frontend >=dev-ml/ocplib-simplex-0.4:= >=dev-ml/menhir-20181006:= dev-ml/seq:= dev-ml/dune:= dev-ml/num:=
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] dev-ml/zarith:= dev-ml/lablgtk:2=[sourceview,ocamlopt=] dev-ml/camlzip:= sci-mathematics/psmt2-frontend >=dev-ml/ocplib-simplex-0.4:= >=dev-ml/menhir-20181006:= dev-ml/seq:= dev-ml/dune:= dev-ml/num:=
 SLOT=0
 SRC_URI=https://alt-ergo.ocamlpro.com/http/alt-ergo-2.3.0/alt-ergo-2.3.0.tar.gz
-_md5_=4c9a99b519b6f3d44d62196670080b2d
+_md5_=6f5938c2fb38cfe339650c7b763d96a1
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.19.0 b/metadata/md5-cache/sci-mathematics/arb-2.19.0
index d239a3325e89..cf72794438ad 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.19.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.19.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.19.0.tar.gz -> arb-2.19.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b7de4320a8e61e0af2323ed68b1268e3
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.21.0 b/metadata/md5-cache/sci-mathematics/arb-2.21.0
index baf92d5f7914..764a375e5205 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.21.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.21.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.21.0.tar.gz -> arb-2.21.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8594329b40a38e47f2f4fd829151d24b
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.22.1 b/metadata/md5-cache/sci-mathematics/arb-2.22.1
index ff1d71b9102f..bc8d02949b96 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.22.1
+++ b/metadata/md5-cache/sci-mathematics/arb-2.22.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.22.1.tar.gz -> arb-2.22.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=04c9673e63bc0032e7eb5c6b86f4fcaf
diff --git a/metadata/md5-cache/sci-mathematics/bertini-1.4 b/metadata/md5-cache/sci-mathematics/bertini-1.4
index d5f15b2dce1d..40fe017c5342 100644
--- a/metadata/md5-cache/sci-mathematics/bertini-1.4
+++ b/metadata/md5-cache/sci-mathematics/bertini-1.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp dev-libs/mpfr
 DESCRIPTION=Software for Numerical Algebraic Geometry
 EAPI=7
 HOMEPAGE=http://bertini.nd.edu
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=doc examples +optimization
 KEYWORDS=~amd64 ~x86
 LICENSE=bertini
 RDEPEND=dev-libs/gmp dev-libs/mpfr
 SLOT=0
 SRC_URI=http://www3.nd.edu/~sommese/bertini/BertiniSource_v1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6282d0596ebfaaab9cd013bcfc65b18c
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.3.8 b/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
index 133fe057c7ec..649d8098c0e6 100644
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
+++ b/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_8? ( dev-python/gmpy:2[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/sympy[python_targets_python3_8(-)] jupyter? ( dev-python/jupyter[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/gmpy:2[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/sympy[python_targets_python3_9(-)] jupyter? ( dev-python/jupyter[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) gtk? ( dev-cpp/gtkmm:3.0 )
 DESCRIPTION=Field-theory motivated approach to computer algebra
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.3.8.tar.gz -> cadabra-2.3.8.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bdba8e68ae14f7f648a65794cc62a440
diff --git a/metadata/md5-cache/sci-mathematics/cadical-1.5.2-r1 b/metadata/md5-cache/sci-mathematics/cadical-1.5.2-r1
index de352cc04cd0..e40380b6990d 100644
--- a/metadata/md5-cache/sci-mathematics/cadical-1.5.2-r1
+++ b/metadata/md5-cache/sci-mathematics/cadical-1.5.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Simplified Satisfiability Solver
 EAPI=8
 HOMEPAGE=http://fmv.jku.at/cadical/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0/1.5.2
 SRC_URI=https://github.com/arminbiere/cadical/archive/rel-1.5.2.tar.gz -> cadical-1.5.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=13d23c58e98ce73fac79905166beaf78
diff --git a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4 b/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
index a188e50fc4f1..03ed511fc3b1 100644
--- a/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
+++ b/metadata/md5-cache/sci-mathematics/calc-2.12.5.4
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig
 DESCRIPTION=Arbitrary precision C-like arithmetic system
 EAPI=6
 HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://www.isthe.com/chongo/src/calc/calc-2.12.5.4.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=771f2d0a4029f017f2bdeab8705393eb
diff --git a/metadata/md5-cache/sci-mathematics/calc-2.13.0.1 b/metadata/md5-cache/sci-mathematics/calc-2.13.0.1
index 3b318774dc87..5afabc8acc9f 100644
--- a/metadata/md5-cache/sci-mathematics/calc-2.13.0.1
+++ b/metadata/md5-cache/sci-mathematics/calc-2.13.0.1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Arbitrary precision C-like arithmetic system
 EAPI=7
 HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://www.isthe.com/chongo/src/calc/calc-2.13.0.1.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=065d822303241028441981f397d6d534
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.1-r2 b/metadata/md5-cache/sci-mathematics/cgal-5.1-r2
deleted file mode 100644
index 93a8f5943d73..000000000000
--- a/metadata/md5-cache/sci-mathematics/cgal-5.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=C++ library for geometric algorithms and data structures
-EAPI=7
-HOMEPAGE=https://www.cgal.org/
-INHERIT=cmake
-IUSE=doc examples +gmp mpfi ntl qt5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3 GPL-3 Boost-1.0
-RDEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-SLOT=0/14
-SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1-doc_html.tar.xz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9884f288a9d496fb644c6451044c40ad
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.2-r2 b/metadata/md5-cache/sci-mathematics/cgal-5.2-r2
index ec472717e27f..c7ec3c273d85 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2-r2
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/xz-utils virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=C++ library for geometric algorithms and data structures
@@ -11,5 +11,5 @@ LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 SLOT=0/14
 SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.2/CGAL-5.2.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.2/CGAL-5.2-doc_html.tar.xz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4cd5e56c9c063a59008d682a49041ade
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=72e2878154d1ef3e67f1263843db8b9c
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2 b/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2
deleted file mode 100644
index 14de48f6c45b..000000000000
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=C++ library for geometric algorithms and data structures
-EAPI=7
-HOMEPAGE=https://www.cgal.org/
-INHERIT=cmake
-IUSE=doc examples +gmp mpfi ntl qt5 shared
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3 GPL-3 Boost-1.0
-RDEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx(+)] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-SLOT=0/14
-SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1-doc_html.tar.xz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f88717d9a09907c9d09414cedfdaa76
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.2.2-r1 b/metadata/md5-cache/sci-mathematics/cgal-5.4.1
index 85c26e357f5a..699480c15b2e 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2.2-r1
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.4.1
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/xz-utils virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=C++ library for geometric algorithms and data structures
 EAPI=7
 HOMEPAGE=https://www.cgal.org/
 INHERIT=cmake
-IUSE=doc examples +gmp mpfi ntl qt5 shared
+IUSE=doc examples +gmp mpfi ntl qt5 +shared
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:= gmp? ( dev-libs/gmp:=[cxx] ) mpfi? ( sci-libs/mpfi ) ntl? ( dev-libs/ntl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 SLOT=0/14
-SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.2.2/CGAL-5.2.2.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.2.2/CGAL-5.2.2-doc_html.tar.xz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a682a43617ad643ab66aeef0eb3999f6
+SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.4.1/CGAL-5.4.1.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.4.1/CGAL-5.4.1-doc_html.tar.xz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=992246ea99c7362680af4ee6ce4403b6
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1 b/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
index dc8bf978952a..06f3a7268a2c 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
@@ -3,6 +3,7 @@ DEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlop
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
+INHERIT=desktop multilib
 IUSE=gtk debug +ocamlopt doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlo
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.11.2.tar.gz -> coq-8.11.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=5836a25a10b5cace312d5498dca2bab6
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2 b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
index 37a812cfea50..09ac89e73472 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
@@ -3,6 +3,7 @@ DEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlop
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
+INHERIT=desktop multilib
 IUSE=gtk debug +ocamlopt doc
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlo
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.12.0.tar.gz -> coq-8.12.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=25c8cc65061801bb284df24625c245f1
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1 b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
index 230894fd157a..fff63b264889 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
@@ -3,6 +3,7 @@ DEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? (
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
+INHERIT=desktop findlib
 IUSE=gtk debug +ocamlopt doc +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.13.0.tar.gz -> coq-8.13.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	e6df6108c2d753998b1206f4d5ea4a2d
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=cf095aa4b2685a05dc9a994fa9bd075f
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2 b/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2
index 4fad3f672f81..bd1be52568a0 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.15.0.tar.gz -> coq-8.15.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=b1485dd39cb0ad08c03e41357f67bdc1
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.15.1 b/metadata/md5-cache/sci-mathematics/coq-8.15.1
index e8693cd32b41..8f042113e7c5 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.15.1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.15.1
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.15.1.tar.gz -> coq-8.15.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=b1485dd39cb0ad08c03e41357f67bdc1
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.15.2 b/metadata/md5-cache/sci-mathematics/coq-8.15.2
new file mode 100644
index 000000000000..036d84aa66ed
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-8.15.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-java/antlr-4.7:4 dev-python/antlr4-python3-runtime dev-python/beautifulsoup4 dev-python/pexpect dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex dev-tex/latexmk dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-xetex media-fonts/freefont ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install test
+DEPEND=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?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Proof assistant written in O'Caml
+EAPI=8
+HOMEPAGE=http://coq.inria.fr/
+INHERIT=desktop dune
+IUSE=doc gtk debug +ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+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?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coq/coq/archive/V8.15.2.tar.gz -> coq-8.15.2.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=b1485dd39cb0ad08c03e41357f67bdc1
diff --git a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0 b/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
index 2c355bcc7851..c6ed247ee3c5 100644
--- a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
+++ b/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 DESCRIPTION=Advanced SAT solver with C++ and Python interfaces
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/5.8.0
 SRC_URI=https://github.com/msoos/cryptominisat/archive/5.8.0.tar.gz -> cryptominisat-5.8.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=deb5232634cb85a9e60b29dec9f2ff70
diff --git a/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1 b/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
index 3d0a7e4d8813..16b9edb06169 100644
--- a/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost readline? ( sys-libs/readline:0= ) cln? ( sci-libs/cln ) !cln? ( dev-libs/gmp:= )
 SLOT=0
 SRC_URI=https://github.com/CVC4/CVC4/archive/1.7.tar.gz -> cvc4-1.7.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=73eb7557b250b6e03a10a8a21b4ef72b
diff --git a/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1 b/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1
index 946385f54571..12c6eac2d22f 100644
--- a/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost readline? ( sys-libs/readline:0= ) cln? ( sci-libs/cln ) !cln? ( dev-libs/gmp:= )
 SLOT=0
 SRC_URI=https://github.com/CVC4/CVC4-archived/archive/refs/tags/1.8.tar.gz -> cvc4-1.8.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8ccaecbb01f9e5e708e8386fb3bdcc53
diff --git a/metadata/md5-cache/sci-mathematics/dataplot-20131220 b/metadata/md5-cache/sci-mathematics/dataplot-20131220
index e14cbc78255f..9b24f58fe0a1 100644
--- a/metadata/md5-cache/sci-mathematics/dataplot-20131220
+++ b/metadata/md5-cache/sci-mathematics/dataplot-20131220
@@ -4,6 +4,7 @@ DEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,j
 DESCRIPTION=Program for scientific visualization and statistical analyis
 EAPI=7
 HOMEPAGE=https://www.itl.nist.gov/div898/software/dataplot/
+INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs
 IUSE=examples gd opengl X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
@@ -11,5 +12,5 @@ RDEPEND=media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc_2013_12_20.tar.gz ftp://ftp.nist.gov/pub/dataplot/unix/dplib.2009_07_15.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=304c7ba27edbe3f1e5e6c83a467d0ad0
diff --git a/metadata/md5-cache/sci-mathematics/diagrtb-2.64 b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
index 963984ebbd42..f6f7cec3fbcf 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/fortran
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/fortran
 DESCRIPTION=Calculation of some eigenvectors of a large real, symmetrical, matrix
@@ -12,5 +12,5 @@ RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ecole.modelisation.free.fr/rtb2011.tar.gz -> diagrtb-2.64.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9d6abef4976841d445b75446ef4cc6d3
diff --git a/metadata/md5-cache/sci-mathematics/dsfmt-2.2.4 b/metadata/md5-cache/sci-mathematics/dsfmt-2.2.4
index 022d1673750e..077a469fdf63 100644
--- a/metadata/md5-cache/sci-mathematics/dsfmt-2.2.4
+++ b/metadata/md5-cache/sci-mathematics/dsfmt-2.2.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=Double precision SIMD-oriented Fast Mersenne Twister library
 EAPI=7
 HOMEPAGE=http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/MersenneTwister-Lab/dSFMT/archive/v2.2.4.tar.gz -> dsfmt-2.2.4.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=741a383d5b242e48a5675dfa6c47f73b
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
deleted file mode 100644
index 8d35e996c4da..000000000000
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cvxopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to solve linear games over symmetric cones
-EAPI=7
-HOMEPAGE=http://michael.orlitzky.com/code/dunshire/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=dev-python/cvxopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dunshire/dunshire-0.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f5d8ae5651adf7ef9f4722e76e0e4e59
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r2 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r2
new file mode 100644
index 000000000000..9d2cae124fc7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cvxopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to solve linear games over symmetric cones
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/dunshire/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=dev-python/cvxopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dunshire/dunshire-0.1.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=96bed015ec7c7ef5f405e89d4e5a3a1a
diff --git a/metadata/md5-cache/sci-mathematics/ent-101202 b/metadata/md5-cache/sci-mathematics/ent-101202
index f56e3c2dbe07..2e60b460ae85 100644
--- a/metadata/md5-cache/sci-mathematics/ent-101202
+++ b/metadata/md5-cache/sci-mathematics/ent-101202
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Pseudorandom number sequence test
 EAPI=8
 HOMEPAGE=http://www.fourmilab.ch/random/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/random-101202.zip
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a19184e87976b5825768670b96714437
diff --git a/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1 b/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
index 94aeaa8a517a..d873192cd950 100644
--- a/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
+++ b/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:2
 DESCRIPTION=Mathematical programming environment
 EAPI=7
 HOMEPAGE=http://euler.sourceforge.net/
+INHERIT=autotools
 KEYWORDS=amd64 ~ppc -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/euler/euler-1.61.0.tgz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a4cc367c3587f9a1cab8e6a45fcb9cbd
diff --git a/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1 b/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
index 1e76df2e99fb..ad15ea141cf3 100644
--- a/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
+++ b/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/unzip >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fast Artificial Neural Network Library
 EAPI=7
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/fann/FANN-2.2.0-Source.zip
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ea96bdf2c2e09f211063ecbad1fe07d0
diff --git a/metadata/md5-cache/sci-mathematics/fann-9999 b/metadata/md5-cache/sci-mathematics/fann-9999
index 5e12b44b88d7..f4f0e0d15555 100644
--- a/metadata/md5-cache/sci-mathematics/fann-9999
+++ b/metadata/md5-cache/sci-mathematics/fann-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Fast Artificial Neural Network Library
 EAPI=7
@@ -8,5 +8,5 @@ IUSE=examples
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5f307ad7613ca946ca89005f1d38fc29
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1 b/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
index 3f8278518719..0d21b92b551f 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=http://www.flintlib.org/flint-2.7.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a7e148f761fa9ffc51ee0a6158647611
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.8.4 b/metadata/md5-cache/sci-mathematics/flint-2.8.4
index 11c0e73422e1..e394f7c7ceb5 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.8.4
+++ b/metadata/md5-cache/sci-mathematics/flint-2.8.4
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.8.4.tar.gz -> flint-2.8.4.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9e25bc7dc7de939717feaa7008d4b536
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.8.5 b/metadata/md5-cache/sci-mathematics/flint-2.8.5
new file mode 100644
index 000000000000..222e300e1cd7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/flint-2.8.5
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-tex/latexmk ) || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
+DESCRIPTION=Fast Library for Number Theory
+EAPI=8
+HOMEPAGE=http://www.flintlib.org/
+INHERIT=cmake python-any-r1
+IUSE=doc ntl test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.8.5.tar.gz -> flint-2.8.5.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0b3820ddb030d9316e2df64f5be90fd4
diff --git a/metadata/md5-cache/sci-mathematics/form-4.2.1 b/metadata/md5-cache/sci-mathematics/form-4.2.1
index 2d14de26ffbb..6eb013709025 100644
--- a/metadata/md5-cache/sci-mathematics/form-4.2.1
+++ b/metadata/md5-cache/sci-mathematics/form-4.2.1
@@ -4,11 +4,12 @@ DEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib ) dev
 DESCRIPTION=Symbolic Manipulation System
 EAPI=7
 HOMEPAGE=https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/
+INHERIT=autotools toolchain-funcs
 IUSE=devref doc doxygen gmp mpi threads zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e557506e2128502d6824ad28c0694bbd
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.7 b/metadata/md5-cache/sci-mathematics/fricas-1.3.7
index 87c996293a6b..12f11b981983 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.7
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.7
@@ -3,6 +3,7 @@ DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
 EAPI=7
 HOMEPAGE=http://fricas.sourceforge.net/ https://github.com/fricas/fricas https://fricas.github.io/
+INHERIT=multilib elisp-common
 IUSE=sbcl cmucl gcl ecls clisp clozurecl X emacs gmp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -10,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.3.7-full.tar.bz2
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3dca7f89ec651d65bce6ca05b4fce110
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.6 b/metadata/md5-cache/sci-mathematics/fricas-1.3.8
index 6cc1bc093ae0..39c4173b5001 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.6
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.8
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm test
 DEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
 DESCRIPTION=FriCAS is a fork of Axiom computer algebra system
-EAPI=7
-HOMEPAGE=http://fricas.sourceforge.net/
+EAPI=8
+HOMEPAGE=http://fricas.sourceforge.net/ https://github.com/fricas/fricas https://fricas.github.io/
+INHERIT=elisp-common
 IUSE=sbcl cmucl gcl ecls clisp clozurecl X emacs gmp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) clozurecl? ( dev-lisp/clozurecl:= ) !clozurecl? ( clisp? ( dev-lisp/clisp:= ) !clisp? ( ecls? ( dev-lisp/ecls:= ) !ecls? ( gcl? ( dev-lisp/gcl:= ) !gcl? ( cmucl? ( dev-lisp/cmucl:= ) !cmucl? ( dev-lisp/sbcl:= ) ) ) ) )
 RESTRICT=strip
 SLOT=0
-SRC_URI=mirror://sourceforge/fricas/fricas-1.3.6-full.tar.bz2
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e6cab1953113fb8f580268ea62aa9803
+SRC_URI=mirror://sourceforge/fricas/fricas-1.3.8-full.tar.bz2
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=a7c22444de153ee19dc882ca74f24893
diff --git a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r3 b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r3
index 4a73a0c1dce6..343dc021d146 100644
--- a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r3
+++ b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r3
@@ -3,11 +3,12 @@ DEPEND=dev-libs/gmp:0=[cxx(+)] doc? ( virtual/latex-base )
 DESCRIPTION=Software system and project for computations with monomial ideals
 EAPI=6
 HOMEPAGE=http://www.broune.com/frobby/
+INHERIT=toolchain-funcs
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=[cxx(+)]
 SLOT=0
 SRC_URI=http://www.broune.com/frobby/frobby_v0.9.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2baf31f84e798c0531cedf408e160124
diff --git a/metadata/md5-cache/sci-mathematics/genius-1.0.25 b/metadata/md5-cache/sci-mathematics/genius-1.0.25
index b1f8940995bc..f2be9cc55cc4 100644
--- a/metadata/md5-cache/sci-mathematics/genius-1.0.25
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.25
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.41.1:2 dev-libs/gmp:0= dev-libs/mpfr:0= sys-libs/ncurses:0= sys-libs/readline:0= gui? ( >=x11-libs/gtk+-3.21.4:3 >=x11-libs/gtksourceview-3.99.7:4 gui-libs/amtk:5 >=x11-libs/vte-0.50.0:2.91 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/genius/1.0/genius-1.0.25.tar.xz doc? ( https://www.jirka.org/genius-reference.pdf )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=80c38a6e89aa80a97c78a51b9f876a1d
diff --git a/metadata/md5-cache/sci-mathematics/genius-1.0.27 b/metadata/md5-cache/sci-mathematics/genius-1.0.27
index 21e103de10a2..7ee87cfd68af 100644
--- a/metadata/md5-cache/sci-mathematics/genius-1.0.27
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.27
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.41.1:2 dev-libs/gmp:0= dev-libs/mpfr:0= sys-libs/ncurse
 DESCRIPTION=Genius Mathematics Tool and the GEL Language
 EAPI=7
 HOMEPAGE=https://www.jirka.org/genius.html
+INHERIT=gnome2
 IUSE=doc +gui
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.41.1:2 dev-libs/gmp:0= dev-libs/mpfr:0= sys-libs/ncurses:0= sys-libs/readline:0= >=x11-libs/gtk+-3.21.4:3 >=x11-libs/vte-0.50.0:2.91 gui? ( >=x11-libs/gtk+-3.21.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/genius/1.0/genius-1.0.27.tar.xz doc? ( https://www.jirka.org/genius-reference.pdf )
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=76f09b4bb1bfd381dea3217453ab5672
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
index 6e78aab3a858..79ff3a24f3d7 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
+++ b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Mathematics software for geometry
 EAPI=7
 HOMEPAGE=https://www.geogebra.org
+INHERIT=desktop prefix xdg
 KEYWORDS=~amd64 ~ppc64
 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 )
 RDEPEND=dev-java/java-config || ( dev-java/openjdk:8[javafx] dev-java/openjdk:11[javafx] ) !sci-mathematics/geogebra
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-604-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1ad1c05f1b19001232df01c4ba399f96
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
index b8fe368bf54f..8775a2038335 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
+++ b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Mathematics software for geometry
 EAPI=7
 HOMEPAGE=https://www.geogebra.org
+INHERIT=desktop prefix xdg
 KEYWORDS=~amd64 ~ppc64
 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 )
 RDEPEND=dev-java/java-config || ( dev-java/openjdk:8[javafx] dev-java/openjdk:11[javafx] ) !sci-mathematics/geogebra
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=53271f6aa4f53190f5e9dd76f2fbdd9d
diff --git a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1 b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
index aacc332aaec9..5d5ce79a7102 100644
--- a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
+++ b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/glu virtual/opengl x11-libs/motif:0 emacs? ( >=app-editors/emacs-
 DESCRIPTION=Interactive Geometry Viewer
 EAPI=7
 HOMEPAGE=http://geomview.sourceforge.net
+INHERIT=desktop elisp-common flag-o-matic xdg
 IUSE=motionaveraging debug emacs zlib
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/glu virtual/opengl x11-libs/motif:0 emacs? ( >=app-editors/emacs-23.1:* ) zlib? ( sys-libs/zlib ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/geomview/geomview-1.9.5.tar.bz2 https://dev.gentoo.org/~jlec/distfiles/geomview.png.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1832af9bce2969c9d5ec5ff33060e9d3
diff --git a/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4 b/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
index 93b203b60e4b..505e11f80679 100644
--- a/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
+++ b/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0=[cxx(+)] sci-libs/cddlib:0=
 DESCRIPTION=Compute Groebner fans and tropical varieties
 EAPI=8
 HOMEPAGE=https://users-math.au.dk/~jensen/software/gfan/gfan.html
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0=[cxx(+)] sci-libs/cddlib:0=
 SLOT=0
 SRC_URI=https://users-math.au.dk/~jensen/software/gfan/gfan0.6.2.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=db825066acdb10bf8620332c5f4222d0
diff --git a/metadata/md5-cache/sci-mathematics/giac-1.7.0.13-r1 b/metadata/md5-cache/sci-mathematics/giac-1.7.0.13-r1
index 84f477a5f977..8fb95861e037 100644
--- a/metadata/md5-cache/sci-mathematics/giac-1.7.0.13-r1
+++ b/metadata/md5-cache/sci-mathematics/giac-1.7.0.13-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:=[cxx(+)] sys-libs/readline:= gui? ( x11-libs/fltk media-lib
 DESCRIPTION=A free C++ Computer Algebra System library and its interfaces
 EAPI=7
 HOMEPAGE=https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
+INHERIT=autotools flag-o-matic xdg-utils
 IUSE=ao doc +ecm examples gc +glpk gui static-libs test l10n_el l10n_en l10n_es l10n_pt
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( gui )
 RESTRICT=!test? ( test ) mirror
 SLOT=0
 SRC_URI=https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_1.7.0-13.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=49c51123d8ff9de4f086ce7fb98b9a69
diff --git a/metadata/md5-cache/sci-mathematics/giac-1.7.0.47 b/metadata/md5-cache/sci-mathematics/giac-1.7.0.47
index 2098b03958fa..db4d4ca43f32 100644
--- a/metadata/md5-cache/sci-mathematics/giac-1.7.0.47
+++ b/metadata/md5-cache/sci-mathematics/giac-1.7.0.47
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:=[cxx(+)] sys-libs/readline:= gui? ( x11-libs/fltk media-lib
 DESCRIPTION=A free C++ Computer Algebra System library and its interfaces
 EAPI=8
 HOMEPAGE=https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
+INHERIT=autotools flag-o-matic xdg-utils
 IUSE=ao doc +ecm examples gc +glpk gui static-libs test l10n_el l10n_en l10n_es l10n_pt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( gui )
 RESTRICT=!test? ( test ) mirror
 SLOT=0
 SRC_URI=https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_1.7.0-47.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d3808d0455aea28b854f4a890ab66f8d
diff --git a/metadata/md5-cache/sci-mathematics/giac-1.9.0.5 b/metadata/md5-cache/sci-mathematics/giac-1.9.0.5
index db0b388dba68..438c6a3b2ade 100644
--- a/metadata/md5-cache/sci-mathematics/giac-1.9.0.5
+++ b/metadata/md5-cache/sci-mathematics/giac-1.9.0.5
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:=[cxx(+)] sys-libs/readline:= gui? ( x11-libs/fltk media-lib
 DESCRIPTION=A free C++ Computer Algebra System library and its interfaces
 EAPI=8
 HOMEPAGE=https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
+INHERIT=autotools flag-o-matic xdg-utils
 IUSE=ao doc +ecm examples gc +glpk gui static-libs test l10n_el l10n_en l10n_es l10n_pt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( gui )
 RESTRICT=!test? ( test ) mirror
 SLOT=0
 SRC_URI=https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_1.9.0-5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d3808d0455aea28b854f4a890ab66f8d
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.3.6 b/metadata/md5-cache/sci-mathematics/gimps-30.3.6
deleted file mode 100644
index f50603809a41..000000000000
--- a/metadata/md5-cache/sci-mathematics/gimps-30.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=The Great Internet Mersenne Prime Search
-EAPI=7
-HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* amd64 x86
-LICENSE=GIMPS
-RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux32.tar.gz )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d4a593534e55ad4d6af15b11154bece2
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.5.2 b/metadata/md5-cache/sci-mathematics/gimps-30.5.2
deleted file mode 100644
index 8ef3f88d235b..000000000000
--- a/metadata/md5-cache/sci-mathematics/gimps-30.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=The Great Internet Mersenne Prime Search
-EAPI=7
-HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GIMPS
-RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v305b2.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v305b2.linux32.tar.gz )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fc196d74cce6b501e862f34761df2725
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.7.9 b/metadata/md5-cache/sci-mathematics/gimps-30.7.9
index 7a4399c25711..a977b722e476 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.7.9
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.7.9
@@ -3,11 +3,12 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=7
 HOMEPAGE=https://www.mersenne.org/
+INHERIT=pax-utils readme.gentoo-r1 systemd tmpfiles
 KEYWORDS=-* amd64 x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v307b9.linux64.tar.gz -> gimps-30.7.9.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v307b9.linux32.tar.gz -> gimps-30.7.9.linux32.tar.gz )
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=30a77ea017c5d06429d79aa9b5cb22df
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.8.15 b/metadata/md5-cache/sci-mathematics/gimps-30.8.15
new file mode 100644
index 000000000000..bdee2300f204
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.8.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=8
+HOMEPAGE=https://www.mersenne.org/
+INHERIT=pax-utils readme.gentoo-r1 systemd tmpfiles
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v308b15.linux64.tar.gz -> gimps-30.8.15.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v308b15.linux32.tar.gz -> gimps-30.8.15.linux32.tar.gz )
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=ea1e600acc965c7b2d35992b64b0b951
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.7.11 b/metadata/md5-cache/sci-mathematics/ginac-1.7.11
index 30859d634242..bc8a874d1508 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.7.11
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.7.11
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.7.11.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c7a69fd03dd2c3d970bf5b25386b75d9
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.8.0 b/metadata/md5-cache/sci-mathematics/ginac-1.8.0
index 961026486ff7..f6bffb933aef 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.0
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.8.0.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=55426d1156ac0590535a83c0918bf8b6
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.8.2 b/metadata/md5-cache/sci-mathematics/ginac-1.8.2
index f6259db04706..4d297398f292 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.2
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.ginac.de/
 INHERIT=python-any-r1
 IUSE=doc examples
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.8.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=69a5d34a52a98e49f1f87bd4591bf951
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3e007c3da4cb8cd0a6b7c755fb1c2d11
diff --git a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1 b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
index d4be16039a82..0e5faa795440 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
+++ b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
@@ -4,11 +4,12 @@ DEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0=
 DESCRIPTION=GNU Linear Programming Kit
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/glpk/
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=doc examples gmp odbc mysql
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=sci-libs/amd:0= sci-libs/colamd:= sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )
 SLOT=0/40
 SRC_URI=mirror://gnu/glpk/glpk-5.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=aaf237795ac995185f1ba48bb8777a66
diff --git a/metadata/md5-cache/sci-mathematics/gmm-5.1 b/metadata/md5-cache/sci-mathematics/gmm-5.1
index 91375d187ff6..5fd783464145 100644
--- a/metadata/md5-cache/sci-mathematics/gmm-5.1
+++ b/metadata/md5-cache/sci-mathematics/gmm-5.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 LGPL-3-with-linking-exception )
 SLOT=0
 SRC_URI=mirror://nongnu/getfem/stable/gmm-5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=291ed53d17c2ceb4bd81a07cf500f50d
diff --git a/metadata/md5-cache/sci-mathematics/gmm-5.3 b/metadata/md5-cache/sci-mathematics/gmm-5.3
index f852bc3b357c..5e216cf1dc2c 100644
--- a/metadata/md5-cache/sci-mathematics/gmm-5.3
+++ b/metadata/md5-cache/sci-mathematics/gmm-5.3
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=Generic C++ template library for sparse, dense and skyline matrices
 EAPI=7
 HOMEPAGE=http://getfem.org/gmm.html
+INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 LGPL-3-with-linking-exception )
 SLOT=0
 SRC_URI=mirror://nongnu/getfem/stable/gmm-5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=df3c19b324693ccd2526a5ad45feaf9b
diff --git a/metadata/md5-cache/sci-mathematics/gmm-5.4 b/metadata/md5-cache/sci-mathematics/gmm-5.4
index 4e4689d9a29b..4136d29e4dcf 100644
--- a/metadata/md5-cache/sci-mathematics/gmm-5.4
+++ b/metadata/md5-cache/sci-mathematics/gmm-5.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=Generic C++ template library for sparse, dense and skyline matrices
 EAPI=8
 HOMEPAGE=http://getfem.org/gmm.html
+INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 LGPL-3-with-linking-exception )
 SLOT=0
 SRC_URI=mirror://nongnu/getfem/stable/gmm-5.4.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3287cc3908674423f6daa58ba61316d2
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
index 6f6aafcfb6b2..4af6e1977984 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
@@ -1,14 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare pretend
+DEFINED_PHASES=compile configure install prepare pretend setup
 DEPEND=dev-libs/gmp:=
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=7
 HOMEPAGE=https://gitlab.inria.fr/zimmerma/ecm
+INHERIT=autotools toolchain-funcs
 IUSE=+custom-tune openmp static-libs cpu_flags_x86_sse2
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:=
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/ecm-7.0.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=053be1578ac536eecd1f7b4787434628
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7fc82f4da6e1346c5646f9e4e8e1998f
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5
index af9540719a54..e054dd9da843 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5
@@ -1,5 +1,5 @@
 BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets
-DEFINED_PHASES=compile configure install pretend
+DEFINED_PHASES=compile configure install pretend setup
 DEPEND=dev-libs/gmp:= cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers )
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=8
@@ -11,5 +11,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:= cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers )
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-7.0.5.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=711f882f8caf84c98e5c4aabf569b855
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=be473b7c266f789279dabd75879c95ef
diff --git a/metadata/md5-cache/sci-mathematics/gretl-2021d b/metadata/md5-cache/sci-mathematics/gretl-2021d
index fc5662c65d4a..2b2e2464edc5 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-2021d
+++ b/metadata/md5-cache/sci-mathematics/gretl-2021d
@@ -1,9 +1,10 @@
 BDEPEND=virtual/pkgconfig extras? ( dev-texlive/texlive-latexextra ) gtk? ( x11-misc/xdg-utils )
-DEFINED_PHASES=compile configure install postinst postrm pretend
+DEFINED_PHASES=compile configure install postinst postrm pretend setup
 DEPEND=dev-libs/glib:2= >=dev-libs/gmp-4.0.1:0= dev-libs/json-glib:0= dev-libs/libxml2:2= >=dev-libs/mpfr-2.2.0:0= net-misc/curl:0= sci-libs/fftw:3.0= sci-visualization/gnuplot virtual/lapack virtual/latex-base emacs? ( >=app-editors/emacs-23.1:* ) gnome? ( >=gnome-extra/libgsf-1.14.47[gtk?] ) gtk? ( media-libs/gd:2=[png] >=sci-visualization/gnuplot-5.0[cairo] x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) mpi? ( virtual/mpi ) odbc? ( dev-db/unixODBC:0= ) R? ( dev-lang/R:0= ) readline? ( sys-libs/readline:0= )
 DESCRIPTION=Regression, econometrics and time-series library
 EAPI=8
 HOMEPAGE=http://gretl.sourceforge.net/
+INHERIT=elisp-common toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_avx emacs extras gnome gtk mpi nls odbc openmp python readline cpu_flags_x86_sse2 R
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2= >=dev-libs/gmp-4.0.1:0= dev-libs/json-glib:0= dev-libs/
 REQUIRED_USE=emacs? ( gtk )
 SLOT=0/40
 SRC_URI=mirror://sourceforge/project/gretl/gretl/2021d/gretl-2021d.tar.xz
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=691d4864e48fe91f8c339691d3f76868
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9e2447542b4c60ef587a6f9835afe54d
diff --git a/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1 b/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1
index 1caa0b2bb6a5..e4ef12b907f3 100644
--- a/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1
+++ b/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1
@@ -3,11 +3,12 @@ DEPEND=>=sci-libs/gsl-1.14:= virtual/blas >=x11-libs/agg-2.5 >=media-libs/freety
 DESCRIPTION=Lua interactive shell for sci-libs/gsl
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gsl-shell/
+INHERIT=toolchain-funcs
 IUSE=doc fox
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=sci-libs/gsl-1.14:= virtual/blas >=x11-libs/agg-2.5 >=media-libs/freetype-2.4.10 sys-libs/readline:0= || ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu ) fox? ( x11-libs/fox:1.6 )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/gsl-shell/gsl-shell-2.3.0-beta1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b4ee6f8f25660c3f3b00d677fa000c57
diff --git a/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2 b/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
index 0ca4b927511f..757c8c012c90 100644
--- a/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
+++ b/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-libs/gsl-1.14:= virtual/blas >=x11-libs/agg-2.5 >=media-libs/freetype-2.4.10 sys-libs/readline:0= || ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu ) fox? ( x11-libs/fox:1.6 )
 SLOT=0
 SRC_URI=https://github.com/franko/gsl-shell/archive/refs/tags/v2.3.2.tar.gz -> gsl-shell-2.3.2.tar.gz
-_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f4731f9c8f4d1a71fb9135da7f8f83ac
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.2.0 b/metadata/md5-cache/sci-mathematics/jags-4.2.0
index 9464fb3232cb..59ec308a7fec 100644
--- a/metadata/md5-cache/sci-mathematics/jags-4.2.0
+++ b/metadata/md5-cache/sci-mathematics/jags-4.2.0
@@ -3,11 +3,12 @@ DEPEND=virtual/blas virtual/lapack virtual/pkgconfig doc? ( virtual/latex-base d
 DESCRIPTION=Just Another Gibbs Sampler for Bayesian MCMC simulation
 EAPI=6
 HOMEPAGE=http://mcmc-jags.sourceforge.net/
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f960cee34ddeaa990981cf525b087064
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.3.0 b/metadata/md5-cache/sci-mathematics/jags-4.3.0
index 67acabb8b8fd..1808f682b557 100644
--- a/metadata/md5-cache/sci-mathematics/jags-4.3.0
+++ b/metadata/md5-cache/sci-mathematics/jags-4.3.0
@@ -4,11 +4,12 @@ DEPEND=virtual/blas virtual/lapack
 DESCRIPTION=Just Another Gibbs Sampler for Bayesian MCMC simulation
 EAPI=7
 HOMEPAGE=https://mcmc-jags.sourceforge.io/
+INHERIT=toolchain-funcs
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.3.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=836e1bd972a32ea3dd6d44b1739c3e98
diff --git a/metadata/md5-cache/sci-mathematics/lcalc-2.0.5-r2 b/metadata/md5-cache/sci-mathematics/lcalc-2.0.5-r2
new file mode 100644
index 000000000000..4dfbe2bb4f2e
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/lcalc-2.0.5-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gengetopt
+DEFINED_PHASES=configure install
+DEPEND=double-double? ( sci-libs/qd:= ) quad-double? ( sci-libs/qd:= ) pari? ( sci-mathematics/pari:= )
+DESCRIPTION=Command-line utility and library for L-function computations
+EAPI=8
+HOMEPAGE=https://gitlab.com/sagemath/lcalc
+IUSE=+double double-double quad-double pari
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=double-double? ( sci-libs/qd:= ) quad-double? ( sci-libs/qd:= ) pari? ( sci-mathematics/pari:= )
+REQUIRED_USE=^^ ( double double-double quad-double )
+SLOT=0/1
+SRC_URI=https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e192/lcalc-2.0.5.tar.xz
+_md5_=b83eb08a8bffd0d9497574315744c2e3
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.39.1 b/metadata/md5-cache/sci-mathematics/lean-3.39.1
deleted file mode 100644
index e070612c2fd5..000000000000
--- a/metadata/md5-cache/sci-mathematics/lean-3.39.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:=
-DESCRIPTION=The Lean Theorem Prover
-EAPI=8
-HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=cmake readme.gentoo-r1
-IUSE=debug +threads
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/gmp:=
-SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.39.1.tar.gz -> lean-3.39.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=191856eb1920b2d482029002a59cf661
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.42.1 b/metadata/md5-cache/sci-mathematics/lean-3.42.1
index d2b81af64613..38a565bc783f 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.42.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.42.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.42.1.tar.gz -> lean-3.42.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.42.0 b/metadata/md5-cache/sci-mathematics/lean-3.43.0
index e300516b5b29..4def6e5a4f0b 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.42.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.43.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.42.0.tar.gz -> lean-3.42.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.43.0.tar.gz -> lean-3.43.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.41.0 b/metadata/md5-cache/sci-mathematics/lean-3.44.1
index 1a3e79fe0b29..7ab78fd3ec3e 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.41.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.44.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.41.0.tar.gz -> lean-3.41.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.44.1.tar.gz -> lean-3.44.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.9999 b/metadata/md5-cache/sci-mathematics/lean-3.9999
index cf8face39d2a..a5141458980b 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.9999
+++ b/metadata/md5-cache/sci-mathematics/lean-3.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0 b/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0-r1
index ed720339bf68..f527288fc769 100644
--- a/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
+++ b/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0-r1
@@ -1,12 +1,11 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=install
 DEPEND=sci-libs/colamd
 DESCRIPTION=Mixed Integer Linear Programming (MILP) solver
-EAPI=6
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/lpsolve/
-IUSE=static-libs
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/colamd
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/lpsolve-5.5.2.0.tar.xz
-_md5_=1db2d5840d9d375e96d4f20a0c5628e6
+_md5_=eb3fd0e168b3cb0488b7354fa584286b
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1 b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
index 6f8c5a905357..d925dc25065c 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Wolfram Mathematica
 EAPI=7
 HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
 IUSE=+doc
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
 RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=Mathematica_10.3.1_LINUX.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=815e2870a1b434224510b1e2c3514aa3
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.1.0 b/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
index a8bab5a31426..bfd55729aa14 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Wolfram Mathematica
 EAPI=7
 HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
 IUSE=+doc
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
 RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=Mathematica_12.1.0_LINUX.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f5ad4d7e14ff9226e8064420c3c241e8
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1 b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
index dcd4896c82c7..0e4a799c8c11 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Wolfram Mathematica
 EAPI=7
 HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
 IUSE=+doc
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
 RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=Mathematica_12.1.1_LINUX.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f5ad4d7e14ff9226e8064420c3c241e8
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.2.0 b/metadata/md5-cache/sci-mathematics/mathematica-12.2.0
index c3edd57bf21a..fb47c13b1b18 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-12.2.0
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.2.0
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Wolfram Mathematica
 EAPI=7
 HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
 IUSE=+doc
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
 RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=Mathematica_12.2.0_LINUX.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1012637111fd4cadde9d52e71573fe5b
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-13.0.0 b/metadata/md5-cache/sci-mathematics/mathematica-13.0.0
index 518799339314..2a958d0793d2 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-13.0.0
+++ b/metadata/md5-cache/sci-mathematics/mathematica-13.0.0
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Wolfram Mathematica
 EAPI=7
 HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
 IUSE=+doc
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
 RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=Mathematica_13.0.0_BNDL_LINUX.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b86b0f52465c58e8985f959687c8d7e2
diff --git a/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.0-r1 b/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.0-r1
index 32da94abad28..26376dabdfbc 100644
--- a/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.0-r1
+++ b/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/leanprover-community/mathlib-tools/archive/refs/tags/v1.1.0.tar.gz -> mathlib-tools-1.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7d60d4796094410608055f193939fc3
diff --git a/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1 b/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
index 2b02d7c9ab44..20c251cd15bb 100644
--- a/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
+++ b/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/leanprover-community/mathlib-tools/archive/refs/tags/v1.1.1.tar.gz -> mathlib-tools-1.1.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a7d60d4796094410608055f193939fc3
diff --git a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1 b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
index 4cae714c7016..7bdcd7ef2318 100644
--- a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/mathmod/mathmod-4.1.src.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1d289ab54304c5a60e0ccf3e0a7763e4
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5 b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
index db3dfed15f84..a947281f790d 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/ncurses:= gnuplot? ( sci-visualization/gnuplot )
 SLOT=0
 SRC_URI=https://github.com/mfillpot/mathomatic/archive/mathomatic-16.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2ef6c0cf60c11fca0a0aeb888347b6c7
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1
index 9e3d8c48a9c0..5a4b5568533c 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima virtual/libcrypt:= X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( >=app-editors/emacs-23.1:* virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.42.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7101a0ceb8e755f412c111d62efcf9ee
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2 b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
index 6e7634b7359e..1f87a2365dbc 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.45.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b5e459f501b7bd44ea4fc5ab8580ddd1
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.46.0 b/metadata/md5-cache/sci-mathematics/maxima-5.46.0
index 9ab03362a0ac..08539079c347 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.46.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.46.0
@@ -13,5 +13,5 @@ REQUIRED_USE=vtk? ( ^^ ( python_single_target_python3_8 python_single_target_pyt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.46.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=82d127906353798cdd792be7b62ac7ca
diff --git a/metadata/md5-cache/sci-mathematics/metamath-0.198 b/metadata/md5-cache/sci-mathematics/metamath-0.198
index d5b287fc68d5..094381b93b39 100644
--- a/metadata/md5-cache/sci-mathematics/metamath-0.198
+++ b/metadata/md5-cache/sci-mathematics/metamath-0.198
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Proof verifier based on a minimalistic formalism
 EAPI=8
 HOMEPAGE=http://us.metamath.org/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/metamath/metamath-exe/archive/refs/tags/v0.198.tar.gz -> metamath-0.198.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=339b045621fceffa1ef1cfc145741072
diff --git a/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1 b/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
index 105ed88e379a..3be5b6e458ad 100644
--- a/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
+++ b/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib:=
 DESCRIPTION=Small yet efficient SAT solver with reference paper
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib:=
 SLOT=0/2.2.1
 SRC_URI=https://github.com/stp/minisat/archive/releases/2.2.1.tar.gz -> minisat-2.2.1.tar.gz doc? ( http://minisat.se/downloads/MiniSat.pdf )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fac114018ca9b6d7e277dee1812172a1
diff --git a/metadata/md5-cache/sci-mathematics/msieve-1.53-r1 b/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
index 6b485116df0f..3a776d744e43 100644
--- a/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
+++ b/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
@@ -3,11 +3,12 @@ DEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zl
 DESCRIPTION=A C library implementing a suite of algorithms to factor large integers
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/msieve/
+INHERIT=toolchain-funcs
 IUSE=zlib +ecm mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz -> msieve-1.53.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=25192422fffd61f6913002e55ded9baf
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.7.3 b/metadata/md5-cache/sci-mathematics/nauty-2.7.3
index 4e154acfe259..a9fb658c2cc8 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.7.3
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.7.3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
 DESCRIPTION=Computing automorphism groups of graphs and digraphs
 EAPI=8
 HOMEPAGE=https://pallini.di.uniroma1.it/
+INHERIT=autotools
 IUSE=examples
 KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
 SLOT=0
 SRC_URI=https://pallini.di.uniroma1.it/nauty27r3.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.7r3+ds-1.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2a1f1ce693480d41593c2ad5007dbfc8
diff --git a/metadata/md5-cache/sci-mathematics/nestedsums-1.5.2-r1 b/metadata/md5-cache/sci-mathematics/nestedsums-1.5.2-r1
index a1fcdf5d39bb..51b2ad77deb6 100644
--- a/metadata/md5-cache/sci-mathematics/nestedsums-1.5.2-r1
+++ b/metadata/md5-cache/sci-mathematics/nestedsums-1.5.2-r1
@@ -4,11 +4,12 @@ DEPEND=>=sci-mathematics/ginac-1.7
 DESCRIPTION=A GiNaC-based library for symbolic expansion of certain transcendental functions
 EAPI=7
 HOMEPAGE=https://particlephysics.uni-mainz.de/weinzierl/nestedsums/
+INHERIT=flag-o-matic
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sci-mathematics/ginac-1.7
 SLOT=0
 SRC_URI=http://particlephysics.uni-mainz.de/weinzierl/download/nestedsums-1.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7ef3d18f261cf4df754d814fda66c717
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3-r1 b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3-r1
index 2bf574e83e0a..45b0e7dfd606 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3-r1
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install prepare pretend setup
 DEPEND=dev-libs/gmp[cxx(+)] doc? ( app-text/texlive ) dev-libs/boost
 DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=6
 HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
+INHERIT=toolchain-funcs versionator
 IUSE=doc extras openmp
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp[cxx(+)]
 SLOT=0
 SRC_URI=https://github.com/Normaliz/Normaliz/archive/v3.1.3.tar.gz -> normaliz-3.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=97a6f08ae0e8e5a45c58d3aff6428deb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=c1212bf4d03d58278cb927ce1ab98414
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1 b/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1
index c2a79e56e36d..72945f19c4d2 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1
@@ -1,14 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
+DEFINED_PHASES=configure install prepare pretend setup test
 DEPEND=dev-libs/gmp:=[cxx(+)] dev-libs/boost
 DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=7
 HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
+INHERIT=autotools toolchain-funcs
 IUSE=doc extras openmp
 KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp:=[cxx(+)]
 SLOT=0/3
 SRC_URI=https://github.com/Normaliz/Normaliz/archive/v3.8.10.tar.gz -> normaliz-3.8.10.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fc5e15ee74cadf9010ecd4bad629ff25
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c9567099d7c13fea32d7e5955b28d14b
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.9.3 b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
index 197b6b69fcd5..7f644cd91841 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install setup
+DEFINED_PHASES=compile configure install pretend setup
 DEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty ) dev-libs/boost
 DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty )
 SLOT=0/3
 SRC_URI=https://github.com/Normaliz/Normaliz/releases/download/v3.9.3/normaliz-3.9.3.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=722099c86855ed7dbffb6b7ce864f2d5
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=42721fc3a444ec53a53f8dd431f7aad6
diff --git a/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2 b/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
index 78c913cda66e..b5d8b835d35b 100644
--- a/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
+++ b/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=A set of programs for dealing with numbers from the command line
 EAPI=7
 HOMEPAGE=https://suso.suso.org/programs/num-utils/index.phtml
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 arm ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://suso.suso.org/programs/num-utils/downloads/num-utils-0.5.tar.gz mirror://debian/pool/main/n/num-utils/num-utils_0.5-15.debian.tar.xz
-_md5_=5b6f5ea0723bddf2c43491da361b312a
+_md5_=7d7bc8aaf7312e40787dc2a07afcfbfe
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
index 71c4780a0177..3cf2759ae160 100644
--- a/metadata/md5-cache/sci-mathematics/octave-5.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-5.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl 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= ) ssl? ( dev-libs/openssl: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= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/5.2.0
 SRC_URI=mirror://gnu/octave/octave-5.2.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d1aaea16a861d05eeb512171b226f8a2
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.4.0-r2 b/metadata/md5-cache/sci-mathematics/octave-6.4.0-r3
index 1033a852259e..f66e59a3ad37 100644
--- a/metadata/md5-cache/sci-mathematics/octave-6.4.0-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-6.4.0-r3
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/fortran
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip 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= ) 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 ) || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip 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-6.2.0:= ) X? ( x11-libs/libX11:0= ) 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 ) || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/octave/
 INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg-utils
 IUSE=curl doc fftw +glpk gnuplot gui hdf5 java opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip 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= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip 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-6.2.0:= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/6.4.0
 SRC_URI=mirror://gnu/octave/octave-6.4.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58232e1f1a23f8d6a423ceec7e94bc1d
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6b4137d7214ab5526dda3f86cc37fc10
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.1.0 b/metadata/md5-cache/sci-mathematics/octave-7.1.0
index 2647cfc7d1ee..02a874966bb7 100644
--- a/metadata/md5-cache/sci-mathematics/octave-7.1.0
+++ b/metadata/md5-cache/sci-mathematics/octave-7.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip 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.8:* ) json? ( dev-libs/rapidjson ) 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= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/7.1.0
 SRC_URI=mirror://gnu/octave/octave-7.1.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1677151463f5af752dcff92bf3b78d66
diff --git a/metadata/md5-cache/sci-mathematics/otter-3.3-r3 b/metadata/md5-cache/sci-mathematics/otter-3.3-r3
index 2f426a50585e..5849b29aefff 100644
--- a/metadata/md5-cache/sci-mathematics/otter-3.3-r3
+++ b/metadata/md5-cache/sci-mathematics/otter-3.3-r3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 DESCRIPTION=An Automated Deduction System
 EAPI=7
 HOMEPAGE=http://www.cs.unm.edu/~mccune/otter/
+INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=otter
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://www.cs.unm.edu/~mccune/otter/otter-3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=35c0781f99f4c127174c3bf0f5ecb0bf
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.13.4 b/metadata/md5-cache/sci-mathematics/pari-2.13.4
index eee47e89d4b1..738ec1d084fd 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.13.4
+++ b/metadata/md5-cache/sci-mathematics/pari-2.13.4
@@ -4,12 +4,13 @@ DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-
 DESCRIPTION=Computer-aided number theory C library and tools
 EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=data doc fltk gmp test threads X
-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
 LICENSE=GPL-2
 RDEPEND=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= )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.4.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b605d7e6bfbfc26128108442a3efee5f
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3bd51c5c88ce0252b8ef3e86576a8b84
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.13.3 b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
index 191662c79736..b7650abf5acd 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.13.3
+++ b/metadata/md5-cache/sci-mathematics/pari-2.13.4-r1
@@ -4,12 +4,13 @@ DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-
 DESCRIPTION=Computer-aided number theory C library and tools
 EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=data doc fltk gmp test threads X
-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
 LICENSE=GPL-2
 RDEPEND=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= )
 RESTRICT=!test? ( test )
 SLOT=0/7
-SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.3.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3bd51c5c88ce0252b8ef3e86576a8b84
+SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.4.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=42c6d7d86005b6a5fabbc884893cc9a6
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.13.1 b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
deleted file mode 100644
index a9b324ecb5cd..000000000000
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/fortran
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake virtual/fortran
-DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
-EAPI=7
-HOMEPAGE=https://www.mcs.anl.gov/petsc/
-INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-IUSE=afterimage boost complex-scalars cxx debug doc fftw fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) virtual/fortran
-REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
-SLOT=0
-SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.13.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=63475ba09b89ae07023b0cab570aeb9b
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.14.6 b/metadata/md5-cache/sci-mathematics/petsc-3.14.6
deleted file mode 100644
index d1ab6fd43fc6..000000000000
--- a/metadata/md5-cache/sci-mathematics/petsc-3.14.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/fortran
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake virtual/fortran
-DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
-EAPI=7
-HOMEPAGE=https://www.mcs.anl.gov/petsc/
-INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-IUSE=afterimage boost complex-scalars cxx debug doc fftw fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) virtual/fortran
-REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
-SLOT=0
-SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.14.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=14406d96acf911ab20c83c31d62afd16
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.15.0 b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
deleted file mode 100644
index 62ca55fd2c52..000000000000
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/fortran
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake sys-apps/which virtual/fortran
-DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
-EAPI=7
-HOMEPAGE=https://www.mcs.anl.gov/petsc/
-INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-IUSE=afterimage boost complex-scalars cxx debug fftw fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) virtual/fortran
-REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
-SLOT=0
-SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=695b62add0d0233aee4a49f1f7d503fc
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.15.0-r1 b/metadata/md5-cache/sci-mathematics/petsc-3.15.0-r1
deleted file mode 100644
index ff41691eb71f..000000000000
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake sys-apps/which virtual/pkgconfig virtual/fortran
-DEFINED_PHASES=configure install setup
-DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[int64?,mpi?] ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/pypy3-7.3.7-r1:0 ) virtual/fortran
-DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
-EAPI=8
-HOMEPAGE=https://www.mcs.anl.gov/petsc
-INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-IUSE=afterimage boost complex-scalars cxx debug fftw fortran hdf5 hypre int64 mpi metis mumps scotch superlu threads X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[int64?,mpi?] ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) virtual/fortran
-REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
-SLOT=0
-SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.15.0.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ad21c201897dd1d35122b19ced9f5e69
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.16.0 b/metadata/md5-cache/sci-mathematics/petsc-3.16.0-r1
index 9c34efbc9712..196f718dc6c6 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.16.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.16.0-r1
@@ -12,5 +12,5 @@ RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boo
 REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( cxx mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.16.0.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-mathematics/petsc/petsc-3.16.0-fftw-without-mpi.patch.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9447ed1bd38339e3d34b1a993c49d7cf
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=387a0e608c3c08cf8b9f42bc25fcb060
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.17.1-r1 b/metadata/md5-cache/sci-mathematics/petsc-3.17.1-r1
new file mode 100644
index 000000000000..6896c1424665
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.17.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/cmake sys-apps/which virtual/pkgconfig virtual/fortran
+DEFINED_PHASES=configure install setup
+DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[int64?,mpi?] ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/pypy3-7.3.7-r1:0 ) virtual/fortran
+DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
+EAPI=8
+HOMEPAGE=https://www.mcs.anl.gov/petsc
+INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+IUSE=afterimage boost complex-scalars debug fftw fortran hdf5 hypre int64 mpi metis mumps scotch superlu threads X
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[int64?,mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[int64?,mpi?] ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) virtual/fortran
+REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi ) hypre? ( mpi !superlu ) mumps? ( mpi scotch ) scotch? ( mpi ) superlu? ( !hypre )
+SLOT=0
+SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.17.1.tar.gz
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=291f17b84fca93e1e011add5519ee44d
diff --git a/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0 b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
new file mode 100644
index 000000000000..c84d01c30770
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=The edge addition planarity suite of graph algorithms
+EAPI=8
+HOMEPAGE=https://github.com/graph-algorithms/edge-addition-planarity-suite/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.2.0/planarity-3.0.2.0.tar.gz
+_md5_=166c8fd57607d5e2197852e217b57311
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.6 b/metadata/md5-cache/sci-mathematics/polymake-4.6
index 65eb3592603b..018ab420c820 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-4.6
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( bliss nauty )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.6-minimal.tar.bz2
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2d92d94be05ab840bc51d536900ddd76
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.6-r1 b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
new file mode 100644
index 000000000000..5d1c0671103f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-lang/perl
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/libxml2:2= dev-libs/libxslt:= dev-libs/mpfr:= sys-libs/readline:= bliss? ( sci-libs/bliss:=[gmp] ) cdd? ( sci-libs/cddlib:= ) flint? ( sci-mathematics/flint:= ) lrs? ( >=sci-libs/lrslib-051:=[gmp] ) nauty? ( sci-mathematics/nauty:= ) normaliz? ( >=sci-mathematics/normaliz-3.8:= ) ppl? ( dev-libs/ppl:= ) singular? ( sci-mathematics/singular:= )
+DESCRIPTION=Tool for polyhedral geometry and combinatorics
+EAPI=8
+HOMEPAGE=https://polymake.org/
+INHERIT=flag-o-matic ninja-utils toolchain-funcs
+IUSE=bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2 GPL-2+ MIT WTFPL-2
+RDEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/libxml2:2= dev-libs/libxslt:= dev-libs/mpfr:= sys-libs/readline:= bliss? ( sci-libs/bliss:=[gmp] ) cdd? ( sci-libs/cddlib:= ) flint? ( sci-mathematics/flint:= ) lrs? ( >=sci-libs/lrslib-051:=[gmp] ) nauty? ( sci-mathematics/nauty:= ) normaliz? ( >=sci-mathematics/normaliz-3.8:= ) ppl? ( dev-libs/ppl:= ) singular? ( sci-mathematics/singular:= ) dev-lang/perl dev-perl/JSON dev-perl/Term-ReadLine-Gnu dev-perl/TermReadKey dev-perl/XML-SAX dev-perl/XML-Writer
+REQUIRED_USE=^^ ( bliss nauty )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.6-minimal.tar.bz2
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2c163633d418aab9570be54115eb5101
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.2-r1 b/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
index 74eb6bd19b65..8b9293e6ad7e 100644
--- a/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
+++ b/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
@@ -1,5 +1,5 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend test
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=sci-mathematics/primesieve:=
 DESCRIPTION=Highly optimized CLI and library to count primes
 EAPI=8
@@ -12,5 +12,5 @@ RDEPEND=sci-mathematics/primesieve:=
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/kimwalisch/primecount/archive/refs/tags/v7.2.tar.gz -> primecount-7.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fbe75f745cafd614ed84993e6dbe5370
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a0b2353c67e6062f069d7594fe1244ad
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.3 b/metadata/md5-cache/sci-mathematics/primecount-7.3
new file mode 100644
index 000000000000..8d8ddb35102b
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/primecount-7.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sci-mathematics/primesieve:=
+DESCRIPTION=Highly optimized CLI and library to count primes
+EAPI=8
+HOMEPAGE=https://github.com/kimwalisch/primecount
+INHERIT=cmake toolchain-funcs
+IUSE=cpu_flags_x86_popcnt +executable openmp test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=sci-mathematics/primesieve:=
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://github.com/kimwalisch/primecount/archive/refs/tags/v7.3.tar.gz -> primecount-7.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=900a0cb1c5ba41d8661b8a8787f952d2
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-7.7 b/metadata/md5-cache/sci-mathematics/primesieve-7.7
index 8a61a742b7a2..a429bc5c3213 100644
--- a/metadata/md5-cache/sci-mathematics/primesieve-7.7
+++ b/metadata/md5-cache/sci-mathematics/primesieve-7.7
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CLI and library for quickly generating prime numbers
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/kimwalisch/primesieve/archive/refs/tags/v7.7.tar.gz -> primesieve-7.7.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e6ca0dfe73dfd0bd7c704ac276634645
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-7.9 b/metadata/md5-cache/sci-mathematics/primesieve-7.9
new file mode 100644
index 000000000000..6bd4c3f83434
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/primesieve-7.9
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CLI and library for quickly generating prime numbers
+EAPI=8
+HOMEPAGE=https://github.com/kimwalisch/primesieve
+INHERIT=cmake
+IUSE=doc +executable test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/kimwalisch/primesieve/archive/refs/tags/v7.9.tar.gz -> primesieve-7.9.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8f4073d0311aced9abc3791fff6d74e7
diff --git a/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3 b/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
index 49305edaab3a..f666ce9fdbf3 100644
--- a/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
+++ b/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Pseudo-Random Number Generator library
 EAPI=7
 HOMEPAGE=http://statmath.wu.ac.at/prng/
+INHERIT=autotools
 IUSE=doc examples static-libs
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=abdb4a739341b059327ebcf4bb594429
diff --git a/metadata/md5-cache/sci-mathematics/prover9-2009.11a b/metadata/md5-cache/sci-mathematics/prover9-2009.11a
index 80e9774bf8c2..27adbbf7068e 100644
--- a/metadata/md5-cache/sci-mathematics/prover9-2009.11a
+++ b/metadata/md5-cache/sci-mathematics/prover9-2009.11a
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Automated theorem prover for first-order and equational logic
 EAPI=7
 HOMEPAGE=https://www.cs.unm.edu/~mccune/mace4/
+INHERIT=toolchain-funcs
 IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz https://dev.gentoo.org/~jlec/distfiles/LADR-2009-11A-makefile.patch.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=811bbc769e438813a3e35c82ded80d21
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
index 51915db194d0..2919661f527d 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
@@ -4,11 +4,12 @@ DEPEND=>=dev-ml/menhir-20181006 >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Library to parse and type-check an extension of the SMT-LIB 2 standard
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Coquera/psmt2-frontend
+INHERIT=findlib autotools
 IUSE=+ocamlopt
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/menhir-20181006 dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Coquera/psmt2-frontend/archive/0.2.tar.gz -> psmt2-frontend-0.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=8babbf81ec962f9ae8c2edc628d37b26
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1 b/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
deleted file mode 100644
index 05cd8a6e0de3..000000000000
--- a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv cairo? ( x11-libs/cairo[svg] x11-libs/pango ) emacs? ( >=app-editors/emacs-23.1:* ) gtk? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= x11-libs/spread-sheet-widget cairo? ( dev-util/glib-utils ) ) postgres? ( dev-db/postgresql:=[server] )
-DESCRIPTION=Program for statistical analysis of sampled data
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
-INHERIT=elisp-common python-any-r1 xdg-utils
-IUSE=cairo doc emacs examples gtk ncurses nls perl postgres test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv cairo? ( x11-libs/cairo[svg] x11-libs/pango ) emacs? ( >=app-editors/emacs-23.1:* ) gtk? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= x11-libs/spread-sheet-widget cairo? ( dev-util/glib-utils ) ) postgres? ( dev-db/postgresql:=[server] )
-REQUIRED_USE=test? ( cairo )
-RESTRICT=!test? ( test )
-SLOT=0/1.2.0
-SRC_URI=mirror://gnu/pspp/pspp-1.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5a1ef997b5a067861c3946ad29582b2a
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.4.1 b/metadata/md5-cache/sci-mathematics/pspp-1.4.1
deleted file mode 100644
index b29197521527..000000000000
--- a/metadata/md5-cache/sci-mathematics/pspp-1.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv cairo? ( x11-libs/cairo[svg] x11-libs/pango ) gtk? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= >=x11-libs/spread-sheet-widget-0.6 cairo? ( dev-util/glib-utils ) ) postgres? ( dev-db/postgresql:=[server] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Program for statistical analysis of sampled data
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
-INHERIT=python-any-r1 xdg
-IUSE=cairo doc examples gtk ncurses nls perl postgres test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv cairo? ( x11-libs/cairo[svg] x11-libs/pango ) gtk? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= >=x11-libs/spread-sheet-widget-0.6 cairo? ( dev-util/glib-utils ) ) postgres? ( dev-db/postgresql:=[server] )
-REQUIRED_USE=test? ( cairo )
-RESTRICT=!test? ( test )
-SLOT=0/1.4.1
-SRC_URI=mirror://gnu/pspp/pspp-1.4.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb7b117756c5945e5975b02d10881f87
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.6.0 b/metadata/md5-cache/sci-mathematics/pspp-1.6.0
new file mode 100644
index 000000000000..ee0db0866530
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/gettext virtual/pkgconfig doc? ( virtual/latex-base )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
+DESCRIPTION=Program for statistical analysis of sampled data
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
+INHERIT=python-any-r1 xdg
+IUSE=doc examples gtk ncurses nls perl postgres
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
+SLOT=0/1.6.0
+SRC_URI=mirror://gnu/pspp/pspp-1.6.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c2ab7753a4b9a8d60ea0551611f547cc
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.6.1 b/metadata/md5-cache/sci-mathematics/pspp-1.6.1
new file mode 100644
index 000000000000..1f6eb462ac7f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.6.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/gettext virtual/pkgconfig doc? ( virtual/latex-base ) test? ( sys-apps/which )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
+DESCRIPTION=Program for statistical analysis of sampled data
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
+INHERIT=python-any-r1 xdg
+IUSE=doc examples gtk ncurses nls perl postgres test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
+RESTRICT=!test? ( test )
+SLOT=0/1.6.1
+SRC_URI=mirror://gnu/pspp/pspp-1.6.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b996ebefcc89551b79ed5adf5f17bc60
diff --git a/metadata/md5-cache/sci-mathematics/relational-2.5-r2 b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
index 91fedc62e715..875e4f97dd7c 100644
--- a/metadata/md5-cache/sci-mathematics/relational-2.5-r2
+++ b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ltworf/relational/releases/download/2.5/relational_2.5.orig.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=e3f855a4b1eb10a390eb93909616c269
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.2-r1 b/metadata/md5-cache/sci-mathematics/rkward-0.7.2-r1
deleted file mode 100644
index 9da9c4c2117a..000000000000
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 dev-qt/qtcore:5
-DESCRIPTION=IDE for the R-project
-EAPI=8
-HOMEPAGE=https://rkward.kde.org/
-INHERIT=ecm kde.org optfeature
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2
-RDEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/rkward/0.7.2/src/rkward-0.7.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8a1e147495f5974adc951d10df7f5c7e
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.4 b/metadata/md5-cache/sci-mathematics/rkward-0.7.4
new file mode 100644
index 000000000000..44bd560ab50d
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-lang/R dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 dev-qt/qtcore:5
+DESCRIPTION=IDE for the R-project
+EAPI=8
+HOMEPAGE=https://rkward.kde.org/
+INHERIT=ecm kde.org optfeature
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2
+RDEPEND=dev-lang/R dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/karchive:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/rkward/0.7.4/rkward-0.7.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1daa6954375883216e19fc192cd54b42
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
index af66bdb12e32..73f60f07901e 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) dev-libs/openssl:0= app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=IDE for the R language
@@ -11,5 +11,5 @@ LICENSE=AGPL-3
 RDEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) dev-libs/openssl:0= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.3.1093.tar.gz -> rstudio-1.3.1093.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=690ba148729925a510aee79e2fbdb847
diff --git a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1 b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
index c23ace61731f..49068188bf7e 100644
--- a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
+++ b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=implementation of SHA1 is taken from the GNU coreutils package
 EAPI=6
 HOMEPAGE=http://isabelle.in.tum.de/
+INHERIT=multilib toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://isabelle.in.tum.de/components/polyml-5.6-1.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2af5718600e077e984ed9fd4f5efae6d
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1 b/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
index 5377c24601be..8581ab5b7a35 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-m
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=7
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Sources
+INHERIT=autotools elisp-common
 IUSE=emacs examples +readline static-libs
 KEYWORDS=amd64 ~ppc x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-libs/cddlib dev-lang/perl readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-0/singular-4.2.0p1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=91d26230905826486e83bb27e60570dc
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.0_p3-r1 b/metadata/md5-cache/sci-mathematics/singular-4.2.0_p3-r1
index 7ef9ebf053ce..9c1fd8bfb923 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.0_p3-r1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.0_p3-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-m
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=7
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Sources
+INHERIT=autotools elisp-common flag-o-matic
 IUSE=emacs examples +readline static-libs
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-libs/cddlib dev-lang/perl readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-0/singular-4.2.0p3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=98108dc7ef87bc09ebda9784899a7177
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.1 b/metadata/md5-cache/sci-mathematics/singular-4.2.1
index cd338595eb7a..1afca022206e 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-m
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=7
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Sources
+INHERIT=autotools elisp-common flag-o-matic
 IUSE=emacs examples +readline static-libs
 KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-libs/gmp:0 dev-libs/ntl:= emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-libs/cddlib dev-lang/perl readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-1/singular-4.2.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c167bd991ffcdbbce70ab54104853305
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1 b/metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1
index 6ec98757d6b7..f453158dda0b 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1
@@ -4,11 +4,12 @@ DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathemati
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
+INHERIT=autotools elisp-common flag-o-matic
 IUSE=emacs examples polymake +readline static-libs
 KEYWORDS=amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-1/singular-4.2.1p3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=1f34beeb0c1467e9927eaa3231c267b4
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.0 b/metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
index e9528fdeb4ed..25c6f0615622 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.0
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
@@ -4,11 +4,12 @@ DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathemati
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
+INHERIT=autotools elisp-common
 IUSE=emacs examples polymake +readline static-libs
 KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
-SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-0/singular-4.3.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=02a8ccdb7e2428e5f8d219c8a4221408
+SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-0/singular-4.3.0p1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=05176a68fb782962f58992e9e3f13c8c
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.13.1 b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
deleted file mode 100644
index 418345eddbe8..000000000000
--- a/metadata/md5-cache/sci-mathematics/slepc-3.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake
-DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
-EAPI=7
-HOMEPAGE=https://slepc.upv.es/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs
-IUSE=complex-scalars doc mpi
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.13.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.14.2 b/metadata/md5-cache/sci-mathematics/slepc-3.14.2
deleted file mode 100644
index ad6638d54090..000000000000
--- a/metadata/md5-cache/sci-mathematics/slepc-3.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND==sci-mathematics/petsc-3.14*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake
-DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
-EAPI=7
-HOMEPAGE=https://slepc.upv.es/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs
-IUSE=complex-scalars doc mpi
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND==sci-mathematics/petsc-3.14*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.14.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.16.0 b/metadata/md5-cache/sci-mathematics/slepc-3.16.0
index 1eb540e7b64a..512cfa6c0ac0 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.16.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.16.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND==sci-mathematics/petsc-3.16*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.16.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d842584f9dc73050aa04c8a1d5d551c3
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.15.0 b/metadata/md5-cache/sci-mathematics/slepc-3.17.1
index d9ea6b253582..99beba1321d8 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.17.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install setup
-DEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake
+DEPEND==sci-mathematics/petsc-3.17*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/cmake
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
 HOMEPAGE=https://slepc.upv.es/
@@ -7,8 +7,8 @@ INHERIT=flag-o-matic python-any-r1 toolchain-funcs
 IUSE=complex-scalars doc mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
+RDEPEND==sci-mathematics/petsc-3.17*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi )
 SLOT=0
-SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d842584f9dc73050aa04c8a1d5d551c3
+SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.17.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=c6ca100519603a5ae4dc2227f2038848
diff --git a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018 b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
index ddb25fbcff43..2d1c1f49f84c 100644
--- a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
+++ b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/ultimate-pa/smtinterpol/archive/32d7fa8751f668f9e9a18e4e96df3337b53d2150.tar.gz -> smtinterpol-2.5_p20211018.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=bf1f604f075bd795e556e4a88b9be6ad
diff --git a/metadata/md5-cache/sci-mathematics/spin-6.5.2-r1 b/metadata/md5-cache/sci-mathematics/spin-6.5.2-r1
index c6cbe697c447..59a3a2dfcc72 100644
--- a/metadata/md5-cache/sci-mathematics/spin-6.5.2-r1
+++ b/metadata/md5-cache/sci-mathematics/spin-6.5.2-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install
 DESCRIPTION=An efficient logic-model checker for the verification of multi-threaded code
 EAPI=8
 HOMEPAGE=https://spinroot.com/ https://github.com/nimble-code/Spin
+INHERIT=desktop toolchain-funcs
 IUSE=doc examples graphviz tk
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=sys-devel/gcc tk? ( dev-lang/tk graphviz? ( media-gfx/graphviz ) )
 SLOT=0
 SRC_URI=https://github.com/nimble-code/Spin/archive/refs/tags/version-6.5.2.tar.gz -> spin-6.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=38e7809bc7c4a0ea51c2c2233c9edfc6
diff --git a/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1 b/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
index 65762ac0b2af..9df9e42e9117 100644
--- a/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
+++ b/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/lit ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-python/lit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/boost:= sci-mathematics/minisat:= sys-libs/zlib:= cryptominisat? ( dev-db/sqlite:3 dev-libs/icu:= sci-mathematics/cryptominisat:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 DESCRIPTION=Simple Theorem Prover, an efficient SMT solver for bitvectors
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/2.3.3
 SRC_URI=https://github.com/stp/stp/archive/2.3.3.tar.gz -> stp-2.3.3.tar.gz test? ( https://github.com/stp/OutputCheck/archive/119fe41a83bc455a24a11ecc9b78e7b13fcfcc45.tar.gz -> stp-2.3.3_OutputCheck.tar.gz https://github.com/stp/googletest/archive/2ad076167a676e3ed62f90b754b30fac5caa1f88.tar.gz -> stp-2.3.3_gtest.tar.gz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=11e6806c88d32a5498968db645e8062f
diff --git a/metadata/md5-cache/sci-mathematics/sympow-2.023.6 b/metadata/md5-cache/sci-mathematics/sympow-2.023.6
index 9ffd6f09ef8a..7e2cef8d6a50 100644
--- a/metadata/md5-cache/sci-mathematics/sympow-2.023.6
+++ b/metadata/md5-cache/sci-mathematics/sympow-2.023.6
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure
 DESCRIPTION=Symmetric power elliptic curve L-functions
 EAPI=7
 HOMEPAGE=https://gitlab.com/rezozer/forks/sympow/
+INHERIT=toolchain-funcs
 KEYWORDS=amd64
 LICENSE=Sympow-BSD
 RDEPEND=sci-mathematics/pari
 SLOT=0
 SRC_URI=https://gitlab.com/rezozer/forks/sympow/-/archive/v2.023.6/sympow-v2.023.6.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=097af9d617ddbe7b44b5b0a7efeae61b
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3 b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3
index 225670f92362..5ba534646eb0 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0[cxx] >=sci-libs/cddlib-094f
 SLOT=0
 SRC_URI=https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Downloads/TOPCOM-0_17_8.tgz https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Manual/index.html -> TOPCOM-manual.html
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b261c66da9b2de4d32f90d4ae6d9a375
diff --git a/metadata/md5-cache/sci-mathematics/vampire-4.6.1 b/metadata/md5-cache/sci-mathematics/vampire-4.6.1
index 822950117a78..de5f67a46d26 100644
--- a/metadata/md5-cache/sci-mathematics/vampire-4.6.1
+++ b/metadata/md5-cache/sci-mathematics/vampire-4.6.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=z3? ( dev-libs/gmp:= sci-mathematics/z3:= )
 DESCRIPTION=The Vampire Prover, theorem prover for first-order logic
@@ -12,5 +12,5 @@ RDEPEND=z3? ( dev-libs/gmp:= sci-mathematics/z3:= )
 RESTRICT=!debug? ( test )
 SLOT=0/4.6.1
 SRC_URI=https://github.com/vprover/vampire/archive/v4.6.1.tar.gz -> vampire-4.6.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f3da72c91c07d0cbe2cb6c11b7d227cc
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2 b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
index 322f517cc124..ce4529bf56a6 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
@@ -4,11 +4,12 @@ DEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=de
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
+INHERIT=autotools findlib
 IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2
 RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.4.0
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.4.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a492796b6d667ed6f2d4cb5978c31fe0
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.4.1 b/metadata/md5-cache/sci-mathematics/why3-1.4.1
index 65c3d61210f2..181b6a7278e2 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.1
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.1
@@ -4,11 +4,12 @@ DEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=de
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
+INHERIT=autotools findlib
 IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2
 RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.4.1
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.4.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a492796b6d667ed6f2d4cb5978c31fe0
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.5.0 b/metadata/md5-cache/sci-mathematics/why3-1.5.0
index d6a69d9e9ac3..8de90d31e487 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.5.0
+++ b/metadata/md5-cache/sci-mathematics/why3-1.5.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2
 RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.7 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) stackify? ( dev-ml/ocamlgraph:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.5.0
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.5.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b24f47c543ef7420919d58383c423f8c
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2020 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
index 3b9bde567432..e353cd4fa9f3 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
@@ -4,6 +4,7 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 dev-ml/me
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
+INHERIT=autotools
 IUSE=coq doc emacs gtk html +ocamlopt zarith zip
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=html? ( doc )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/8bb5801e17b8b23453262da69c981c091959eec7?filename=why3-2020-20200429-199EF-src.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b32639c9bc4379b2b1992eb29ce7fc4b
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1
index 2545cd66149d..775d7d97a1cb 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-lang/ocaml-4.11:=[ocamlopt?] dev-ml/menhir:= dev-ml/num:= dev-ml/yo
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
+INHERIT=autotools findlib
 IUSE=coq doc emacs gtk html hypothesis-selection +ocamlopt sexp zarith zip +ocamlopt
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=html? ( doc )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/dd74ae7ecfd7d56aff7b17cee7a35559384a600f?filename=why3-2021-20210519-19ADF-src.tar.gz -> why3-2021-20210519-19ADF-src.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1bb955ae0a1389033bf6f9a3c5baca56
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=c55bcf479c98169798942400abe9bf59
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2 b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
index a9ede7474589..eabc3bc393b7 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-20.12.2.tar.gz -> wxmaxima-20.12.2.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5081022d100b00d2d646664e8fe694d6
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0
index 7e781023099b..5c04214c6621 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.11.0.tar.gz -> wxmaxima-21.11.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9e42ea693fac3a48a4e149c8b8d0363f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0
index 908a322050f9..31884f6307b4 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-22.04.0.tar.gz -> wxmaxima-22.04.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=bdd046b629293ccff3c2ad50d194320f
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1 b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
index e43ffb54916e..5553e1c1c300 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 ) jupyter? ( dev-libs/boost:= dev-libs/jsoncpp:= dev-libs/openssl:0= dev-python/jupyter net-libs/zeromq >=net-libs/zmqpp-4.1.2 )
 DESCRIPTION=General purpose computer algebra system
@@ -12,5 +12,5 @@ RDEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://codeload.github.com/grzegorzmazur/yacas/tar.gz/v1.7.0 -> yacas-1.7.0.tar.gz gui? ( https://dev.gentoo.org/~asturm/distfiles/yacas-bundled-1.7.0.tar.xz )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=428ba1aab526b9a32662fbdb3a17ac5d
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.9.1 b/metadata/md5-cache/sci-mathematics/yacas-1.9.1
index 5a50eecc64ae..d77835427be6 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.9.1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.9.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=gui? ( dev-libs/mathjax dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 ) jupyter? ( dev-libs/boost:= dev-libs/jsoncpp:= dev-libs/openssl:0= dev-python/jupyter net-libs/zeromq >=net-libs/zmqpp-4.1.2 )
 DESCRIPTION=General purpose computer algebra system
@@ -12,5 +12,5 @@ RDEPEND=gui? ( dev-libs/mathjax dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmul
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/grzegorzmazur/yacas/archive/refs/tags/v1.9.1.tar.gz -> yacas-1.9.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9daa047b9c82bf0c1df65585890575ba
diff --git a/metadata/md5-cache/sci-mathematics/yafu-1.34.3-r1 b/metadata/md5-cache/sci-mathematics/yafu-1.34.3-r1
index 073af96e2c00..87aa1b1554e8 100644
--- a/metadata/md5-cache/sci-mathematics/yafu-1.34.3-r1
+++ b/metadata/md5-cache/sci-mathematics/yafu-1.34.3-r1
@@ -4,10 +4,11 @@ DEPEND=|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) de
 DESCRIPTION=Yet another factoring utility
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/yafu/
+INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) dev-libs/gmp:0= sci-mathematics/gmp-ecm
 SLOT=0
 SRC_URI=mirror://sourceforge/yafu/1.34/yafu-1.34-src.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=93027995806d268a3beb8f578b0546a6
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1
deleted file mode 100644
index 0e7c598eeb45..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An efficient theorem prover
-EAPI=8
-HOMEPAGE=https://github.com/Z3Prover/z3/
-INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0/4.8
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.15.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=70447a815d52f470682d4c92289de61c
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.16 b/metadata/md5-cache/sci-mathematics/z3-4.8.16
deleted file mode 100644
index 2acbb04aaa2d..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An efficient theorem prover
-EAPI=8
-HOMEPAGE=https://github.com/Z3Prover/z3/
-INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0/4.8
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.16.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=520358e111273c0653f0454f93f4b1e5
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.17 b/metadata/md5-cache/sci-mathematics/z3-4.8.17
index e402e27e21b4..fd13545fdcad 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.17
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.17
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An efficient theorem prover
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.17.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=520358e111273c0653f0454f93f4b1e5
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=687a9952a51a33ddcd0e189d311996b8
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/sci-mathematics
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)