gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/sci-mathematics
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
117 files changed, 360 insertions, 176 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 aae35609e215..a90ca448ba4f 100644
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=56b3088e91e890b85e9c9882b4212c51
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 6e7efa1f5d56..85581f948c2c 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 9d462154cf4b..886832ce142e 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?
 DESCRIPTION=A dependently typed functional programming language and proof assistant
 EAPI=7
 HOMEPAGE=https://wiki.portal.chalmers.se/agda/
+INHERIT=haskell-cabal elisp-common
 IUSE=cpphs debug emacs enable-cluster-counting +stdlib doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,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	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=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 d5babdfdc347..ec348508ebe9 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
@@ -3,11 +3,12 @@ DEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?] >=dev-haskell/cabal-1.24.2.0 >
 DESCRIPTION=Agda standard library
 EAPI=7
 HOMEPAGE=https://wiki.portal.chalmers.se/agda/
+INHERIT=haskell-cabal elisp-common
 IUSE=profile
 KEYWORDS=~amd64 ~x86
 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	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	ebeaf198ca6bf70c43b10488b7cdcdcf	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
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 67968308ac2e..33d3674bad69 100644
--- a/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
@@ -1,9 +1,10 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* app-emacs/flycheck app-emacs/proofgeneral ) 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/installer-0.4.0_p20220124[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* app-emacs/flycheck app-emacs/proofgeneral ) 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/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dominate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/myst_parser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-mathematics/coq-serapi
 DESCRIPTION=Toolkit for literate programming in Coq
 EAPI=8
 HOMEPAGE=https://github.com/cpitclaudel/alectryon/
+INHERIT=elisp-common distutils-r1
 IUSE=doc emacs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,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	779bc733c68a72273cfce64602bada1d	elisp-common	f9c72486dbcb18b633c9d0949211d86e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r2 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r2
index b953f3786739..fb369ce05a96 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r2
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4
 DESCRIPTION=Automatic theorem prover
 EAPI=8
 HOMEPAGE=https://alt-ergo.ocamlpro.com
+INHERIT=dune
 IUSE=examples +ocamlopt
 KEYWORDS=amd64
 LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= <dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/seq:= dev-ml/stdlib-shims:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.4.1
 SRC_URI=https://github.com/OCamlPro/alt-ergo/archive/2.4.1.tar.gz -> alt-ergo-2.4.1.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=9fd9c0f25a22bc0b3076ab971f655651
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1_p20220407 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1_p20220407
index fe2f0ca18480..a105a54cacc4 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1_p20220407
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1_p20220407
@@ -4,11 +4,12 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4
 DESCRIPTION=Automatic theorem prover
 EAPI=8
 HOMEPAGE=https://alt-ergo.ocamlpro.com
+INHERIT=dune
 IUSE=examples +ocamlopt
 KEYWORDS=~amd64
 LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= >=dev-ml/cmdliner-1.1.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/num:= dev-ml/seq:= dev-ml/stdlib-shims:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.4.1_p20220407
 SRC_URI=https://github.com/OCamlPro/alt-ergo/archive/4e082218efe6e0e2315331580bbd08306c1f8a2d.tar.gz -> alt-ergo-2.4.1_p20220407.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=3941f26efa5a48eb7deeacc91cea321e
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.19.0 b/metadata/md5-cache/sci-mathematics/arb-2.19.0
index ba2e6e260059..d239a3325e89 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.19.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.19.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=7
 HOMEPAGE=https://fredrikj.net/arb/
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=b7de4320a8e61e0af2323ed68b1268e3
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.21.0 b/metadata/md5-cache/sci-mathematics/arb-2.21.0
index 2a010e73e700..baf92d5f7914 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.21.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.21.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=7
 HOMEPAGE=https://fredrikj.net/arb/
+INHERIT=cmake
 IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=8594329b40a38e47f2f4fd829151d24b
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.22.1 b/metadata/md5-cache/sci-mathematics/arb-2.22.1
index 0700e475b2c1..ff1d71b9102f 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.22.1
+++ b/metadata/md5-cache/sci-mathematics/arb-2.22.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=7
 HOMEPAGE=https://fredrikj.net/arb/
+INHERIT=cmake
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=04c9673e63bc0032e7eb5c6b86f4fcaf
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.3.8 b/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
index 785a724541b0..133fe057c7ec 100644
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
+++ b/metadata/md5-cache/sci-mathematics/cadabra-2.3.8
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Field-theory motivated approach to computer algebra
 EAPI=8
 HOMEPAGE=https://cadabra.science/
+INHERIT=xdg-utils python-single-r1 cmake
 IUSE=gtk +jupyter test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=bdba8e68ae14f7f648a65794cc62a440
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.1-r2 b/metadata/md5-cache/sci-mathematics/cgal-5.1-r2
index 21332fbf6991..93a8f5943d73 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.1-r2
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.1-r2
@@ -4,11 +4,12 @@ DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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 0af756e44dc6..ec472717e27f 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2-r2
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.2-r2
@@ -4,11 +4,12 @@ DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib
 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.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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2 b/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2
