gentoo resync : 09.07.2022

19 files changed, 370 insertions, 49 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 0e505abfbe53..48f6dbc0868f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index e82c207e3235..a1ac2ff0f61d 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -3,5 +3,5 @@ DIST alt-ergo-2.4.1.tar.gz 2883046 BLAKE2B 6930080f7735f043e33d02b7fa0990c539928
 DIST alt-ergo-2.4.1_p20220407.tar.gz 2884310 BLAKE2B aaa31242de3ffe3f804de1e47fb740593812991e60eb583339ec0e1c56caa40b3c7f14108d068a1dbcbd7efc0d8fc96f1ba652a77c03170bddef90931a44c12c SHA512 4c353a359c92e121859f84455bb98bd80c0d33bb2001d6f2998a822e6b3dd65c9c56b0bdcaf93e52863afd8e999de6939d05859b5fc6de2ed9689c1d083bba0a
 EBUILD alt-ergo-2.3.0-r1.ebuild 1209 BLAKE2B 379490307e17faa69a1995f7aaac71d3ab3c22a366f08306a6f9ddec5ede1ff7ab92c07a581141df2862f001f2fd69b07ee1c0b221b71d4118ac8c7155cd3148 SHA512 c58c062c20566974bc5cb40e4a76a5497b5022b6d4bbcfefe09fdb184f7ad5b8b37edc3fbb9fe47e73d2ca1d293295d0e8bc3632c5b29f5f7dd1d0c5baeee5d5
 EBUILD alt-ergo-2.4.1-r2.ebuild 1003 BLAKE2B 5adc8d1899e50c29fe46cbd404ea52b543acec152a0445bc858903bf01976fe19ca27c1cb5fff78c4f0cd18656d1533b4ac1fad04c2873e5a45f9290b429b6a8 SHA512 2f7d5a3aa6706254fa55c80dedb1ec5022d57d39b38bdeeb9f19f75bcdb8428ff5857a57f5dcdd6b2aed0b8fb6f5f6c65a8d13776d6c988e1f202bad5bc62b49