index 56b04b9ca4b2..14de48f6c45b 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.2.1-r2
@@ -4,11 +4,12 @@ DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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.2.2-r1
index 3917b16737c0..85c26e357f5a 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.2.2-r1
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.2.2-r1
@@ -4,11 +4,12 @@ DEPEND=dev-cpp/eigen dev-libs/boost:=[threads(+)] dev-libs/mpfr:= sys-libs/zlib
 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.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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
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 0aae96b76bb6..4fad3f672f81 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.15.0-r2
@@ -4,6 +4,7 @@ DEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk?
 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
@@ -11,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	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	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 e3fb050ad43f..e8693cd32b41 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.15.1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.15.1
@@ -4,6 +4,7 @@ DEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk?
 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
@@ -11,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	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=b1485dd39cb0ad08c03e41357f67bdc1
diff --git a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0 b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0
deleted file mode 100644
index ecf70af0a955..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( sci-mathematics/coq-mathcomp ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install postinst postrm test
-DEPEND=>=sci-mathematics/coq-8.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Serialization library and protocol for interaction with the Coq proof assistant
-EAPI=8
-HOMEPAGE=https://github.com/ejgallego/coq-serapi/
-IUSE=emacs +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=sci-mathematics/coq-8.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.15.0
-SRC_URI=https://github.com/ejgallego/coq-serapi/archive/8.15.0+0.15.0.tar.gz -> coq-serapi-0.15.0.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	elisp-common	f9c72486dbcb18b633c9d0949211d86e	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=3a133f7d143b9d2c33c4486a85be4888
diff --git a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2 b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2
new file mode 100644
index 000000000000..3998d2b89627
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( sci-mathematics/coq-mathcomp ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm test
+DEPEND=>=sci-mathematics/coq-8.15.0:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Serialization library and protocol for interaction with the Coq proof assistant
+EAPI=8
+HOMEPAGE=https://github.com/ejgallego/coq-serapi/
+INHERIT=elisp-common dune
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=sci-mathematics/coq-8.15.0:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.15.0
+SRC_URI=https://github.com/ejgallego/coq-serapi/archive/8.15.0+0.15.0.tar.gz -> coq-serapi-0.15.0.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=7bbc8ab1a5df466259cae7563cc710cd
diff --git a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0 b/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
index eea4acd8ca2a..2c355bcc7851 100644
--- a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
+++ b/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_8
 DESCRIPTION=Advanced SAT solver with C++ and Python interfaces
 EAPI=8
 HOMEPAGE=https://github.com/msoos/cryptominisat/
+INHERIT=python-single-r1 cmake
 IUSE=+python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MIT
@@ -12,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 16d24b3bdcf6..3d0a7e4d8813 100644
--- a/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost readline? ( sys-libs/rea
 DESCRIPTION=Automatic theorem prover for satisfiability modulo theories (SMT) problems
 EAPI=7
 HOMEPAGE=https://cvc4.github.io/
+INHERIT=cmake python-any-r1
 IUSE=+cln proofs readline replay +statistics
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 925873db71a4..946385f54571 100644
--- a/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.8-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost readline? ( sys-libs/rea
 DESCRIPTION=Automatic theorem prover for satisfiability modulo theories (SMT) problems
 EAPI=7
 HOMEPAGE=https://cvc4.github.io/
+INHERIT=cmake python-any-r1
 IUSE=+cln proofs readline +statistics
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=8ccaecbb01f9e5e708e8386fb3bdcc53
diff --git a/metadata/md5-cache/sci-mathematics/dataplot-20131220 b/metadata/md5-cache/sci-mathematics/dataplot-20131220
index 0bd6ba259972..e14cbc78255f 100644
--- a/metadata/md5-cache/sci-mathematics/dataplot-20131220
+++ b/metadata/md5-cache/sci-mathematics/dataplot-20131220
@@ -11,5 +11,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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=304c7ba27edbe3f1e5e6c83a467d0ad0
diff --git a/metadata/md5-cache/sci-mathematics/diagrtb-2.64 b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
index 40a25fdd3897..963984ebbd42 100644
--- a/metadata/md5-cache/sci-mathematics/diagrtb-2.64
+++ b/metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -4,6 +4,7 @@ DEPEND=virtual/fortran
 DESCRIPTION=Calculation of some eigenvectors of a large real, symmetrical, matrix
 EAPI=7
 HOMEPAGE=http://ecole.modelisation.free.fr/modes.html
+INHERIT=cmake fortran-2
 IUSE=examples
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=9d6abef4976841d445b75446ef4cc6d3
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
index a56597a90522..8d35e996c4da 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
@@ -3,6 +3,7 @@ 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+
@@ -11,5 +12,5 @@ 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	779bc733c68a72273cfce64602bada1d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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/easycrypt-1.0_pre20211210-r2 b/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r2
deleted file mode 100644
index 04f8c3dd13d3..000000000000
--- a/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Computer-Aided Cryptographic Proofs
-EAPI=8
-HOMEPAGE=https://github.com/EasyCrypt/easycrypt
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=CeCILL-B CeCILL-C
-RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/1.0_pre20211210
-SRC_URI=https://github.com/EasyCrypt/easycrypt/archive/49aec58ea63a64adcf5fbabcc14c6739f337b206.tar.gz -> easycrypt-1.0_pre20211210.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=9cbf1a38349517c3b9c6d3b4c813a398
diff --git a/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20220303 b/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20220303-r1
index d83a47730c6f..d5bd4145b9aa 100644
--- a/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20220303
+++ b/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20220303-r1
@@ -1,14 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Computer-Aided Cryptographic Proofs
 EAPI=8
 HOMEPAGE=https://github.com/EasyCrypt/easycrypt
+INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=CeCILL-B CeCILL-C
-RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.0_pre20220303
 SRC_URI=https://github.com/EasyCrypt/easycrypt/archive/c98b014c131b6c0b147b852902953dd6c5771603.tar.gz -> easycrypt-1.0_pre20220303.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=b6e0e04e8dc1cfda670bf39ca4b57a90
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=a97a01b7cd963330d4b786f94baee657
diff --git a/metadata/md5-cache/sci-mathematics/easycrypt-2022.04-r1 b/metadata/md5-cache/sci-mathematics/easycrypt-2022.04-r1
new file mode 100644
index 000000000000..9a802f7f2261
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/easycrypt-2022.04-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Computer-Aided Cryptographic Proofs
+EAPI=8
+HOMEPAGE=https://github.com/EasyCrypt/easycrypt
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= <sci-mathematics/why3-1.5:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2022.04
+SRC_URI=https://github.com/EasyCrypt/easycrypt/archive/r2022.04.tar.gz -> easycrypt-2022.04.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=d29ce63d4a4fb2e8893b6f0014527d9b
diff --git a/metadata/md5-cache/sci-mathematics/easycrypt-2022.04_p20220505 b/metadata/md5-cache/sci-mathematics/easycrypt-2022.04_p20220505
new file mode 100644
index 000000000000..a2821a9c35fc
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/easycrypt-2022.04_p20220505
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.5:= <sci-mathematics/why3-1.6:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Computer-Aided Cryptographic Proofs
+EAPI=8
+HOMEPAGE=https://github.com/EasyCrypt/easycrypt
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.5:= <sci-mathematics/why3-1.6:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2022.04_p20220505
+SRC_URI=https://github.com/EasyCrypt/easycrypt/archive/a49a0acf5f7e2776f6b10cd49f8a201ebab0cf03.tar.gz -> easycrypt-2022.04_p20220505.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=a507bef64dd1229f57a907c626f34bf8
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 b4f592a96db6..94aeaa8a517a 100644
--- a/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
+++ b/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
@@ -9,5 +9,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 44de152a4216..1e76df2e99fb 100644
--- a/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
+++ b/metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fast Artificial Neural Network Library
 EAPI=7
 HOMEPAGE=http://leenissen.dk/fann/wp/
+INHERIT=cmake
 IUSE=examples
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/fann/FANN-2.2.0-Source.zip
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=ea96bdf2c2e09f211063ecbad1fe07d0
diff --git a/metadata/md5-cache/sci-mathematics/fann-9999 b/metadata/md5-cache/sci-mathematics/fann-9999
index 440c8b51bde5..5e12b44b88d7 100644
--- a/metadata/md5-cache/sci-mathematics/fann-9999
+++ b/metadata/md5-cache/sci-mathematics/fann-9999
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Fast Artificial Neural Network Library
 EAPI=7
 HOMEPAGE=http://leenissen.dk/fann/wp/
+INHERIT=cmake git-r3 toolchain-funcs
 IUSE=examples
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 2bba9da8d561..3f8278518719 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 DESCRIPTION=Fast Library for Number Theory
 EAPI=7
 HOMEPAGE=http://www.flintlib.org/
+INHERIT=cmake python-any-r1
 IUSE=doc ntl test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=LGPL-2.1+
@@ -11,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	3c38df051095289667b6f09ebd0cc149	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 b94dc4ca6737..11c0e73422e1 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.8.4
+++ b/metadata/md5-cache/sci-mathematics/flint-2.8.4
@@ -4,6 +4,7 @@ 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+
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=9e25bc7dc7de939717feaa7008d4b536
diff --git a/metadata/md5-cache/sci-mathematics/form-4.2.1 b/metadata/md5-cache/sci-mathematics/form-4.2.1
index af2cf356dc72..2d14de26ffbb 100644
--- a/metadata/md5-cache/sci-mathematics/form-4.2.1
+++ b/metadata/md5-cache/sci-mathematics/form-4.2.1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e557506e2128502d6824ad28c0694bbd
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.6 b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
index b35218a64dbd..6cc1bc093ae0 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.6
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
@@ -10,5 +10,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.6-full.tar.bz2
-_eclasses_=elisp-common	f9c72486dbcb18b633c9d0949211d86e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e6cab1953113fb8f580268ea62aa9803
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.7 b/metadata/md5-cache/sci-mathematics/fricas-1.3.7
index 03045caf9ada..87c996293a6b 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.7
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.7
@@ -10,5 +10,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	f9c72486dbcb18b633c9d0949211d86e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3dca7f89ec651d65bce6ca05b4fce110
diff --git a/metadata/md5-cache/sci-mathematics/genius-1.0.25 b/metadata/md5-cache/sci-mathematics/genius-1.0.25
index 5621cbf45448..b1f8940995bc 100644
--- a/metadata/md5-cache/sci-mathematics/genius-1.0.25
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.25
@@ -3,11 +3,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=6
 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= 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _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 2053bbb6318b..21e103de10a2 100644
--- a/metadata/md5-cache/sci-mathematics/genius-1.0.27
+++ b/metadata/md5-cache/sci-mathematics/genius-1.0.27
@@ -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= >=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	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=76f09b4bb1bfd381dea3217453ab5672
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 258dfe570a5c..aacc332aaec9 100644
--- a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
+++ b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
@@ -9,5 +9,5 @@ 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	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=1832af9bce2969c9d5ec5ff33060e9d3
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 483b7fe69942..84f477a5f977 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
@@ -12,5 +12,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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 36c5d4d027fe..2098b03958fa 100644
--- a/metadata/md5-cache/sci-mathematics/giac-1.7.0.47
+++ b/metadata/md5-cache/sci-mathematics/giac-1.7.0.47
@@ -12,5 +12,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	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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
new file mode 100644
index 000000000000..db0b388dba68
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/giac-1.9.0.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-tex/hevea virtual/pkgconfig virtual/yacc 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 postinst postrm prepare
+DEPEND=dev-libs/gmp:=[cxx(+)] sys-libs/readline:= gui? ( x11-libs/fltk media-libs/libpng:= ) ao? ( media-libs/libao ) dev-libs/mpfr:= sci-libs/mpfi sci-libs/gsl:= sci-mathematics/pari:=[threads] dev-libs/ntl:= virtual/lapack virtual/blas net-misc/curl sci-mathematics/cliquer sci-mathematics/nauty ecm? ( sci-mathematics/gmp-ecm ) glpk? ( sci-mathematics/glpk ) gc? ( dev-libs/boehm-gc )
+DESCRIPTION=A free C++ Computer Algebra System library and its interfaces
+EAPI=8
+HOMEPAGE=https://www-fourier.ujf-grenoble.fr/~parisse/giac.html
+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
+RDEPEND=dev-libs/gmp:=[cxx(+)] sys-libs/readline:= gui? ( x11-libs/fltk media-libs/libpng:= ) ao? ( media-libs/libao ) dev-libs/mpfr:= sci-libs/mpfi sci-libs/gsl:= sci-mathematics/pari:=[threads] dev-libs/ntl:= virtual/lapack virtual/blas net-misc/curl sci-mathematics/cliquer sci-mathematics/nauty ecm? ( sci-mathematics/gmp-ecm ) glpk? ( sci-mathematics/glpk ) gc? ( dev-libs/boehm-gc )
+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
+_md5_=d3808d0455aea28b854f4a890ab66f8d
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.7.11 b/metadata/md5-cache/sci-mathematics/ginac-1.7.11
index c772bba5c19a..30859d634242 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.7.11
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.7.11
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/cln-1.2.2
 DESCRIPTION=C++ library and tools for symbolic calculations
 EAPI=7
 HOMEPAGE=https://www.ginac.de/
+INHERIT=python-any-r1
 IUSE=doc examples
 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.7.11.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 f60c84b005f8..961026486ff7 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.0
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.0
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/cln-1.2.2
 DESCRIPTION=C++ library and tools for symbolic calculations
 EAPI=7
 HOMEPAGE=https://www.ginac.de/
+INHERIT=python-any-r1
 IUSE=doc examples
 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.0.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 a3b9c494c9a1..f6259db04706 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.2
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.2
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/cln-1.2.2
 DESCRIPTION=C++ library and tools for symbolic calculations
 EAPI=7
 HOMEPAGE=https://www.ginac.de/
+INHERIT=python-any-r1
 IUSE=doc examples
 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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=69a5d34a52a98e49f1f87bd4591bf951
diff --git a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1 b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
index 7d4ba1b9cfe5..d4be16039a82 100644
--- a/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
+++ b/metadata/md5-cache/sci-mathematics/glpk-5.0-r1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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_=aaf237795ac995185f1ba48bb8777a66
diff --git a/metadata/md5-cache/sci-mathematics/gmm-5.1 b/metadata/md5-cache/sci-mathematics/gmm-5.1
index c898b2897b5d..91375d187ff6 100644
--- a/metadata/md5-cache/sci-mathematics/gmm-5.1
+++ b/metadata/md5-cache/sci-mathematics/gmm-5.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
 DESCRIPTION=Generic C++ template library for sparse, dense and skyline matrices
 EAPI=6
 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.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _md5_=291ed53d17c2ceb4bd81a07cf500f50d
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 43cf171bb8e1..6f6aafcfb6b2 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5
new file mode 100644
index 000000000000..af9540719a54
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets
+DEFINED_PHASES=compile configure install pretend
+DEPEND=dev-libs/gmp:= cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers )
+DESCRIPTION=Elliptic Curve Method for Integer Factorization
+EAPI=8
+HOMEPAGE=https://gitlab.inria.fr/zimmerma/ecm
+INHERIT=toolchain-funcs
+IUSE=cuda +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:= 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
diff --git a/metadata/md5-cache/sci-mathematics/gretl-2021d b/metadata/md5-cache/sci-mathematics/gretl-2021d
index fc7d0cac7ffd..fc5662c65d4a 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-2021d
+++ b/metadata/md5-cache/sci-mathematics/gretl-2021d
@@ -11,5 +11,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	f9c72486dbcb18b633c9d0949211d86e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=691d4864e48fe91f8c339691d3f76868
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 e1ed99585103..0ca4b927511f 100644
--- a/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
+++ b/metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
@@ -4,11 +4,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=8
 HOMEPAGE=https://www.nongnu.org/gsl-shell/
+INHERIT=toolchain-funcs python-any-r1 docs
 IUSE=fox doc
 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=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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=f4731f9c8f4d1a71fb9135da7f8f83ac
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.39.1 b/metadata/md5-cache/sci-mathematics/lean-3.39.1
index fadedcefcde3..e070612c2fd5 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.39.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.39.1
@@ -4,11 +4,12 @@ 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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.41.0 b/metadata/md5-cache/sci-mathematics/lean-3.41.0
index b3c6a7feda39..1a3e79fe0b29 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.41.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.41.0
@@ -4,11 +4,12 @@ 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.41.0.tar.gz -> lean-3.41.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.42.0 b/metadata/md5-cache/sci-mathematics/lean-3.42.0
index 7a0e3cdf79e8..e300516b5b29 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.42.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.42.0
@@ -4,11 +4,12 @@ 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.42.0.tar.gz -> lean-3.42.0.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.42.1 b/metadata/md5-cache/sci-mathematics/lean-3.42.1
index 2a1de877bd24..d2b81af64613 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.42.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.42.1
@@ -4,11 +4,12 @@ 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.42.1.tar.gz -> lean-3.42.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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_=1dbb54245f666317800e804dcaa55928
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.9999 b/metadata/md5-cache/sci-mathematics/lean-3.9999
index 8ba530b2905b..cf8face39d2a 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.9999
+++ b/metadata/md5-cache/sci-mathematics/lean-3.9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
 EAPI=8
 HOMEPAGE=https://leanprover-community.github.io/
+INHERIT=cmake readme.gentoo-r1 git-r3
 IUSE=debug +threads
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=1dbb54245f666317800e804dcaa55928
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 346c931592ae..32da94abad28 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
@@ -4,6 +4,7 @@ DEPEND=>=dev-python/GitPython-2.1.11[python_targets_python3_8(-)?,python_targets
 DESCRIPTION=Development tools for Lean's mathlib
 EAPI=8
 HOMEPAGE=https://github.com/leanprover-community/mathlib-tools
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 aca00fcbd5ce..2b02d7c9ab44 100644
--- a/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
+++ b/metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-python/GitPython-2.1.11[python_targets_python3_8(-)?,python_targets
 DESCRIPTION=Development tools for Lean's mathlib
 EAPI=8
 HOMEPAGE=https://github.com/leanprover-community/mathlib-tools
+INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,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	779bc733c68a72273cfce64602bada1d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 b858bd352a69..4cae714c7016 100644
--- a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5
 DESCRIPTION=Plot parametric and implicit surfaces
 EAPI=7
 HOMEPAGE=https://www.facebook.com/pages/MathMod/529510253833102
+INHERIT=desktop qmake-utils xdg-utils
 KEYWORDS=~amd64 ~x86
 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	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 ea3979eb0bb1..db3dfed15f84 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5
@@ -3,11 +3,12 @@ DEPEND=sys-libs/readline:= sys-libs/ncurses:=
 DESCRIPTION=Automatic algebraic manipulator
 EAPI=6
 HOMEPAGE=https://github.com/mfillpot/mathomatic
+INHERIT=toolchain-funcs flag-o-matic
 IUSE=doc gnuplot
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 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	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 d70ac653ebb2..9e3d8c48a9c0 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.1-r1
@@ -3,11 +3,12 @@ DEPEND=!app-emacs/imaxima virtual/libcrypt:= X? ( x11-misc/xdg-utils sci-visuali
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=6
 HOMEPAGE=http://maxima.sourceforge.net/
+INHERIT=autotools elisp-common eutils xdg-utils
 IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 e20dcd9f547c..6e7634b7359e 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.45.1-r2
@@ -4,6 +4,7 @@ DEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwr
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=7
 HOMEPAGE=http://maxima.sourceforge.net/
+INHERIT=autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl unicode vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
@@ -12,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	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 8ac5e65488c3..9ab03362a0ac 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.46.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.46.0
@@ -4,6 +4,7 @@ DEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwr
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=7
 HOMEPAGE=http://maxima.sourceforge.net/
+INHERIT=autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
@@ -12,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	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=82d127906353798cdd792be7b62ac7ca
diff --git a/metadata/md5-cache/sci-mathematics/metamath-0.198 b/metadata/md5-cache/sci-mathematics/metamath-0.198
index c1063caf0642..d5b287fc68d5 100644
--- a/metadata/md5-cache/sci-mathematics/metamath-0.198
+++ b/metadata/md5-cache/sci-mathematics/metamath-0.198
@@ -7,5 +7,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 84df03970d38..105ed88e379a 100644
--- a/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
+++ b/metadata/md5-cache/sci-mathematics/minisat-2.2.1-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib:=
 DESCRIPTION=Small yet efficient SAT solver with reference paper
 EAPI=8
 HOMEPAGE=http://minisat.se/Main.html
+INHERIT=cmake
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fac114018ca9b6d7e277dee1812172a1
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.7.3 b/metadata/md5-cache/sci-mathematics/nauty-2.7.3
index 2c81f51fe0e7..4e154acfe259 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.7.3
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.7.3
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2a1f1ce693480d41593c2ad5007dbfc8
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 ac93bd7f435b..c2a79e56e36d 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.8.10-r1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fc5e15ee74cadf9010ecd4bad629ff25
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.9.3 b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
new file mode 100644
index 000000000000..197b6b69fcd5
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty ) dev-libs/boost
+DESCRIPTION=Tool for computations in affine monoids and more
+EAPI=8
+HOMEPAGE=https://www.normaliz.uni-osnabrueck.de/
+INHERIT=toolchain-funcs
+IUSE=doc extras nauty openmp
+KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+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
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.2.0 b/metadata/md5-cache/sci-mathematics/octave-5.2.0
index fd9473a73191..71c4780a0177 100644
--- a/metadata/md5-cache/sci-mathematics/octave-5.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-5.2.0
@@ -3,11 +3,12 @@ DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncur
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/octave/
+INHERIT=autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-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 X zlib java
 KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 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	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	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	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
 _md5_=d1aaea16a861d05eeb512171b226f8a2
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.4.0 b/metadata/md5-cache/sci-mathematics/octave-6.4.0-r2
index 82f6c9608d79..1033a852259e 100644
--- a/metadata/md5-cache/sci-mathematics/octave-6.4.0
+++ b/metadata/md5-cache/sci-mathematics/octave-6.4.0-r2
@@ -1,13 +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 ) 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 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-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 )
 DESCRIPTION=High-level interactive language for numerical computations
-EAPI=6
+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
 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 )
 SLOT=0/6.4.0
 SRC_URI=mirror://gnu/octave/octave-6.4.0.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=efb3a95012f6b3aaf6394fa4189cb844
+_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
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.1.0 b/metadata/md5-cache/sci-mathematics/octave-7.1.0
new file mode 100644
index 000000000000..2647cfc7d1ee
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-7.1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gperf virtual/pkgconfig virtual/imagemagick-tools 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.8:* ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) 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.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 )
+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
+IUSE=curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib java
+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
+_md5_=1677151463f5af752dcff92bf3b78d66
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.13.1 b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
index db1abdc2d99e..a9b324ecb5cd 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.13.1
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boos
 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
@@ -11,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.13.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
index db50aa568db9..d1ab6fd43fc6 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.14.6
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.14.6
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boos
 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
@@ -11,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.14.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
index 0750a787ebbe..62ca55fd2c52 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boos
 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
@@ -11,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.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
index 82e8bcff5912..ff41691eb71f 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0-r1
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.15.0-r1
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boos
 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
@@ -11,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.15.0.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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
index 050d66d90dc8..9c34efbc9712 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.16.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.16.0
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boos
 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
@@ -11,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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.6 b/metadata/md5-cache/sci-mathematics/polymake-4.6
index d158191f5aa2..65eb3592603b 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-4.6
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.6
@@ -4,6 +4,7 @@ DEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/l
 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
@@ -12,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	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=2d92d94be05ab840bc51d536900ddd76
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.2-r1 b/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
index 69db820643f3..74eb6bd19b65 100644
--- a/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
+++ b/metadata/md5-cache/sci-mathematics/primecount-7.2-r1
@@ -4,6 +4,7 @@ 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
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fbe75f745cafd614ed84993e6dbe5370
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-7.7 b/metadata/md5-cache/sci-mathematics/primesieve-7.7
index 41465140fbe3..8a61a742b7a2 100644
--- a/metadata/md5-cache/sci-mathematics/primesieve-7.7
+++ b/metadata/md5-cache/sci-mathematics/primesieve-7.7
@@ -3,11 +3,12 @@ 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.7.tar.gz -> primesieve-7.7.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e6ca0dfe73dfd0bd7c704ac276634645
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 eabc6412e93f..49305edaab3a 100644
--- a/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
+++ b/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
@@ -8,5 +8,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=abdb4a739341b059327ebcf4bb594429
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
index 0d3990c2ecfe..51915db194d0 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8babbf81ec962f9ae8c2edc628d37b26
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
index ccfed2732194..46a0b0e80229 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-ml/menhir-20181006:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Library to parse and type-check an extension of the SMT-LIB 2 standard
 EAPI=8
 HOMEPAGE=https://github.com/OCamlPro-Coquera/psmt2-frontend
+INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=>=dev-ml/menhir-20181006:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/OCamlPro-Coquera/psmt2-frontend/archive/0.4.0.tar.gz -> psmt2-frontend-0.4.0.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=5c6cd9f4f1c220aed0bdf02f3deaacfc
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1 b/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
index e841d9106760..05cd8a6e0de3 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0=
 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
@@ -12,5 +13,5 @@ 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	f9c72486dbcb18b633c9d0949211d86e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index 091190bb325e..b29197521527 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.4.1
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.4.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0=
 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
@@ -12,5 +13,5 @@ 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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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/relational-2.5-r2 b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
index 076eebf09a2e..91fedc62e715 100644
--- a/metadata/md5-cache/sci-mathematics/relational-2.5-r2
+++ b/metadata/md5-cache/sci-mathematics/relational-2.5-r2
@@ -3,6 +3,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Educational tool for relational algebra
 EAPI=7
 HOMEPAGE=https://ltworf.github.io/relational/
+INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,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	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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
index 1d96a23abc6e..9da9c4c2117a 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.2-r1
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.2-r1
@@ -4,11 +4,12 @@ DEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-
 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	3c38df051095289667b6f09ebd0cc149	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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/rstudio-1.3.1093-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
index e3ca9677e6cf..af66bdb12e32 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
@@ -4,11 +4,12 @@ DEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-jav
 DESCRIPTION=IDE for the R language
 EAPI=7
 HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+INHERIT=eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
 IUSE=dedicated server
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pam	e44a1dd98f13e1ad76de01e919bde1f1	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=690ba148729925a510aee79e2fbdb847
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 4e8396244f5f..5377c24601be 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	elisp-common	f9c72486dbcb18b633c9d0949211d86e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 e0d87f10b584..7ef9ebf053ce 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 e5b82316d57c..cd338595eb7a 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.2.1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.1
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	f9c72486dbcb18b633c9d0949211d86e	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
 _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 0c818e48bb4b..6ec98757d6b7 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