-EBUILD alt-ergo-2.4.1_p20220407.ebuild 1074 BLAKE2B 2b7690d870434693abf896bdb0038cf75e75e7673160749996f79b50ecc1748fcb86cfb78893d90b86d1e748724f295917b0215969c5ff356656d6405bcfbec6 SHA512 e399595aef6ee46ba3c14a9d124d6132e1992ece2b4b695e3d9da5ba60186f8d2538cdb6af1e6fecdfee436693ce8137e400f3558ce9c80af46018a25616e867
+EBUILD alt-ergo-2.4.1_p20220407-r1.ebuild 1098 BLAKE2B 4558d855dc6a6666f9d07a1a8295f4cfbfe7911057f8c89f20aedcfc3b086680f812dbc8753a1736d3648b0c9599d5ff4bea30e8600d3726d4b63d5638420849 SHA512 750d42de7e9d6bdfa9ebbbc00b586b9176fda27ff9e0288160c5d350c258f8975d5cf2da06c3dc4afdc565dec2378b2b4506f0f620eec17639b27bab50870459
 MISC metadata.xml 957 BLAKE2B 2ac1b5428ee88fa81b3898a351b770b9a3b4e91ad049e7ab2b5b62e3ddcef635e2f19f801ef1c067b51c2f30f513b40a82e968a314be10e7a5ff795df24dd6d5 SHA512 bcbe312badeb5f3d6c243d620ec5744ac6bf3c23e6bc7b6327c7a1a72b42f2cc68cd4326b065a3fca3c2a9c7c1670e2a84ca1ca2e7bf423a274025010a6735f4
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407-r1.ebuild
index f76781a05972..99700c400f68 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.4.1_p20220407-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-ml/dune-configurator"
+REQUIRED_USE="ocamlopt"
 
 src_prepare() {
 	default
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 38ad5fcc2819..279101a9a6ab 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -4,7 +4,9 @@ AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d3
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
 DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
 DIST arb-2.22.1.tar.gz 1906319 BLAKE2B a302fe35ce5820f8cd7f98831906e9a114e120e6cfd24f42c9d76c9cb67cb232bf9b6b369801d201536552daa8cb7310bbabb7f8924a67d416ada4d37d1fcee1 SHA512 e5092b1b3f828d21a5e18722004aac5af4268b4bdce1d2a7e858485ca59ed77b32661678e229e7a44ebd29678aebe9e6b591f0dd3e1a9751460fc5d72980d0c4
+DIST arb-2.23.0.tar.gz 1989841 BLAKE2B cab9892b903a1f61ac7b37e0a0ee6c78ff78a4ad442ae12f42ad741cf6e251c1ab74b370dc6b912f75d2558a5baa248567e79d4ae90f8d98e16551d6ea90601f SHA512 cd15c1adc1c8a6b7cd7b98f5d32afec3b04f6849998cd8586924a6ebb5fe1a1a6efc250fa7fc1d346b2331daa02a4d07133ee58edeae3cc6684d306c8b78c4ae
 EBUILD arb-2.19.0.ebuild 749 BLAKE2B 05815e6f1635924824d5173ad0558627b5c98923b384d4f0dd2d369b7158acb0923f2f82d7d9ec29cb3f48cb30a402afe3adb3850d60ea60af5d95e4d1633dca SHA512 d7d9d2e1dd92cdc541de0212722b12c2db5eca27b00684f24af34d0829e1de91ecdafb731880d2eda177d363929e3bee3aa68f8a41f277f88b17a1554de01974
 EBUILD arb-2.21.0.ebuild 792 BLAKE2B 1275d14673cb09b748d2dd206f030e2fee431798adf27e629008a73301498d901e8815d5f5908e2b06d878f1ee17082e8138f8070e93d2e275d8c6a1440515d8 SHA512 105fec72bda06488fef22c77988aae8bbdc519256a703694fd2d4939bad4c000766a5c10b25e7739952e4fa927fee7ee4a1f7d4fb8c948ee243892763c6c60f3
 EBUILD arb-2.22.1.ebuild 695 BLAKE2B 09c5a3ff1b4f7a8c431fb275d6b2d709553f2008f2c6cbfe95f85d3ca330c668f245eea49592bef746700cf28d37eaa0854599f58b5f1d971a40816d507682d7 SHA512 bdcf866da232e6faca68816826a7f4f517cddb903d958426cdf3c6f131975fd27677b769538aa7ded7b2cdaa614de51525ae24172baf0fd722262476420e2bf6
+EBUILD arb-2.23.0.ebuild 703 BLAKE2B 532f9ea98eb23d74be788ef576d0f99f60ad7c7b43963bc425284499fa62adff30dd33a9471a301f1b50d8fd2c665a725f3a3bfee520205905c9449ee46c22a5 SHA512 30e3b042631b703b8bc315dbc0ee3725aab3cc6c9e161ff7042e75a39d49171d60a735fe85ea547ebec18bfd9a4f8f089a0087b86fca8793ef100226e85797df
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.23.0.ebuild b/sci-mathematics/arb/arb-2.23.0.ebuild
new file mode 100644
index 000000000000..870cc91b5694
--- /dev/null
+++ b/sci-mathematics/arb/arb-2.23.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake
+
+DESCRIPTION="C library for arbitrary-precision interval arithmetic"
+HOMEPAGE="https://fredrikj.net/arb/"
+SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	>=sci-mathematics/flint-2.9.0:="
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index 8d0e954adcb8..41af80cf1b94 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,3 +1,5 @@
 DIST eclib-20210625.tar.bz2 921173 BLAKE2B 8ecfde35fd6e557601c0a4e5f877ec49e355dbd5bb4248256c89b1160406992f59568db1060a835bad482d6ba4f1f0cc7719af5f03ecdc79abbe2ca0c9ed713e SHA512 a1319e91790decbc5219e02edbad5b86a6d3e5400bec3a9a9f2c60b89d340a0b915458f93c86f63d21c4b72995aa5fe65e0b5346241f297fe54ba2d3fc183ae3
+DIST eclib-20220621.tar.bz2 921610 BLAKE2B f53f0648f09e427ae9b208a17c93f9808c2ab859cc41db6b5acb3b1382e9aaee93b17cd9d94c14e7f4941f140749d91b2ad94ad684f8a2c0f6033ac042cc89e7 SHA512 45cc47256f6ccbf2a00711d14533cffe8a3fc0dfea3d94d9823ac43af8a56cfe95485f0559c9141203910e85b1d3fa3284ee12ca5e53d083b74cbb2907afca42
 EBUILD eclib-20210625.ebuild 868 BLAKE2B 29b76a0f676f8ec04df6ff8e145799411466740c388645333966c38d26f703878561cbe3a9eb10200799e4897f037bf6a9f8a6f9b72fde1a86e11132fa5b14d1 SHA512 387a22c5d13c847725e350e25fc0679ab1108ed1f564311c5a6b78849241bc45fce0fb30c966e53d827c951bcb23749e1626e72fda58024a9f7cdac55802f3bd
+EBUILD eclib-20220621.ebuild 871 BLAKE2B 657e8fd2208a6fcbce3c39b3743ba54ba434bdd2d416b53867677389da1ec144207b1549011169ce3edd1423ee18077ebfe96ecd796ad43e007474da96b52316 SHA512 22d070bbb255b6cad1dfac75db07c3c582fb64eb71331428fc599e2c5d678bd902e84dd7f557bcab5cdda1eff482f7126ae833dbff0f7fb7ce2b15af826ef973
 MISC metadata.xml 1089 BLAKE2B d10f9af5634478f0f13595abd10d9eefc437c27955cd3f504165beb4219e55c3997f16271148c1c2fbb5c9ae71e08665000836658bb954b83db06aeffa2b4098 SHA512 7111f3231464624d356611372934d0604fdd7a05c3531342a372979292a068dfa2edf49c4de5840cbf07b6f4819c22b8d87d54d7cacefb28ce0f53576d4620fd
diff --git a/sci-mathematics/eclib/eclib-20220621.ebuild b/sci-mathematics/eclib/eclib-20220621.ebuild
new file mode 100644
index 000000000000..b929d5e52f1c
--- /dev/null
+++ b/sci-mathematics/eclib/eclib-20220621.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Programs for elliptic curves defined over the rational numbers"
+HOMEPAGE="https://github.com/JohnCremona/eclib"
+SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# Major version of /usr/lib64/libec.so
+SLOT="0/10"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="boost flint minimal static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sci-mathematics/pari:=
+	dev-libs/ntl:=
+	boost? ( dev-libs/boost:= )
+	flint? ( sci-mathematics/flint:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(usex minimal --disable-allprogs "" "" "") \
+		$(use_with boost) \
+		$(use_with flint) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 44aeeeddbf67..3fd49e9fcfd1 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -2,7 +2,9 @@ AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d5
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
 DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
+DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
 EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
 EBUILD flint-2.8.4.ebuild 1527 BLAKE2B c74158618cb85471fda7e7a26b438f0d68ade93f0633ed34c65424488bb1b14b13dd7639ea599531099d87fb631474c26103d0c3e87233a589bb432c4c504399 SHA512 453b1404a1a99c8681d061b5373f50fb469122e45a1dd5c91be264f7714c8aeb5ffdca9c0d5e88d9c0c884c953b08ac094c680c012187f1bdece23f890514c87
 EBUILD flint-2.8.5.ebuild 1646 BLAKE2B 5b3d7c1b59f785be7edc541b780ed8993a1b06746f0b3b779173586bad765a396739087375cc4ce3df712afd8c94b2e5d86c4b32650c5ceead998a3817a7e186 SHA512 aa1e0e6ca27a895d8d5cba76fed384c2914cd5c2ef4d89120c728dfcfb6a7f50dc7a93685fcf442983bce25143fdc3cab346ece094cb37927abf0a0dcbf99356
+EBUILD flint-2.9.0.ebuild 1646 BLAKE2B b157c1c059d21979b498eb3aedbf42d6de20f8af58d95b2a0fd5866238a88db59aee1a1f674802adb1d3c69a527ef9fc467967c7717b0eb57d21a2fcd9a86c51 SHA512 9a48d373207859895afc66ed1abf590627d28f58e46071db36fc7de789f88c80d3e3d3fffd3514c20168805dcb1bf2a6b87395504bceb5717e035a538df7eeb8
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
new file mode 100644
index 000000000000..1b1aa8915415
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.9.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ninja doesn't like "-lcblas" so using make.
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+
+# flintlib.org tarballs have been broken in the past, Bill Hart suggests
+# we get them from Github (which he has control over).
+SRC_URI="https://github.com/wbhart/flint2/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/17"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-tex/latexmk
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )
+	virtual/cblas"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/flint2-${PV}"
+
+src_prepare() {
+	# https://github.com/wbhart/flint2/issues/1140
+	rm test/t-sdiv_qrnnd.c || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+		-DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		-DCBLAS_LIBRARIES="-lcblas"
+	)
+
+	cmake_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index 1f1485b99787..0277b3e5256a 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,3 +1,3 @@
 DIST mathomatic-16.0.5.tar.gz 381466 BLAKE2B 31dde337646d39faad3bcda6b72e316de4febfaf8c825320c70d69fdd55bb377948ec9e8b5ad855dc0a5b9be0f50b19387a595dfee7299e71fbf19c4f2bae979 SHA512 0d98cf7ad707d6536731c98dd253f4cce30243e9eefe9912b8fec3ad4ac4261e324b93b4f0113789ce17fd0b2e3d75f7b258be7905d8e3c7bb4b756627b75950
-EBUILD mathomatic-16.0.5.ebuild 1072 BLAKE2B cee593b0af21efc48dffe3859b5cef3f3a34ad1aff940045ee75edf7c15458db2087b8e4dd50a085f665e720dc57feb0ece9763f920ca27d8b84781b6fd03487 SHA512 4daabed31e871d45c81941c9fe3992d075104e7e97b4a3a5d3489239dea143175bc147f7b4642d1f30c2bd5f6da208a96b01f2e251929fd6bcc89f82f07baf3f
+EBUILD mathomatic-16.0.5-r1.ebuild 1188 BLAKE2B 9547f127ea1a190428bab49e1b4428d089110afcb82e4748f6ad7e753f7e69567ced38b610c08722174c0e42142b9523d440ef112a38e2641f99e859e75f77a0 SHA512 77f8261d38dafabc230d3a12571e12f904cccc63e21471357e0fefde545f3ec2e01a9c02b1a894b9b2c88a05433a4c1ec1a187c7cf22e0cae8660be674240e8a
 MISC metadata.xml 620 BLAKE2B 6e940ef7cff9245d2c53d222b811dbfb9802599ddf4a057678c0e69389f872052819b4b395c40d38ee7ebb3fc6e156628c95cd1a3466a034fb0febabf1c725b9 SHA512 89d1fce50b1f404956e1174cf63e1db2e66bf9ed42f636ad607c63723707b366a19446429f9f51efe83d7fc4e716d42c5590f1a6ed405dc8c229f10e80247e04
diff --git a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
index 62548fef00cb..d16b05048391 100644
--- a/sci-mathematics/mathomatic/mathomatic-16.0.5.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
@@ -1,29 +1,32 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Automatic algebraic manipulator"
 HOMEPAGE="https://github.com/mfillpot/mathomatic"
 SRC_URI="https://github.com/mfillpot/mathomatic/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc gnuplot"
 
-DEPEND="sys-libs/readline:=
+DEPEND="
+	sys-libs/readline:=
 	sys-libs/ncurses:="
 RDEPEND="${DEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${PN}-${P}"
+BDEPEND="doc? ( app-text/htmldoc )"
 
 src_compile() {
 	append-cflags -DBOLD_COLOR=1
 	emake READLINE=1 CC="$(tc-getCC)"
 	emake CC="$(tc-getCC)" -C primes
+	use doc && emake pdf
 }
 
 src_test() {
@@ -32,12 +35,15 @@ src_test() {
 }
 
 src_install() {
-	emake prefix="${EPREFIX}/usr" DESTDIR="${D}" bininstall m4install
-	emake prefix="${EPREFIX}/usr" DESTDIR="${D}" -C primes install
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		mathdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		bininstall m4install
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr -C primes install
 	dodoc changes.txt README.txt AUTHORS
 	newdoc primes/README.txt README-primes.txt
 	use doc && emake \
-		prefix="${EPREFIX}/usr" \
-		mathdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		DESTDIR="${D}" docinstall
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}"/usr \
+		mathdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		docinstall
 }
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 45e96c8c373f..bf1397bab918 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -8,6 +8,6 @@ DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd31
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.1.0.tar.gz 34187598 BLAKE2B da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58 SHA512 042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
-EBUILD octave-6.4.0-r3.ebuild 6036 BLAKE2B 2f2e6152d47193f7dd89fd7bf2f544540959f39485e12041a71e528ea75eb18c2e3c0f9d090936c043b2051dfb01ebfe9cdb1775d9f40acd28b2cc552eeaf622 SHA512 e562f678d76d7f419ed818eff5b504dd57bf4d789ce7773d307c922f934675e3a1bbb61d0463c66fca43912d4baaecacf87d6f6c083122c4d8d7c51d02281be1
+EBUILD octave-6.4.0-r3.ebuild 6033 BLAKE2B 1389730fdb5985b798e96dd9ba9bff9efea46098812a70a1cb963ec2b7ba0c4e8a973217fe727e0b09301b0d3f2034cbf27044e45c3c0d2f2dc3ed08ca108c57 SHA512 f927d1c67dfb6e9a19ae4b3031018fba960330bc5f3788e47f584c64b0fb7d47fca5e87e7482d8fce5225d4be4f9fb50e0d637f11cf96335823c95a46029f181
 EBUILD octave-7.1.0.ebuild 5920 BLAKE2B dd66f57ea2f1c1b61f6837e1964a79deeb35ad81fd42e40ebd2f9f20256f9f4b490e0b2f1d637ec32c561658dbbe045af9f315636ea6e14d29c4155b76ceca95 SHA512 adef7ac2c481acf24be8cb30369745ee0a24dccf21667ed00b0706e4ed6734c9500242cb4aa3b12c56662855993fe6e51dac185b19072663ea6ea0ee7386fcc2
 MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 0b54c76a4ce2..5329c54bee7d 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index cbe4eb647ae5..bab6cfc75870 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,7 +1,7 @@
-AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
-AUX pspp-1.6.1-drop-which-tests.patch 875 BLAKE2B 99ac5aa25fc26e6f591ea0772bfd168141858c2136295dcd7253dc9a46eb8412110c6fe4c8ff3752bcbb2a43c834724e23fda4fa31c075ef3716cccdc3262680 SHA512 2f9e9049ddd91f8863de52c097a1f35aefa4dc04dc3dc6cf6be8522a97ec56af352edc34123fd4272030b1d865b451accb6fdf8efaab928a8c83cffad7d585e1
 DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
 DIST pspp-1.6.1.tar.gz 9249022 BLAKE2B 306596cd428436df7f97dec627dbad6a089ff0b00b59b8152dac382a091687f4a82afd0ada7c98dea5bbc0369f0e07f1a85dcdbd84a21bfe09cbee9b43b02610 SHA512 29b475393cbe594bc93af681ec9414e56bdd664a29042017025b8f52e4e67eec1bfab638e79313a5a39929873d1d3a29095c33dbcdf40e226cc3e6010bb040a7
+DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f SHA512 fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f
 EBUILD pspp-1.6.0.ebuild 1682 BLAKE2B 8d60867a775e2edcf50999c14503208138d9c5f19074c7baaf68d4ef18ccb6abfd17360b77e0a582c8664087e5652453f6237f05a6ff53dbfd5673fd218dd3a7 SHA512 63aaca9e0197a9b5e48739f871e186047fde79ab612ed41bd6407d4048906ead5a4214a49ee23e527598a1066ead30835506c23cd1fc1f6baab8d11b40442c12
 EBUILD pspp-1.6.1.ebuild 1868 BLAKE2B 05b596863fd00b004718711ead00d28ae2ef8c5af39286aff656a09509b33e4b4b55daae83d75d03421b27a4dde7cbe17a10a41c09a507e45aeb9a9a38d164ed SHA512 5cf3e9d3d28f56c13d51aa01c292c5c90026f5192b024a9bf890c391a4c2e945ffc5f8fdd310aa14c69dc8788c3d2c6452b4ed30adcc483dd79f300b65eede86
+EBUILD pspp-1.6.2.ebuild 1773 BLAKE2B e0fd3baa3f2b23c5c9b132833f8bfb3eb21e411e77ad7be5d4429cfffb28fae863dc068b828c02b6082c03f27b1f00538c6c9b91b372c21a2e7b77d3276d5d42 SHA512 bc73ff5992c2af6b4b3a039003988a868a7793a15bd7011b06174725ca4cfbe975d81b1ce601f1f06dc7ed31d1a920a9e8beca4219a59397e0f9cc4913d29983
 MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
diff --git a/sci-mathematics/pspp/files/50pspp-gentoo.el b/sci-mathematics/pspp/files/50pspp-gentoo.el
deleted file mode 100644
index adac2e8ed1da..000000000000
--- a/sci-mathematics/pspp/files/50pspp-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; pspp site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'pspp-mode "pspp-mode" nil t)
-(add-to-list 'auto-mode-alist '("\\.sps\\'" . pspp-mode))
diff --git a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
deleted file mode 100644
index 5303df4dc2e6..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=f0ac9253e8b84691cec17fc80422993949a91cc1
-
-From f0ac9253e8b84691cec17fc80422993949a91cc1 Mon Sep 17 00:00:00 2001
-From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
-Date: Sun, 26 Jun 2022 09:07:18 +0200
-Subject: tests/atlocal.in - switched from which to command -v
-
-Sam James reported a possible future build problem due to the
-usage of the "which" command:
-
-https://savannah.gnu.org/bugs/?62675
-
-I replace "which" with "command -v" as proposed. Thanks for your
-support.
-
-Closes: 62675
---- a/tests/atlocal.in
-+++ b/tests/atlocal.in
-@@ -71,7 +71,7 @@ alias pspp='pspp --no-statrc'
- # Avoids error messages during tests if $TERM is set to an unknown terminal.
- TERM=; unset TERM
- 
--pspp_diff=`which diff`
-+pspp_diff=`command -v diff`
- if test X"$RUNNER" = Xwine; then
-     diff () {
-         $pspp_diff -w  "$@"
-cgit v1.1
diff --git a/sci-mathematics/pspp/pspp-1.6.2.ebuild b/sci-mathematics/pspp/pspp-1.6.2.ebuild
new file mode 100644
index 000000000000..ead310f8260b
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Note: can drop test infra + which dep in next release!
+IUSE="doc examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	sci-libs/gsl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libiconv
+	x11-libs/cairo[svg]
+	x11-libs/pango
+	gtk? (
+		dev-util/glib-utils
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:4=
+		>=x11-libs/spread-sheet-widget-0.7
+	)
+	postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+
+pkg_pretend() {
+	ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
+	ewarn "shipped with pspp itself, and should instead be fetched from ELPA:"
+	ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gui) \
+		$(use_with perl perl-module) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake html pdf
+		HTML_DOCS=( doc/pspp{,-dev}.html )
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/pspp{,-dev}.pdf
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index d60da19a5566..3c76f091822f 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
+DIST z3-4.9.1.tar.gz 5358020 BLAKE2B b707084424b615a43dcefbc395d6cf0519f3d6ea3ab1cc8b34b1810d5eb241afa22eae694e4dfc756fff42179a5dabe10052f88aab02953154ada8334f7e0b64 SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51
 EBUILD z3-4.8.17.ebuild 2614 BLAKE2B e69e8ede7cebd497598e854224bb1f3c9e93765df016aaf33efbfa56bd2508a773459c829a0343de6aa9cffcfb3e3da4eb62fbd7e438fae7aaf3af26288d4391 SHA512 6c9f47d73b9c016fc404c28656d4102a0f179c2e8b73f548aadbaf2847f211da41ec099b76f9f79602f19fd59eab4ee99ae66315bd47a35509158ad235e4fbac
+EBUILD z3-4.9.1-r1.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.9.1-r1.ebuild b/sci-mathematics/z3/z3-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..57224c747cf3
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.9.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake-multilib java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}