@@ -10,5 +10,5 @@ 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	9724194ab651ce63fd9bc06e4e1410b4	elisp-common	f9c72486dbcb18b633c9d0949211d86e	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1f34beeb0c1467e9927eaa3231c267b4
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.0 b/metadata/md5-cache/sci-mathematics/singular-4.3.0
new file mode 100644
index 000000000000..e9528fdeb4ed
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.0
@@ -0,0 +1,14 @@
+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 postinst postrm prepare test
+DEPEND=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 )
+DESCRIPTION=Computer algebra system for polynomial computations
+EAPI=8
+HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
+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
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.13.1 b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
index 51a2dbc6ceaf..418345eddbe8 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.13.1
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.13.1
@@ -3,11 +3,12 @@ DEPEND==sci-mathematics/petsc-3.13*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
index 7ab9e768ded5..ad6638d54090 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.14.2
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.14.2
@@ -3,11 +3,12 @@ DEPEND==sci-mathematics/petsc-3.14*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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.15.0 b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
index 8c7d0a855fbb..d9ea6b253582 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
@@ -3,11 +3,12 @@ DEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 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.15*:=[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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.16.0 b/metadata/md5-cache/sci-mathematics/slepc-3.16.0
index faa5fdb24e07..1eb540e7b64a 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.16.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.16.0
@@ -3,11 +3,12 @@ DEPEND==sci-mathematics/petsc-3.16*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi
 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.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	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_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
diff --git a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018 b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
index 3860f8028a16..ddb25fbcff43 100644
--- a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
+++ b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
 DESCRIPTION=Interpolating SMT-solver that can compute Craig interpolants for various theories
 EAPI=8
 HOMEPAGE=http://ultimate.informatik.uni-freiburg.de/smtinterpol/
+INHERIT=java-pkg-2 java-ant-2
 KEYWORDS=~amd64 ~x86
 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	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bf1f604f075bd795e556e4a88b9be6ad
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 9d030bc4cacd..65762ac0b2af 100644
--- a/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
+++ b/metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/boost:= sci-mathematics/minisat:= sys-libs/zlib:= cryptominisat?
 DESCRIPTION=Simple Theorem Prover, an efficient SMT solver for bitvectors
 EAPI=8
 HOMEPAGE=https://stp.github.io/
+INHERIT=python-single-r1 cmake
 IUSE=cryptominisat debug +python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ MIT
@@ -12,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _md5_=11e6806c88d32a5498968db645e8062f
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.7-r1 b/metadata/md5-cache/sci-mathematics/topcom-0.17.7-r1
deleted file mode 100644
index 258e71eb57c8..000000000000
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
-DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
-EAPI=6
-HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
-IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
-SLOT=0
-SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.7.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5ab453dc27a4886c3eab2b1cd21c21a5
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1 b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
deleted file mode 100644
index 6b9da0d01a67..000000000000
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-shells/tcsh 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 postinst prepare
-DEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
-DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
-EAPI=7
-HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
-IUSE=examples
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
-SLOT=0
-SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.8.tar.gz http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ecd556cc63bdf57bd866f9e2254f9f65
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3 b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3
new file mode 100644
index 000000000000..225670f92362
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r3
@@ -0,0 +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 postinst prepare
+DEPEND=dev-libs/gmp:0[cxx] >=sci-libs/cddlib-094f
+DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
+EAPI=8
+HOMEPAGE=https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM/index.html
+INHERIT=autotools flag-o-matic
+IUSE=examples
+KEYWORDS=~amd64 ~riscv ~x86
+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
+_md5_=b261c66da9b2de4d32f90d4ae6d9a375
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2
index 3ad820ad3bb9..635fea006701 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
 RESTRICT=test
 SLOT=0/1.7.1
 SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
-_eclasses_=elisp-common	f9c72486dbcb18b633c9d0949211d86e
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
 _md5_=71800e353bd7603fad6982201a69f30a
diff --git a/metadata/md5-cache/sci-mathematics/vampire-4.6.1 b/metadata/md5-cache/sci-mathematics/vampire-4.6.1
index dcc109d2bab5..822950117a78 100644
--- a/metadata/md5-cache/sci-mathematics/vampire-4.6.1
+++ b/metadata/md5-cache/sci-mathematics/vampire-4.6.1
@@ -4,6 +4,7 @@ DEPEND=z3? ( dev-libs/gmp:= sci-mathematics/z3:= )
 DESCRIPTION=The Vampire Prover, theorem prover for first-order logic
 EAPI=8
 HOMEPAGE=https://vprover.github.io
+INHERIT=cmake
 IUSE=debug +z3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	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 7e92b09ecf34..322f517cc124 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r2
@@ -1,14 +1,14 @@
 BDEPEND=doc? ( dev-python/sphinx dev-python/sphinxcontrib-bibtex media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra ) 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
-DEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20151112:= 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-ml/findlib-1.0.4-r1
+DEPEND=!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-ml/findlib-1.0.4-r1
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
 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-20151112:= 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?]
+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	9724194ab651ce63fd9bc06e4e1410b4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5c18346cb9d230fe760cc4f8263b3d00
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_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 648c46b7bcaf..65c3d61210f2 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.1
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.1
@@ -1,14 +1,14 @@
 BDEPEND=doc? ( dev-python/sphinx dev-python/sphinxcontrib-bibtex media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra ) 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
-DEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20151112:= 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-ml/findlib-1.0.4-r1
+DEPEND=!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-ml/findlib-1.0.4-r1
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
 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-20151112:= 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?]
+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	9724194ab651ce63fd9bc06e4e1410b4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=16dc085bd3683914513b886dc572ae1d
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=a492796b6d667ed6f2d4cb5978c31fe0
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.5.0 b/metadata/md5-cache/sci-mathematics/why3-1.5.0
new file mode 100644
index 000000000000..d6a69d9e9ac3
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/why3-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx dev-python/sphinxcontrib-bibtex media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra ) 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
+DEPEND=!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-ml/findlib-1.0.4-r1
+DESCRIPTION=Platform for deductive program verification
+EAPI=7
+HOMEPAGE=http://why3.lri.fr/
+INHERIT=autotools findlib
+IUSE=coq doc emacs gtk +ocamlopt re sexp stackify +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.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
+_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 51437602c8b4..3b9bde567432 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
@@ -12,5 +12,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	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _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 648af9c87271..2545cd66149d 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2021-r1
@@ -12,5 +12,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	9724194ab651ce63fd9bc06e4e1410b4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=1bb955ae0a1389033bf6f9a3c5baca56
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2 b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
index 83530c4f3a2a..a9ede7474589 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x1
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
 EAPI=7
 HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
+INHERIT=cmake plocale wxwidgets xdg
 KEYWORDS=amd64 ~ppc x86
 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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 a8429d9b2bac..7e781023099b 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.11.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x1
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
 EAPI=7
 HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
+INHERIT=cmake plocale wxwidgets xdg
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 2d9a00130298..908a322050f9 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-22.04.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 dev-util/desktop-file-utils x1
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
 EAPI=7
 HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
+INHERIT=cmake plocale wxwidgets xdg
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,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	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 4590133eb155..e43ffb54916e 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
@@ -4,6 +4,7 @@ DEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/q
 DESCRIPTION=General purpose computer algebra system
 EAPI=7
 HOMEPAGE=http://www.yacas.org/
+INHERIT=cmake desktop
 IUSE=gui +jupyter static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )
@@ -11,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	3c38df051095289667b6f09ebd0cc149	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_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
 _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 c859cd10cac3..5a50eecc64ae 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.9.1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.9.1
@@ -4,6 +4,7 @@ DEPEND=gui? ( dev-libs/mathjax dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmult
 DESCRIPTION=General purpose computer algebra system
 EAPI=8
 HOMEPAGE=https://www.yacas.org/
+INHERIT=cmake xdg
 IUSE=gui +jupyter static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )
@@ -11,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	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9daa047b9c82bf0c1df65585890575ba
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1
index 9c489da1809d..0e7c598eeb45 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.15-r1
@@ -4,12 +4,13 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 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
+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	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=99fb3de1ed8364a4b345d7c530b0787f
+_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.14-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.16
index d859ca2e7442..2acbb04aaa2d 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.14-r1
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.16
@@ -2,14 +2,15 @@ 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=7
+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
+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.14.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb7231e4f360446b7600390e338a642c
+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
new file mode 100644
index 000000000000..e402e27e21b4
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.17
@@ -0,0 +1,16 @@
+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.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
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /metadata/md5-cache/sci-mathematics
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)